From c270ac9e9e947dc66f97ee03eb11f0e68efc4c99 Mon Sep 17 00:00:00 2001 From: Robert Norton Date: Thu, 12 Apr 2018 15:42:39 +0100 Subject: remove cheri128 backwards compatibility hack that extended access_system_regs perm into bits 14-11 -- it looks like spec is heading that way. --- cheri/cheri_prelude_128.sail | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cheri/cheri_prelude_128.sail b/cheri/cheri_prelude_128.sail index 32393fe8..4a254019 100644 --- a/cheri/cheri_prelude_128.sail +++ b/cheri/cheri_prelude_128.sail @@ -188,7 +188,7 @@ function memBitsToCapBits(tag, b) : (bool, bits(128)) -> bits(129) = memBitsToCapBits128(tag, b ^ null_cap_bits) function getCapPerms(cap) : CapStruct -> bits(31) = - let perms : bits(15) = sign_extend(getCapHardPerms(cap)) in /* NB access_system copied into 14-11 */ + let perms : bits(15) = zero_extend(getCapHardPerms(cap)) in (0x000 /* uperms 30-19 */ @ cap.uperms @ perms) -- cgit v1.2.3