From: Charlie Jenkins <[email protected]> Migrate the code that is decoding cfi instructions to use the generated instruction headers.
Signed-off-by: Charlie Jenkins <[email protected]> --- This function generates the same assembly as before. --- arch/riscv/kernel/cfi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/riscv/kernel/cfi.c b/arch/riscv/kernel/cfi.c index 6ec9dbd7292e..e38d5f863747 100644 --- a/arch/riscv/kernel/cfi.c +++ b/arch/riscv/kernel/cfi.c @@ -40,16 +40,16 @@ static bool decode_cfi_insn(struct pt_regs *regs, unsigned long *target, if (!riscv_insn_is_beq(insn)) return false; - *type = (u32)regs_ptr[RV_EXTRACT_RS1_REG(insn)]; + *type = (u32)regs_ptr[riscv_insn_beq_extract_xs1(insn)]; if (get_kernel_nofault(insn, (void *)regs->epc) || get_kernel_nofault(insn, (void *)regs->epc + GET_INSN_LENGTH(insn))) return false; if (riscv_insn_is_jalr(insn)) - rs1_num = RV_EXTRACT_RS1_REG(insn); + rs1_num = riscv_insn_jalr_extract_xs1(insn); else if (riscv_insn_is_c_jalr(insn)) - rs1_num = RVC_EXTRACT_C2_RS1_REG(insn); + rs1_num = riscv_insn_c_jalr_extract_xs1(insn); else return false; -- 2.52.0
