DECLARE_UNPRIVILEGED_STORE_FUNCTION(u64)
DECLARE_UNPRIVILEGED_LOAD_FUNCTION(ulong)
-ulong get_insn(ulong mepc, bool virt, struct sbi_scratch *scratch,
+ulong get_insn(ulong mepc, struct sbi_scratch *scratch,
struct unpriv_trap *trap);
#endif
}
#endif
-ulong get_insn(ulong mepc, bool virt, struct sbi_scratch *scratch,
+ulong get_insn(ulong mepc, struct sbi_scratch *scratch,
struct unpriv_trap *trap)
{
- ulong __mstatus = 0, __vsstatus = 0, val = 0;
+ ulong __mstatus = 0, val = 0;
#ifdef __riscv_compressed
ulong rvc_mask = 3, tmp;
#endif
trap->tval = 0;
sbi_hart_set_trap_info(scratch, trap);
- if (virt)
- __vsstatus = csr_read_set(CSR_VSSTATUS, SSTATUS_MXR);
-
#ifndef __riscv_compressed
asm("csrrs %[mstatus], " STR(CSR_MSTATUS) ", %[mprv]\n"
".option push\n"
[rvc_mask] "r"(rvc_mask));
#endif
- if (virt)
- csr_write(CSR_VSSTATUS, __vsstatus);
-
sbi_hart_set_trap_info(scratch, NULL);
switch (trap->cause) {
case CAUSE_LOAD_ACCESS:
struct sbi_scratch *scratch)
{
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, virt, scratch, &uptrap);
+ insn = get_insn(regs->mepc, scratch, &uptrap);
if (uptrap.cause)
return sbi_trap_redirect(regs, scratch,
regs->mepc, uptrap.cause, uptrap.tval);
struct unpriv_trap uptrap;
ulong addr = csr_read(CSR_MTVAL);
int i, fp = 0, shift = 0, len = 0;
-#if __riscv_xlen == 32
- bool virt = (regs->mstatusH & MSTATUSH_MPV) ? TRUE : FALSE;
-#else
- bool virt = (regs->mstatus & MSTATUS_MPV) ? TRUE : FALSE;
-#endif
- ulong insn = get_insn(regs->mepc, virt, scratch, &uptrap);
+ ulong insn = get_insn(regs->mepc, scratch, &uptrap);
if (uptrap.cause)
return sbi_trap_redirect(regs, scratch, regs->mepc,
struct unpriv_trap uptrap;
ulong addr = csr_read(CSR_MTVAL);
int i, len = 0;
-#if __riscv_xlen == 32
- bool virt = (regs->mstatusH & MSTATUSH_MPV) ? TRUE : FALSE;
-#else
- bool virt = (regs->mstatus & MSTATUS_MPV) ? TRUE : FALSE;
-#endif
- ulong insn = get_insn(regs->mepc, virt, scratch, &uptrap);
+ ulong insn = get_insn(regs->mepc, scratch, &uptrap);
if (uptrap.cause)
return sbi_trap_redirect(regs, scratch, regs->mepc,