Fix marena macros

src/main.c

@@ -195,7 +195,7 @@ static void arena_test_allocator_interface(void)
     MemoryZero(ptr, page_size);
     printf("test_4: allocated %u bytes page-aligned at %p\n", page_size, ptr);
 
-    arena_free(&arena);
+    allocator_free_all(&allocator);
 }
 
 static void arena_test_decommit(void)
@@ -248,6 +248,9 @@ void miniarena_test1(void)
     Assert(arena.first_free == arena_size);
     MemoryZero(ptr, arena_size);
     marena_temp_end(&checkpoint);
+    U32 *val = marena_push_type(&arena, U32);
+    *val = 0xa0b0c0d0;
+    printf("marena val %u\n", *val);
 
     printf("miniarena_test1,size %u bytes first_free %u\n", arena.size, arena.first_free);
 
@@ -306,7 +309,7 @@ void apool_test(void)
     for (PoolTest *p = list; p; p = p->next){
         printf("Pooltest %u\n",p->n);
     }
-    arena_free(&arena);
+    allocator_free_all(&allocator);
 }
 
 void apool_test_autogrow(void)
@@ -354,17 +357,18 @@ void apool_test_autogrow(void)
         printf("Pooltest %u\n",p->n);
     }
 
+    allocator_free_all(&allocator);
 }
 
 int main(int argc, char *argv[])
 {
-    // arena_test_1();
+    arena_test_1();
-    // arena_test_2();
+    arena_test_2();
-    // arena_test_3();
+    arena_test_3();
-    // arena_test_4();
+    arena_test_4();
     arena_test_decommit();
     arena_test_allocator_interface();
-    // miniarena_test1();
+    miniarena_test1();
     apool_test();
     apool_test_autogrow();
 }

src/mini_arena.h

@@ -54,12 +54,6 @@ static INLINE void marena_temp_end(MTemp *state)
     arena->temp_level--;
 }
 
-#define marena_push_type(allocator, type_)\
-        marenaalloc_aligned((allocator), sizeof(type_), _Alignof(type_))
-#define marena_push_array(allocator, type_, nr_elements_)\
-        marenaalloc_aligned((allocator), (nr_elements_) * (U32)sizeof(type_), _Alignof(type_))
-
-
 static INLINE void *marena_push(MArena *arena, U32 size)
 {
     if (size > arena->size - arena->first_free) {
@@ -90,6 +84,12 @@ static INLINE void *marena_push_aligned(MArena *arena, U32 size, U32 align)
     return base;
 }
 
+#define marena_push_type(arena, type_)\
+        marena_push_aligned((arena), sizeof(type_), _Alignof(type_))
+#define marena_push_array(arena, type_, nr_elements_)\
+        marena_push_aligned((arena), (nr_elements_) * (U32)sizeof(type_), _Alignof(type_))
+
+
 static INLINE void marena_reset(MArena *arena)
 {
     arena->first_free = 0;