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

Merge branch 'timing'

Browse Source
This commit is contained in:
Peter Rugg
2020-03-09 17:03:41 +00:00
parent 6267c2bb2e e958fb685e
commit 410a27c4a4
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CHERICC_Fat.bsv
View File

@@ -1014,7 +1014,10 @@ instance CHERICap #(CapReg, OTypeW, FlagsW, CapAddressW, CapW, TSub#(MW, 3));
function getAddr (cap) = truncate(getAddress(cap));
function setAddr = error("feature not implemented for this cap type");
function setAddrUnsafe = error("feature not implemented for this cap type");
function CapReg setAddrUnsafe (CapReg cap, Bit#(CapAddressW) address);
return setCapPointer(cap, zeroExtend(address));
endfunction
function getOffset = error("feature not implemented for this cap type");
function modifyOffset = error("feature not implemented for this cap type");
@@ -1145,8 +1148,7 @@ instance CHERICap #(CapPipe, OTypeW, FlagsW, CapAddressW, CapW, TSub#(MW, 3));
endfunction
function CapPipe setAddrUnsafe (CapPipe cap, Bit#(CapAddressW) address);
let result = setCapPointer(cap.capFat, zeroExtend(address));
cap.capFat = result;
cap.capFat = setAddrUnsafe(cap.capFat, address);
cap.tempFields = getTempFields(cap.capFat);
return cap;
endfunction

3
CHERICap.bsv
View File

@@ -186,9 +186,6 @@ typeclass CHERICap#(type t, numeric type ot, numeric type flg, numeric type n, n
// Get representable length
function Bit#(n) getRepresentableLength (t dummy, Bit#(n) length_request);
let mask = getRepresentableAlignmentMask(dummy, length_request);
return (length_request + ~mask) & mask;
endfunction
endtypeclass