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

Remove exceptions from CToPtr and CFromPtr

Browse Source
This commit is contained in:
Peter Rugg
2023-06-20 09:45:48 +01:00
parent 9f24a516e6
commit ca711eab2a
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1135,8 +1135,6 @@ function DecodeResult decode(Instruction inst, Bool cap_mode);
dInst.capFunc = CapInspect (ToPtr);
end
f7_cap_CFromPtr: begin
dInst.capChecks.cfromptr_bypass = True;
dInst.iType = Cap;
regs.dst = Valid(tagged Gpr rd);
regs.src1 = Valid(tagged Gpr rs2);

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

@@ -287,7 +287,7 @@ function CapPipe capModify(CapPipe a, CapPipe b, CapModifyFunc func);
tagged SetFlags :
setFlags(a_mut, truncate(getAddr(b)));
tagged FromPtr :
(getAddr(a_mut) == 0 ? nullCap : setOffset(b, getAddr(a)).value);
(getAddr(a) == 0 ? nullCap : setOffset(b_mut, getAddr(a)).value);
tagged BuildCap :
setKind(setValidCap(a_mut, isValidCap(b_mut)), getKind(a)==SENTRY ? SENTRY : UNSEALED);
tagged Move :
@@ -329,7 +329,7 @@ function Data capInspect(CapPipe a, CapPipe b, CapInspectFunc func);
tagged GetType :
tpl_1(extractType(a));
tagged ToPtr :
(isValidCap(a) && isValidCap(b) ? (getAddr(a) - getBase(b)) : 0);
(isValidCap(a) ? getAddr(a) - getBase(b) : 0);
default: ?;
endcase);
return res;
@@ -438,9 +438,6 @@ function ExecResult basicExec(DecodedInst dInst, CapPipe rVal1, CapPipe rVal2, C
Maybe#(BoundsCheck) boundsCheck = prepareBoundsCheck(rVal1, aluVal2, pcc,
nullCap, 0, 0, // These three are only used in the memory pipe
dInst.capChecks);
if (dInst.capChecks.cfromptr_bypass && getAddr(rVal1) == 0) begin
capException = Invalid;
end
cf.nextPc = setKind(cf.nextPc, UNSEALED);
cf.mispredict = cf.nextPc != ppc;