From 41d5459de01d3e9607b113dd287bacdfc15d8b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20O=2E=20Sel=C3=A5sdal?= Date: Wed, 16 Sep 2026 20:57:20 +0200 Subject: [PATCH] Add UMM/IMM type + minor fixes --- src/base/arena.c | 2 -- src/base/arena.h | 2 +- src/base/core.h | 2 ++ src/base/marena.h | 2 +- src/base/platform.c | 6 +++--- src/base/pool.c | 2 +- src/base/pool.h | 8 ++++++++ src/main.c | 8 ++++---- 8 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/base/arena.c b/src/base/arena.c index 6c221fd..55b2306 100644 --- a/src/base/arena.c +++ b/src/base/arena.c @@ -144,8 +144,6 @@ void arena_trim(Arena *arena) U32 aligned_pos = RoundUpToMultiple(block->first_free, arena->commit_size); if (aligned_pos < block->committed_end) { void *trim_start = &block->base[aligned_pos]; - // Note(nos): Should we unpoision ? - //ASAN_UNPOISON_MEMORY_REGION(trim_start, block->committed_end); memory_decommit(trim_start, block->committed_end - aligned_pos); block->committed_end = aligned_pos; } diff --git a/src/base/arena.h b/src/base/arena.h index c77c2f8..170a824 100644 --- a/src/base/arena.h +++ b/src/base/arena.h @@ -5,7 +5,7 @@ typedef U32 ArenaFlags; typedef struct ArenaOptions ArenaOptions; enum { - ArenaFlag_NoDecommit = 1, // operations which shrinks the arena does not decommit memory. + ArenaFlag_NoDecommit = (1 << 0), // operations which shrinks the arena does not decommit memory. // (arena_trim() can still decommit when called explicitly) }; struct ArenaOptions { diff --git a/src/base/core.h b/src/base/core.h index 1cfede4..a970388 100644 --- a/src/base/core.h +++ b/src/base/core.h @@ -24,6 +24,8 @@ typedef uint8_t U8; typedef uint16_t U16; typedef uint32_t U32; typedef uint64_t U64; +typedef uintptr_t UMM; +typedef intptr_t IMM; typedef float F32; typedef double F64; #if defined(__FLT128_MANT_DIG__) diff --git a/src/base/marena.h b/src/base/marena.h index 1399770..697a6cc 100644 --- a/src/base/marena.h +++ b/src/base/marena.h @@ -110,7 +110,7 @@ static INLINE void *marena_allocator_func(Allocator *allocator, AllocOperation o return NULL; } - Assert(false); + ShouldNotHappen; } static INLINE Allocator marena_allocator(MArena *arena) diff --git a/src/base/platform.c b/src/base/platform.c index fcff7a4..f8d19c1 100644 --- a/src/base/platform.c +++ b/src/base/platform.c @@ -73,7 +73,7 @@ void *memory_allocate_and_commit(size_t size) void memory_free(void *mem, size_t size) { TRACEF(" memory_free size=%7zu mem=%p\n", size, mem); - Assert(IsPageAligned((uintptr_t)mem)); + Assert(IsPageAligned((UMM)mem)); Assert(IsPageAligned(size)); int rc = munmap(mem, size); @@ -93,7 +93,7 @@ void *memory_reserve(size_t size) void memory_commit(void *mem, size_t size) { - Assert(IsPageAligned((uintptr_t)mem)); + Assert(IsPageAligned((UMM)mem)); Assert(IsPageAligned(size)); TRACEF("memory_commit size=%7zu mem=%p\n", size, mem); @@ -107,7 +107,7 @@ void memory_commit(void *mem, size_t size) void memory_decommit(void *mem, size_t size) { TRACEF("memory_decommit size=%7zu mem=%p\n", size, mem); - Assert(IsPageAligned((uintptr_t)mem)); + Assert(IsPageAligned((UMM)mem)); Assert(IsPageAligned(size)); int rc; rc = mprotect(mem, size, PROT_NONE); diff --git a/src/base/pool.c b/src/base/pool.c index 112dd59..0b6560c 100644 --- a/src/base/pool.c +++ b/src/base/pool.c @@ -3,12 +3,12 @@ APool *apool_create_ex(Allocator *allocator, const APoolCreateOptions *options) { Assert(IsPow2(options->element_align)); + Assert(options->n_reserved > 0 || options->flags & APoolFlag_AutoGrow); U32 element_align = options->element_align; if (element_align < alignof(APoolElement)) { element_align = alignof(APoolElement); } U32 element_size = AlignUp(options->element_size, options->element_align); - APool *pool = allocator_push_type(allocator, APool); Assert(pool != NULL); pool->element_align= element_align; diff --git a/src/base/pool.h b/src/base/pool.h index c809966..60ec658 100644 --- a/src/base/pool.h +++ b/src/base/pool.h @@ -32,4 +32,12 @@ struct APoolCreateOptions { apool_create_ex(arena, &(APoolCreateOptions){sizeof(type), alignof(type), n_reserved, 0}) APool *apool_create_ex(Allocator *allocator, const APoolCreateOptions *options); void *apool_alloc(APool *pool); +INLINE void apool_allocz(APool *pool) +{ + void *ptr = apool_alloc(pool); + if (ptr != NULL) { + MemoryZero(ptr, pool->element_size); + } + return ptr; +} void apool_free(APool *pool, void *element); diff --git a/src/main.c b/src/main.c index 373dc49..7633869 100644 --- a/src/main.c +++ b/src/main.c @@ -151,14 +151,14 @@ static void arena_test_4(void) U32 push_size = block_size - MemoryBlock_Header_Size; void *ptr = arena_push(&arena, push_size, page_size); - Assert(IsAlignedTo((uintptr_t)ptr, page_size)); + Assert(IsAlignedTo((UMM)ptr, page_size)); MemoryZero(ptr, push_size); printf("test_4: allocated %u bytes page-aligned at %p\n", push_size, ptr); arena_dump(&arena); // A second page-aligned push to make sure the cursor math still holds. ptr = arena_push(&arena, page_size, page_size); - Assert(IsAlignedTo((uintptr_t)ptr, page_size)); + Assert(IsAlignedTo((UMM)ptr, page_size)); MemoryZero(ptr, page_size); printf("test_4: allocated %u bytes page-aligned at %p\n", page_size, ptr); @@ -185,14 +185,14 @@ static void arena_test_allocator_interface(void) U32 push_size = block_size - MemoryBlock_Header_Size; void *ptr = allocator_push(&allocator, push_size, page_size); - Assert(IsAlignedTo((uintptr_t)ptr, page_size)); + Assert(IsAlignedTo((UMM)ptr, page_size)); MemoryZero(ptr, push_size); printf("test_4: allocated %u bytes page-aligned at %p\n", push_size, ptr); arena_dump(&arena); // A second page-aligned push to make sure the cursor math still holds. ptr = allocator_push(&allocator, page_size, page_size); - Assert(IsAlignedTo((uintptr_t)ptr, page_size)); + Assert(IsAlignedTo((UMM)ptr, page_size)); MemoryZero(ptr, page_size); printf("test_4: allocated %u bytes page-aligned at %p\n", page_size, ptr);