riscv: kprobes: Remove duplication of RV_EXTRACT_BTYPE_IMM

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

Signed-off-by: Nam Cao <namcao@linutronix.de>
Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com>
Link: https://lore.kernel.org/linux-riscv/b441038c991da11a7a48ea7140ab00e3bb119387.1747215274.git.namcao@linutronix.de/
Signed-off-by: Paul Walmsley <pjw@kernel.org>

diff --git a/arch/riscv/kernel/probes/simulate-insn.c b/arch/riscv/kernel/probes/simulate-insn.c
index 625d514c4ada6cc41f0197d7ed94ec01f6e15bc7..3ba97e79a2a3be22c999e68b506fccd736698e10 100644 (file)
--- a/arch/riscv/kernel/probes/simulate-insn.c
+++ b/arch/riscv/kernel/probes/simulate-insn.c
@@ -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;