ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 07:08:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with #118

Browse Source
This commit is contained in:
Ginger Bill
2017-10-12 21:01:16 +01:00
parent 26d3c54aff
commit 5eaa8de8f9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/mem.odin
+5 -2
View File
@@ -131,12 +131,15 @@ arena_allocator :: proc(arena: ^Arena) -> Allocator {
}; };
} }
import "core:fmt.odin";
arena_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode, arena_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode,
size, alignment: int, size, alignment: int,
old_memory: rawptr, old_size: int, flags: u64) -> rawptr { old_memory: rawptr, old_size: int, flags: u64) -> rawptr {
using Allocator_Mode; using Allocator_Mode;
arena := cast(^Arena)allocator_data; arena := cast(^Arena)allocator_data;
switch mode { switch mode {
case Alloc: case Alloc:
total_size := size + alignment; total_size := size + alignment;
@@ -148,7 +151,7 @@ arena_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode,
#no_bounds_check end := &arena.memory[len(arena.memory)]; #no_bounds_check end := &arena.memory[len(arena.memory)];
ptr := align_forward(end, alignment); ptr := align_forward(end, alignment);
(cast(^raw.Slice)&arena).len += total_size; (^raw.Slice)(&arena.memory).len += total_size;
return zero(ptr, size); return zero(ptr, size);
case Free: case Free:
@@ -156,7 +159,7 @@ arena_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode,
// Use ArenaTempMemory if you want to free a block // Use ArenaTempMemory if you want to free a block
case FreeAll: case FreeAll:
(cast(^raw.Slice)&arena).len = 0; (^raw.Slice)(&arena.memory).len = 0;
case Resize: case Resize:
return default_resize_align(old_memory, old_size, size, alignment); return default_resize_align(old_memory, old_size, size, alignment);