Commit 76494817 authored by Nam Cao's avatar Nam Cao Committed by Paul Walmsley
Browse files

riscv: kprobes: Remove duplication of RV_EXTRACT_BTYPE_IMM 



Use RV_EXTRACT_BTYPE_IMM, instead of reimplementing it in
simulate_branch().

Signed-off-by: default avatarNam Cao <namcao@linutronix.de>
Reviewed-by: default avatarAlexandre Ghiti <alexghiti@rivosinc.com>
Link: https://lore.kernel.org/linux-riscv/b441038c991da11a7a48ea7140ab00e3bb119387.1747215274.git.namcao@linutronix.de/


Signed-off-by: default avatarPaul Walmsley <pjw@kernel.org>
parent d57676c2

arch/riscv/kernel/probes/simulate-insn.c

+1 −10
Original line number Diff line number Diff line
@@ -115,15 +115,6 @@ bool __kprobes simulate_auipc(u32 opcode, unsigned long addr, struct pt_regs *re 
	return true;

}



#define branch_imm(opcode) \

	(((((opcode) >>  8) & 0xf ) <<  1) | \

	 ((((opcode) >> 25) & 0x3f) <<  5) | \

	 ((((opcode) >>  7) & 0x1 ) << 11) | \

	 ((((opcode) >> 31) & 0x1 ) << 12))



#define branch_offset(opcode) \

	sign_extend32((branch_imm(opcode)), 12)



bool __kprobes simulate_branch(u32 opcode, unsigned long addr, struct pt_regs *regs)

{

	/*
@@ -148,7 +139,7 @@ bool __kprobes simulate_branch(u32 opcode, unsigned long addr, struct pt_regs *r 
	    !rv_insn_reg_get_val(regs, RV_EXTRACT_RS2_REG(opcode), &rs2_val))

		return false;



	offset_tmp = branch_offset(opcode);

	offset_tmp = RV_EXTRACT_BTYPE_IMM(opcode);

	switch (RV_EXTRACT_FUNCT3(opcode)) {

	case RVG_FUNCT3_BEQ:

		offset = (rs1_val == rs2_val) ? offset_tmp : 4;