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

CsrFile.bsv: Actually respect CHERI fault delegation

Browse Source 
Also remove a dangerous default case item that masked this bug. It's
completely unnecessary upstream too and a bad idea.
This commit is contained in:
Jessica Clarke
2020-07-02 02:44:09 +01:00
parent dcc506a365
commit 1173cbb2c6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src_Core/CPU/CsrFile.bsv
View File

@@ -1066,8 +1066,8 @@ module mkCsrFile #(Data hartid)(CsrFile);
// check if trap is delegated
Bool deleg = prv_reg <= prvS && (case(t) matches
tagged Exception .e: return medeleg_csr[pack(e)] == 1;
tagged CapException .ce: return medeleg_csr[pack(CHERIFault)] == 1;
tagged Interrupt .i: return mideleg_csr[pack(i)] == 1;
default: return False;
endcase);
// handle the trap
if(deleg) begin // handle in S mode