Cheri-research/Toooba
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Add LoadCapPageFault exception cases

Browse Source
This commit is contained in:
Peter Rugg
2021-04-29 09:55:38 +01:00
parent 1eef5d2979
commit 005ba1bd6f
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src_Core/CPU/CsrFile.bsv
View File

@@ -1122,7 +1122,8 @@ module mkCsrFile #(Data hartid)(CsrFile);
excInstAccessFault, excInstPageFault,
excLoadAddrMisaligned, excLoadAccessFault,
excStoreAddrMisaligned, excStoreAccessFault,
excLoadPageFault, excStorePageFault, excStoreCapPageFault: return addr;
excLoadPageFault, excStorePageFault,
excStoreCapPageFault, excLoadCapPageFault: return addr;
default: return 0;
endcase);

1
src_Core/RISCY_OOO/procs/lib/TlbTypes.bsv
View File

@@ -243,6 +243,7 @@ function TlbPermissionCheck hasVMPermission(
fault = True;
end
if (cap) begin
if (!fault) excCode = excLoadCapPageFault;
// check for invalid PTE encodings
if ((!pte_upper_type.cap_readable && pte_upper_type.cap_read_gen) ||
(pte_upper_type.cap_readable && !pte_upper_type.cap_read_mod &&