From 4f32b13802c118c381a562747467b829f7a14e78 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Wed, 23 Jan 2019 09:29:55 -0800 Subject: firmware: Use lw instead of lwu for 32-bit architectures Signed-off-by: Alistair Francis --- include/sbi/sbi_unpriv.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'include/sbi/sbi_unpriv.h') diff --git a/include/sbi/sbi_unpriv.h b/include/sbi/sbi_unpriv.h index 2da5785..11ece0d 100644 --- a/include/sbi/sbi_unpriv.h +++ b/include/sbi/sbi_unpriv.h @@ -77,7 +77,11 @@ static inline ulong get_insn(ulong mepc, ulong *mstatus) ulong val; #ifndef __riscv_compressed asm ("csrrs %[mstatus], mstatus, %[mprv]\n" +#if __riscv_xlen == 64 STR(LWU) " %[insn], (%[addr])\n" +#else + STR(LW) " %[insn], (%[addr])\n" +#endif "csrw mstatus, %[mstatus]" : [mstatus] "+&r" (__mstatus), [insn] "=&r" (val) : [mprv] "r" (MSTATUS_MPRV | MSTATUS_MXR), [addr] "r" (__mepc)); @@ -86,7 +90,11 @@ static inline ulong get_insn(ulong mepc, ulong *mstatus) asm ("csrrs %[mstatus], mstatus, %[mprv]\n" "and %[tmp], %[addr], 2\n" "bnez %[tmp], 1f\n" +#if __riscv_xlen == 64 STR(LWU) " %[insn], (%[addr])\n" +#else + STR(LW) " %[insn], (%[addr])\n" +#endif "and %[tmp], %[insn], %[rvc_mask]\n" "beq %[tmp], %[rvc_mask], 2f\n" "sll %[insn], %[insn], %[xlen_minus_16]\n" -- cgit v1.2.3