diff options
| author | Andrew Waterman <andrew@sifive.com> | 2020-11-18 18:27:55 -0800 |
|---|---|---|
| committer | Andrew Waterman <andrew@sifive.com> | 2020-11-18 18:27:55 -0800 |
| commit | e2e83c0604f8992a6a20e23c66574a8dca9171fc (patch) | |
| tree | 8a147ee7da97290428da0a80d290c27eb212a0d8 /riscv/mmu.cc | |
| parent | ec00b9bc6917078d603a18d10612748b52c2681f (diff) | |
| download | spike-e2e83c0604f8992a6a20e23c66574a8dca9171fc.zip spike-e2e83c0604f8992a6a20e23c66574a8dca9171fc.tar.gz spike-e2e83c0604f8992a6a20e23c66574a8dca9171fc.tar.bz2 | |
Don't include PTE.N bit as part of the PPN
Diffstat (limited to 'riscv/mmu.cc')
| -rw-r--r-- | riscv/mmu.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/riscv/mmu.cc b/riscv/mmu.cc index 8ed8894..8e32dfe 100644 --- a/riscv/mmu.cc +++ b/riscv/mmu.cc @@ -324,7 +324,7 @@ reg_t mmu_t::s2xlate(reg_t gva, reg_t gpa, access_type type, access_type trap_ty } reg_t pte = vm.ptesize == 4 ? from_target(*(target_endian<uint32_t>*)ppte) : from_target(*(target_endian<uint64_t>*)ppte); - reg_t ppn = pte >> PTE_PPN_SHIFT; + reg_t ppn = (pte & ~reg_t(PTE_N)) >> PTE_PPN_SHIFT; if (PTE_TABLE(pte)) { // next level of page table base = ppn << PGSHIFT; @@ -404,7 +404,7 @@ reg_t mmu_t::walk(reg_t addr, access_type type, reg_t mode, bool virt, bool mxr) throw_access_exception(addr, type); reg_t pte = vm.ptesize == 4 ? from_target(*(target_endian<uint32_t>*)ppte) : from_target(*(target_endian<uint64_t>*)ppte); - reg_t ppn = pte >> PTE_PPN_SHIFT; + reg_t ppn = (pte & ~reg_t(PTE_N)) >> PTE_PPN_SHIFT; if (PTE_TABLE(pte)) { // next level of page table base = ppn << PGSHIFT; |