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

Fix setAddress representability bug spotted by Dapeng Gao (with jdw57 and pdr32)

Browse Source
This commit is contained in:
Alexandre Joannou
2021-01-28 18:06:52 +00:00
parent bd378bf834
commit 6f8e3fa503
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHERICC_Fat.bsv
View File

@@ -653,8 +653,9 @@ function VnD#(CapFat) setAddress(CapFat cap, CapAddr address, TempFields tf);
Bool newAddrHi = truncateLSB(ret.addrBits) < tf.repBoundTopBits;
// Shift amount needed to look at only the bits above the mantissa.
Exp toUpperBits = e + fromInteger(valueOf(MW));
CapAddr mask = -1 << toUpperBits;
CapAddr newAddrDiff = (cap.address&mask) - (address&mask);
CapAddrPlus1 mask = -1 << toUpperBits;
CapAddrPlus1 newAddrDiff =
(signExtend(cap.address)&mask) - (signExtend(address)&mask);
// Assert that the bits above the mantissa are all equal.
Bool inRepBounds = True;
// If the difference between the upper bits of the new address and the