Merge pull request #1791 from YenHaoChen/pr-pm

pointer masking: Always apply sstatus.MXR regardless of effective V
riscv-software-src · Aug 30, 2024 · 3f556d6 · 3f556d6
2 parents 272c149 + 84a212e
commit 3f556d6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/riscv/mmu.cc b/riscv/mmu.cc
@@ -614,7 +614,7 @@ void mmu_t::register_memtracer(memtracer_t* t)
 }
 
 reg_t mmu_t::get_pmlen(bool effective_virt, reg_t effective_priv, xlate_flags_t flags) const {
-  if (!proc || proc->get_xlen() != 64 || (proc->state.sstatus->readvirt(effective_virt) & MSTATUS_MXR) || flags.hlvx)
+  if (!proc || proc->get_xlen() != 64 || ((proc->state.sstatus->readvirt(false) | proc->state.sstatus->readvirt(effective_virt)) & MSTATUS_MXR) || flags.hlvx)
     return 0;
 
   reg_t pmm = 0;