Merge pull request #1791 from YenHaoChen/pr-pm

aswaterman · web-flow · commit 3f556d66e286 · 2024-08-29T21:55:58.000-05:00
pointer masking: Always apply sstatus.MXR regardless of effective V
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;

Original file line number	Diff line number	Diff line change
`@@ -614,7 +614,7 @@ void mmu_t::register_memtracer(memtracer_t* t)`
`614`	`614`	`}`
`615`	`615`
`616`	`616`	`reg_t mmu_t::get_pmlen(bool effective_virt, reg_t effective_priv, xlate_flags_t flags) const {`
`617`		`- if (!proc \|\| proc->get_xlen() != 64 \|\| (proc->state.sstatus->readvirt(effective_virt) & MSTATUS_MXR) \|\| flags.hlvx)`
	`617`	`+ if (!proc \|\| proc->get_xlen() != 64 \|\| ((proc->state.sstatus->readvirt(false) \| proc->state.sstatus->readvirt(effective_virt)) & MSTATUS_MXR) \|\| flags.hlvx)`
`618`	`618`	`return 0;`
`619`	`619`
`620`	`620`	`reg_t pmm = 0;`