diff options
author | Omniscient <17525998+omnisci3nce@users.noreply.github.com> | 2024-02-25 13:41:20 +1100 |
---|---|---|
committer | Omniscient <17525998+omnisci3nce@users.noreply.github.com> | 2024-02-25 13:41:20 +1100 |
commit | 90bd31473ac4abdb733188dd6bc1bfdb60d97765 (patch) | |
tree | 387c22cb14142640a39b266f6d42db36cbc00713 /src | |
parent | c7957d8ba4c1fe25362f8a033d39acc90de56a0f (diff) | |
parent | a1c3e27c53558fde411e63d8b3e3809c79789ea4 (diff) |
Merge branch 'cel-18-arena-allocator' into feature/some-string-utils
Diffstat (limited to 'src')
-rw-r--r-- | src/std/mem.c | 12 | ||||
-rw-r--r-- | src/std/mem.h | 7 |
2 files changed, 14 insertions, 5 deletions
diff --git a/src/std/mem.c b/src/std/mem.c index c30f76d..f5b92d4 100644 --- a/src/std/mem.c +++ b/src/std/mem.c @@ -9,8 +9,8 @@ #endif void* arena_alloc_align(arena* a, size_t size, size_t align) { - ptrdiff_t padding = -(uintptr_t)a->begin & (align - 1); - ptrdiff_t available = a->end - a->begin - padding; + ptrdiff_t padding = -(uintptr_t)a->curr & (align - 1); + ptrdiff_t available = a->end - a->curr - padding; TRACE("Padding %td available %td", padding, available); if (available < 0 || (ptrdiff_t)size > available) { ERROR_EXIT("Arena ran out of memory\n"); @@ -22,5 +22,11 @@ void* arena_alloc_align(arena* a, size_t size, size_t align) { void* arena_alloc(arena* a, size_t size) { return arena_alloc_align(a, size, DEFAULT_ALIGNMENT); } arena arena_create(void* backing_buffer, size_t capacity) { - return (arena){ .begin = backing_buffer, .end = backing_buffer + (ptrdiff_t)capacity }; + return (arena){ .begin = backing_buffer, + .curr = backing_buffer, + .end = backing_buffer + (ptrdiff_t)capacity }; +} + +void arena_free_all(arena* a) { + a->curr = a->begin; // pop everything at once and reset to the start. }
\ No newline at end of file diff --git a/src/std/mem.h b/src/std/mem.h index 75b6d2a..c3ec61d 100644 --- a/src/std/mem.h +++ b/src/std/mem.h @@ -14,9 +14,12 @@ // Inspired by https://nullprogram.com/blog/2023/09/27/ typedef struct arena { char* begin; + char* curr; char* end; } arena; arena arena_create(void* backing_buffer, size_t capacity); -void *arena_alloc(arena* a, size_t size); -void *arena_alloc_align(arena* a, size_t size, size_t align); +void* arena_alloc(arena* a, size_t size); +void* arena_alloc_align(arena* a, size_t size, size_t align); +void arena_free_all(arena* a); +// TODO: arena_resize
\ No newline at end of file |