From d7b18c0786ef7f0eca6b580f761c6309d10b83e7 Mon Sep 17 00:00:00 2001 From: YenHaoChen Date: Thu, 29 Aug 2024 16:05:42 +0800 Subject: [PATCH] pointer masking: Always apply sstatus.MXR regardless of effective V ISA spec says "Setting MXR at HS-level overrides both VS-stage and G-stage execute-only permissions." --- riscv/mmu.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riscv/mmu.cc b/riscv/mmu.cc index ea86900da..c80bc799b 100644 --- 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(virt)) & MSTATUS_MXR) || flags.hlvx) return 0; reg_t pmm = 0;