WIP: CHERI config

CTSRD-CHERI · Jul 31, 2019 · b152785 · b152785
1 parent eb78878
commit b152785
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/ds/bits.h b/src/ds/bits.h
@@ -53,7 +53,11 @@ namespace snmalloc
       return (static_cast<T>(1)) << shift;
     }
 
+#if defined(__mips__)
+    static constexpr size_t ADDRESS_BITS = 39;
+#else
     static constexpr size_t ADDRESS_BITS = is64() ? 48 : 32;
+#endif
 
     inline size_t clz(size_t x)
     {

diff --git a/src/mem/allocconfig.h b/src/mem/allocconfig.h
@@ -143,7 +143,11 @@ namespace snmalloc
 #endif
 
   // Minimum allocation size is space for two pointers.
+#ifdef __CHERI_PURE_CAPABILITY__
+  static constexpr size_t MIN_ALLOC_BITS = 5;
+#else
   static constexpr size_t MIN_ALLOC_BITS = bits::is64() ? 4 : 3;
+#endif
   static constexpr size_t MIN_ALLOC_SIZE = 1 << MIN_ALLOC_BITS;
 
   // Slabs are 64 KiB unless constrained to 16 KiB.