Cheri-research/snmalloc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move to AAL/PAL bits and address_bits

Browse Source
This commit is contained in:
Nathaniel Wesley Filardo
2021-07-21 16:55:25 +01:00
committed by Nathaniel Wesley Filardo
parent e212ddd0e0
commit 15e3052087
6 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/mem/sizeclasstable.h
View File

@@ -41,7 +41,7 @@ namespace snmalloc
// Large classes range from [SUPERSLAB, ADDRESS_SPACE).// TODO
static constexpr size_t NUM_LARGE_CLASSES =
bits::ADDRESS_BITS - MAX_SIZECLASS_BITS;
Pal::address_bits - MAX_SIZECLASS_BITS;
inline SNMALLOC_FAST_PATH static size_t
aligned_size(size_t alignment, size_t size)
@@ -179,7 +179,7 @@ namespace snmalloc
auto rsize = sizeclass_to_size(sc);
if constexpr (bits::is64())
if constexpr (sizeof(offset) >= 8)
{
// Only works for 64 bit multiplication, as the following will overflow in
// 32bit.
@@ -192,6 +192,10 @@ namespace snmalloc
// SUPERSLAB_BITS <= 24, "The following code assumes max of 24 bits");
// TODO 24 hack
static_assert(bits::BITS >= 24, "About to attempt a negative shift");
static_assert(
(8 * sizeof(offset)) >= (bits::BITS - 24),
"About to shift further than the type");
return (((offset >> MIN_ALLOC_BITS) *
sizeclass_metadata.fast[sc].div_mult) >>
(bits::BITS - 24)) *
@@ -209,7 +213,7 @@ namespace snmalloc
// SUPERSLAB_SIZE.
// SNMALLOC_ASSERT(offset <= SUPERSLAB_SIZE);
if constexpr (bits::is64())
if constexpr (sizeof(offset) >= 8)
{
// Only works for 64 bit multiplication, as the following will overflow in
// 32bit.
@@ -219,6 +223,7 @@ namespace snmalloc
// square of the offset to be representable.
// TODO 24 hack. Redo the maths given the multiple
// slab sizes
static_assert(bits::BITS >= 25);
static constexpr size_t MASK =
~(bits::one_at_bit(bits::BITS - 1 - 24) - 1);

2
src/mem/slaballocator.h
View File

@@ -24,7 +24,7 @@ namespace snmalloc
/**
* How many slab sizes that can be provided.
*/
constexpr size_t NUM_SLAB_SIZES = bits::ADDRESS_BITS - MIN_CHUNK_BITS;
constexpr size_t NUM_SLAB_SIZES = Pal::address_bits - MIN_CHUNK_BITS;
/**
* Used to ensure the per slab meta data is large enough for both use cases.