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

riscv: kprobes: Remove duplication of RV_EXTRACT_UTYPE_IMM 



Use RV_EXTRACT_UTYPE_IMM, instead of reimplementing it in simulate_auipc().

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


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

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

+1 −12
Original line number Diff line number Diff line
@@ -81,17 +81,6 @@ bool __kprobes simulate_jalr(u32 opcode, unsigned long addr, struct pt_regs *reg 
	return ret;

}



#define auipc_imm(opcode) \

	((((opcode) >> 12) & 0xfffff) << 12)



#if __riscv_xlen == 64

#define auipc_offset(opcode)	sign_extend64(auipc_imm(opcode), 31)

#elif __riscv_xlen == 32

#define auipc_offset(opcode)	auipc_imm(opcode)

#else

#error "Unexpected __riscv_xlen"

#endif



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

{

	/*
@@ -102,7 +91,7 @@ bool __kprobes simulate_auipc(u32 opcode, unsigned long addr, struct pt_regs *re 
	 */



	u32 rd_idx = RV_EXTRACT_RD_REG(opcode);

	unsigned long rd_val = addr + auipc_offset(opcode);

	unsigned long rd_val = addr + (s32)RV_EXTRACT_UTYPE_IMM(opcode);



	if (!rv_insn_reg_set_val(regs, rd_idx, rd_val))

		return false;