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

Remove remaining unsealed checks

Browse Source
This commit is contained in:
Peter Rugg
2023-01-11 17:50:37 +00:00
parent 4c166c95b9
commit ecdc2e0107
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src_Core/RISCY_OOO/procs/lib/Decode.bsv
View File

@@ -1023,7 +1023,6 @@ function DecodeResult decode(Instruction inst, Bool cap_mode);
end
f7_cap_CSeal: begin
dInst.capChecks.src2_tag = True;
dInst.capChecks.src2_unsealed = True;
dInst.capChecks.src2_permit_seal = True;
dInst.capChecks.src2_addr_valid_type = True;
@@ -1040,7 +1039,6 @@ function DecodeResult decode(Instruction inst, Bool cap_mode);
dInst.capFunc = CapModify (Seal);
end
f7_cap_CCSeal: begin
dInst.capChecks.src2_unsealed = True;
dInst.capChecks.src2_addr_valid_type = True;
dInst.capChecks.src2_permit_seal = True;
dInst.capChecks.ccseal_bypass = True;
@@ -1092,7 +1090,6 @@ function DecodeResult decode(Instruction inst, Bool cap_mode);
f7_cap_CUnseal: begin
dInst.capChecks.src2_tag = True;
dInst.capChecks.src1_sealed_with_type = True;
dInst.capChecks.src2_unsealed = True;
dInst.capChecks.src2_points_to_src1_type = True;
dInst.capChecks.src2_permit_unseal = True;

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

@@ -273,13 +273,13 @@ function CapPipe capModify(CapPipe a, CapPipe b, CapModifyFunc func);
tagged SealEntry :
setKind(a_mut, SENTRY);
tagged Seal :
setKind(a_mut, SEALED_WITH_TYPE (truncate(getAddr(b))));
clearTagIf(setKind(a_mut, SEALED_WITH_TYPE (truncate(getAddr(b)))), getKind(b) != UNSEALED);
tagged CSeal :
((validAsType(b, getAddr(b)) && isValidCap(b) && getKind(a) == UNSEALED) ?
setKind(a_mut, SEALED_WITH_TYPE (truncate(getAddr(b))))
: a);
tagged Unseal .src :
setKind(((src == Src1) ? a:b), UNSEALED);
clearTagIf(setKind(((src == Src1) ? a:b), UNSEALED), (src == Src1) && (getKind(b) != UNSEALED));
tagged AndPerm :
setPerms(a_mut, pack(getPerms(a)) & truncate(getAddr(b)));
tagged SetFlags :