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

Also enforce privilege checks for SCR reads

Browse Source
This commit is contained in:
Peter Rugg
2020-05-12 13:28:30 +01:00
parent 854151978e
commit c65e89f6c1
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src_Core/RISCY_OOO/procs/lib/Exec.bsv
View File

@@ -429,10 +429,9 @@ function Maybe#(Trap) checkForException(
exception = Valid (IllegalInst);
end
end
else if(dInst.iType == Scr) begin
let scr = pack(fromMaybe(SCR_None, dInst.scr));
Bool scr_has_priv = (prv >= scr[4:3]);
Bool unimplemented = (scr == pack(SCR_None)); // Added by Bluespec
else if(dInst.scr matches tagged Valid .scr) begin
Bool scr_has_priv = (prv >= pack(scr)[4:3]);
Bool unimplemented = (scr == SCR_None);
if(!scr_has_priv || unimplemented) begin // Writes to PCC checked in capChecks
exception = Valid (IllegalInst);
end