Don't make MPRV load/store virtual if MPV=1, MPP=3 (#666)

* Don't make MPRV load/store virtual if MPV=1, MPP=3 * Use PRV_M instead of the value "3"
6 years ago · 53d94b12bd
1 changed files with 1 additions and 1 deletions
--- a/riscv/mmu.cc
+++ b/riscv/mmu.cc
@ -59,7 +59,7 @@ reg_t mmu_t::translate(reg_t addr, reg_t len, access_type type, uint32_t xlate_f
  if (type != FETCH) {
    if (!proc->state.debug_mode && get_field(proc->state.mstatus, MSTATUS_MPRV)) {
      mode = get_field(proc->state.mstatus, MSTATUS_MPP);
-      if (get_field(proc->state.mstatus, MSTATUS_MPV))
+      if (get_field(proc->state.mstatus, MSTATUS_MPV) && mode != PRV_M)
        virt = true;
    }
    if (!proc->state.debug_mode && (xlate_flags & RISCV_XLATE_VIRT)) {