From 61e4b53642c9ff30a82a600f23985e7555a67a0b Mon Sep 17 00:00:00 2001 From: Robert Norton Date: Mon, 2 Jul 2018 17:01:02 +0100 Subject: cheri: the default cap for 256-bits no longer has reserved bits set. --- cheri/cheri_prelude_256.sail | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cheri/cheri_prelude_256.sail b/cheri/cheri_prelude_256.sail index babfc117..08e285e7 100644 --- a/cheri/cheri_prelude_256.sail +++ b/cheri/cheri_prelude_256.sail @@ -86,7 +86,7 @@ let default_cap : CapStruct = struct { padding = zeros(), otype = zeros(), uperms = ones(), - perm_reserved11_14 = ones(), + perm_reserved11_14 = zeros(), access_system_regs = true, permit_unseal = true, permit_ccall = true, @@ -178,7 +178,7 @@ function capStructToCapReg(cap) : CapStruct -> CapReg = cap.tag @ capStructToMem function setCapPerms(cap, perms) : (CapStruct, bits(31)) -> CapStruct = { cap with uperms = perms[30..15], - perm_reserved11_14 = perms[14..11], + /* perm_reserved11_14 = perms[14..11], XXX should allow to set? only affects cbuildcap. */ access_system_regs = perms[10], permit_unseal = perms[9], permit_ccall = perms[8], -- cgit v1.2.3