Daniel Lustig
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
2 deletions
-
riscv/mmu.cc
|
|
@ -332,7 +332,7 @@ reg_t mmu_t::s2xlate(reg_t gva, reg_t gpa, access_type type, access_type trap_ty |
|
|
if (pte & PTE_RSVD) { |
|
|
if (pte & PTE_RSVD) { |
|
|
break; |
|
|
break; |
|
|
} else if (PTE_TABLE(pte)) { // next level of page table
|
|
|
} else if (PTE_TABLE(pte)) { // next level of page table
|
|
|
if (pte & (PTE_D | PTE_A | PTE_U)) |
|
|
if (pte & (PTE_D | PTE_A | PTE_U | PTE_N | PTE_PBMT)) |
|
|
break; |
|
|
break; |
|
|
base = ppn << PGSHIFT; |
|
|
base = ppn << PGSHIFT; |
|
|
} else if (!(pte & PTE_V) || (!(pte & PTE_R) && (pte & PTE_W))) { |
|
|
} else if (!(pte & PTE_V) || (!(pte & PTE_R) && (pte & PTE_W))) { |
|
|
@ -417,7 +417,7 @@ reg_t mmu_t::walk(reg_t addr, access_type type, reg_t mode, bool virt, bool hlvx |
|
|
if (pte & PTE_RSVD) { |
|
|
if (pte & PTE_RSVD) { |
|
|
break; |
|
|
break; |
|
|
} else if (PTE_TABLE(pte)) { // next level of page table
|
|
|
} else if (PTE_TABLE(pte)) { // next level of page table
|
|
|
if (pte & (PTE_D | PTE_A | PTE_U)) |
|
|
if (pte & (PTE_D | PTE_A | PTE_U | PTE_N | PTE_PBMT)) |
|
|
break; |
|
|
break; |
|
|
base = ppn << PGSHIFT; |
|
|
base = ppn << PGSHIFT; |
|
|
} else if ((pte & PTE_U) ? s_mode && (type == FETCH || !sum) : !s_mode) { |
|
|
} else if ((pte & PTE_U) ? s_mode && (type == FETCH || !sum) : !s_mode) { |
|
|
|
