summaryrefslogtreecommitdiff
path: root/cheri
diff options
context:
space:
mode:
authorRobert Norton2017-04-03 15:05:05 +0100
committerRobert Norton2017-04-03 15:05:05 +0100
commitf7b406a5cc91bf011c524f1d0775d69182412bc2 (patch)
treeba0585a77144dbf3797a01e10cc5c13bde1ca673 /cheri
parent88220a76169452c4a820625bd5c6273823b29939 (diff)
Rename TranslateAddress to TranslatePC and remove the accessType argument -- it is only ever used for translating the PC.
Diffstat (limited to 'cheri')
-rw-r--r--cheri/cheri_prelude_common.sail4
1 files changed, 2 insertions, 2 deletions
diff --git a/cheri/cheri_prelude_common.sail b/cheri/cheri_prelude_common.sail
index 92e4f508..dd2ec99c 100644
--- a/cheri/cheri_prelude_common.sail
+++ b/cheri/cheri_prelude_common.sail
@@ -309,7 +309,7 @@ function bit[64] addrWrapper((bit[64]) addr, (MemAccessType) accessType, (WordTy
(bit[64]) vAddr; (* XXX vAddr not truncated because top <= 2^64 and size > 0 *)
}
-function (bit[64]) TranslateAddress ((bit[64]) vAddr, (MemAccessType) accessType) = {
+function (bit[64]) TranslatePC ((bit[64]) vAddr) = {
incrementCP0Count();
let pcc = capRegToCapStruct(PCC) in
let base = getCapBase(pcc) in
@@ -320,7 +320,7 @@ function (bit[64]) TranslateAddress ((bit[64]) vAddr, (MemAccessType) accessType
else if ((absPC + 4) > top) then
(raise_c2_exception_noreg(CapEx_LengthViolation))
else
- TLBTranslate((bit[64]) absPC, accessType) (* XXX assert absPC never gets truncated due to above check and top <= 2^64 for valid caps *)
+ TLBTranslate((bit[64]) absPC, Instruction) (* XXX assert absPC never gets truncated due to above check and top <= 2^64 for valid caps *)
}
function unit checkCP2usable () =