Browse Source
page fault when PTE_PBMT bits set and not EXT_SVPBMT (#874)
pull/875/head
John Ingalls
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
4 additions and
0 deletions
-
riscv/mmu.cc
|
|
|
@ -291,6 +291,8 @@ reg_t mmu_t::s2xlate(reg_t gva, reg_t gpa, access_type type, access_type trap_ty |
|
|
|
|
|
|
|
if (pte & PTE_RSVD) { |
|
|
|
break; |
|
|
|
} else if (!proc->extension_enabled(EXT_SVPBMT) && (pte & PTE_PBMT)) { |
|
|
|
break; |
|
|
|
} else if (PTE_TABLE(pte)) { // next level of page table
|
|
|
|
if (pte & (PTE_D | PTE_A | PTE_U | PTE_N | PTE_PBMT)) |
|
|
|
break; |
|
|
|
@ -377,6 +379,8 @@ reg_t mmu_t::walk(reg_t addr, access_type type, reg_t mode, bool virt, bool hlvx |
|
|
|
|
|
|
|
if (pte & PTE_RSVD) { |
|
|
|
break; |
|
|
|
} else if (!proc->extension_enabled(EXT_SVPBMT) && (pte & PTE_PBMT)) { |
|
|
|
break; |
|
|
|
} else if (PTE_TABLE(pte)) { // next level of page table
|
|
|
|
if (pte & (PTE_D | PTE_A | PTE_U | PTE_N | PTE_PBMT)) |
|
|
|
break; |
|
|
|
|