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

NFC: additional generalization for CHERI

Browse Source
This commit is contained in:
Nathaniel Wesley Filardo
2022-05-31 15:28:40 +01:00
committed by Nathaniel Filardo
parent d5b155bf25
commit 41128a3387
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/snmalloc/backend/backend.h
View File

@@ -97,14 +97,13 @@ namespace snmalloc
#ifdef SNMALLOC_TRACING
message<1024>("Out of memory");
#endif
return {p, nullptr};
return {nullptr, nullptr};
}
typename Pagemap::Entry t(meta, ras);
Pagemap::set_metaentry(address_cast(p), size, t);
p = Aal::capptr_bound<void, capptr::bounds::Chunk>(p, size);
return {p, meta};
return {Aal::capptr_bound<void, capptr::bounds::Chunk>(p, size), meta};
}
/**

7
src/snmalloc/backend_helpers/range_helpers.h
View File

@@ -4,8 +4,11 @@
namespace snmalloc
{
template<size_t MIN_BITS, typename F>
void range_to_pow_2_blocks(capptr::Chunk<void> base, size_t length, F f)
template<
size_t MIN_BITS,
SNMALLOC_CONCEPT(capptr::ConceptBound) B,
typename F>
void range_to_pow_2_blocks(CapPtr<void, B> base, size_t length, F f)
{
auto end = pointer_offset(base, length);
base = pointer_align_up(base, bits::one_at_bit(MIN_BITS));