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

riscv: kprobes: Remove duplication of RV_EXTRACT_JTYPE_IMM 



Use RV_EXTRACT_JTYPE_IMM, instead of reimplementing it in simulate_jal().

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


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

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

+3 −6
Original line number Diff line number Diff line
@@ -41,19 +41,16 @@ bool __kprobes simulate_jal(u32 opcode, unsigned long addr, struct pt_regs *regs 
	 *     1         10          1           8       5    JAL/J

	 */

	bool ret;

	u32 imm;

	s32 imm;

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



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

	if (!ret)

		return ret;



	imm  = ((opcode >> 21) & 0x3ff) << 1;

	imm |= ((opcode >> 20) & 0x1)   << 11;

	imm |= ((opcode >> 12) & 0xff)  << 12;

	imm |= ((opcode >> 31) & 0x1)   << 20;

	imm = RV_EXTRACT_JTYPE_IMM(opcode);



	instruction_pointer_set(regs, addr + sign_extend32((imm), 20));

	instruction_pointer_set(regs, addr + imm);



	return ret;

}