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

riscv: kprobes: Remove duplication of RV_EXTRACT_RD_REG 



Use RV_EXTRACT_RD_REG, instead of reimplementing its code.

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


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

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

+3 −6
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ bool __kprobes simulate_jal(u32 opcode, unsigned long addr, struct pt_regs *regs 
	 */

	bool ret;

	s32 imm;

	u32 index = (opcode >> 7) & 0x1f;

	u32 index = RV_EXTRACT_RD_REG(opcode);



	ret = rv_insn_reg_set_val(regs, index, addr + 4);

	if (!ret)
@@ -65,7 +65,7 @@ bool __kprobes simulate_jalr(u32 opcode, unsigned long addr, struct pt_regs *reg 
	bool ret;

	unsigned long base_addr;

	u32 imm = (opcode >> 20) & 0xfff;

	u32 rd_index = (opcode >> 7) & 0x1f;

	u32 rd_index = RV_EXTRACT_RD_REG(opcode);

	u32 rs1_index = RV_EXTRACT_RS1_REG(opcode);



	ret = rv_insn_reg_get_val(regs, rs1_index, &base_addr);
@@ -81,9 +81,6 @@ bool __kprobes simulate_jalr(u32 opcode, unsigned long addr, struct pt_regs *reg 
	return ret;

}



#define auipc_rd_idx(opcode) \

	((opcode >> 7) & 0x1f)



#define auipc_imm(opcode) \

	((((opcode) >> 12) & 0xfffff) << 12)
@@ -104,7 +101,7 @@ bool __kprobes simulate_auipc(u32 opcode, unsigned long addr, struct pt_regs *re 
	 *        20       5     7

	 */



	u32 rd_idx = auipc_rd_idx(opcode);

	u32 rd_idx = RV_EXTRACT_RD_REG(opcode);

	unsigned long rd_val = addr + auipc_offset(opcode);



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