diff options
| author | Anup Patel <anup.patel@wdc.com> | 2019-08-17 20:54:40 +0530 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2019-09-30 15:35:43 +0530 |
| commit | 7d4420bd6929ef3f2c761c262dbc3f7f2ae150c2 (patch) | |
| tree | dd82311f1464491c0a7f7df116961ca64aab5a33 /lib/sbi/sbi_illegal_insn.c | |
| parent | a14e7ee82c2723f18cf2d1c7f1a88d88766a6018 (diff) | |
include: Extend get_insn() to read instruction from VS/VU mode
Current implementation of get_insn() is not suitable for reading
instruction from VS/VU mode because we have to set SSTATUS_MXR bit
in VSSTATUS CSR for reading instruction from VS/VU mode.
This patch extends get_insn() to read instruction from VS/VU mode.
Signed-off-by: Anup Patel <anup.patel@wdc.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Diffstat (limited to 'lib/sbi/sbi_illegal_insn.c')
| -rw-r--r-- | lib/sbi/sbi_illegal_insn.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/sbi/sbi_illegal_insn.c b/lib/sbi/sbi_illegal_insn.c index 7ea42f7..e75c13c 100644 --- a/lib/sbi/sbi_illegal_insn.c +++ b/lib/sbi/sbi_illegal_insn.c @@ -130,12 +130,17 @@ int sbi_illegal_insn_handler(u32 hartid, ulong mcause, struct sbi_trap_regs *regs, struct sbi_scratch *scratch) { - ulong insn = csr_read(mbadaddr); + ulong insn = csr_read(CSR_MTVAL); +#if __riscv_xlen == 32 + bool virt = (regs->mstatusH & MSTATUSH_MPV) ? TRUE : FALSE; +#else + bool virt = (regs->mstatus & MSTATUS_MPV) ? TRUE : FALSE; +#endif struct unpriv_trap uptrap; if (unlikely((insn & 3) != 3)) { if (insn == 0) { - insn = get_insn(regs->mepc, scratch, &uptrap); + insn = get_insn(regs->mepc, virt, scratch, &uptrap); if (uptrap.cause) return sbi_trap_redirect(regs, scratch, regs->mepc, uptrap.cause, uptrap.tval); |