Factor maxE and maxT to cap_common

CTSRD-CHERI · Oct 20, 2020 · 69869a4 · 69869a4
1 parent eb53bf8
commit 69869a4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/src/cheri_cap_common.sail b/src/cheri_cap_common.sail
@@ -47,6 +47,11 @@ type CapLen       = range(0, (2 ^ cap_len_width) - 1)
 type CapPermsBits = bits(cap_perms_width)
 type CapFlagsBits = bits(cap_flags_width)
 
+/* Reset E and T calculated to make top 2**xlen. */
+let maxE   = cap_len_width - cap_mantissa_width
+let resetE = to_bits(cap_exp_width, maxE)
+let resetT = 0b01 @ zeros(cap_mantissa_width - 2)
+
 /* A partially decompressed version of a capability -- E, B, T,
  * lenMSB, sealed and otype fields are not present in all formats and are
  * populated by capBitsToCapability.

diff --git a/src/cheri_prelude_128.sail b/src/cheri_prelude_128.sail
@@ -58,12 +58,8 @@ let  cap_addr_width = sizeof(cap_addr_width)
 type cap_len_width : Int = cap_addr_width + 2
 let  cap_len_width  = sizeof(cap_len_width)
 
-/* Reset E and T calculated to make top 2**64. */
-let  maxE = 52
 type internal_exponent_take_bits : Int = 3
 let  internal_exponent_take_bits = sizeof(internal_exponent_take_bits)
-let  resetE = to_bits(cap_exp_width, maxE)
-let  resetT = 0b01 @ 0x000 /* bit 12 set */
 
 /* Capability format completely compressed. Tag is out of band */
 struct EncCapability = {

diff --git a/src/cheri_prelude_64.sail b/src/cheri_prelude_64.sail
@@ -58,12 +58,8 @@ let  cap_addr_width = sizeof(cap_addr_width)
 type cap_len_width : Int = cap_addr_width + 2
 let  cap_len_width  = sizeof(cap_len_width)
 
-/* Reset E and T calculated to make top 2**64. */
-let  maxE = 26
 type internal_exponent_take_bits : Int = 3
 let  internal_exponent_take_bits = sizeof(internal_exponent_take_bits)
-let  resetE = to_bits(cap_exp_width, maxE)
-let  resetT = 0b01000000 /* bit 6 set */
 
 /* Capability format completely compressed. Tag is out of band */
 struct EncCapability = {