summaryrefslogtreecommitdiff
path: root/source/base/base_arena.c
diff options
context:
space:
mode:
Diffstat (limited to 'source/base/base_arena.c')
-rwxr-xr-xsource/base/base_arena.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/base/base_arena.c b/source/base/base_arena.c
index 3e9a6df..5855e5e 100755
--- a/source/base/base_arena.c
+++ b/source/base/base_arena.c
@@ -33,7 +33,7 @@ arena_destroy(mem_arena *arena)
33 munmap(arena, arena->capacity + sizeof(mem_arena)); 33 munmap(arena, arena->capacity + sizeof(mem_arena));
34} 34}
35internal void * 35internal void *
36arena_alloc(mem_arena *arena, u64 size) 36arena_alloc(mem_arena *arena, u64 size, b32 zero)
37{ 37{
38 if (!arena) 38 if (!arena)
39 { 39 {
@@ -51,7 +51,7 @@ arena_alloc(mem_arena *arena, u64 size)
51 arena->previous_position = arena->current_position; 51 arena->previous_position = arena->current_position;
52 arena->current_position = aligned + size; 52 arena->current_position = aligned + size;
53 53
54 MemSet(out, size); 54 if (zero) MemSet(out, size);
55 55
56 return out; 56 return out;
57} 57}
@@ -88,7 +88,7 @@ arena_resize_align(mem_arena *arena, void *old_memory, u64 new_size, u64 old_siz
88 88
89 if (old_memory == NULL || old_size == 0) 89 if (old_memory == NULL || old_size == 0)
90 { 90 {
91 return (mem_arena *)arena_alloc(arena, new_size); 91 return (mem_arena *)arena_alloc(arena, new_size, 0);
92 } 92 }
93 else if ((old_mem >= arena->base_position && old_mem < arena->base_position + arena->capacity)) 93 else if ((old_mem >= arena->base_position && old_mem < arena->base_position + arena->capacity))
94 { 94 {
@@ -103,7 +103,7 @@ arena_resize_align(mem_arena *arena, void *old_memory, u64 new_size, u64 old_siz
103 } 103 }
104 else 104 else
105 { 105 {
106 void *new_memory = arena_alloc(arena, new_size); 106 void *new_memory = arena_alloc(arena, new_size, 0);
107 umm copy_size = old_size < new_size ? old_size : new_size; 107 umm copy_size = old_size < new_size ? old_size : new_size;
108 memmove(new_memory, old_mem, copy_size); 108 memmove(new_memory, old_mem, copy_size);
109 } 109 }