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

Fix #906

Browse Source
This commit is contained in:
gingerBill
2021-04-20 10:34:41 +01:00
parent ba9f0dd553
commit e9b1d4f633
3 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/os/os.odin
+2 -8
View File
@@ -134,12 +134,6 @@ read_ptr :: proc(fd: Handle, data: rawptr, len: int) -> (int, Errno) {
heap_allocator_proc :: proc(allocator_data: rawptr, mode: mem.Allocator_Mode,
size, alignment: int,
old_memory: rawptr, old_size: int, loc := #caller_location) -> ([]byte, mem.Allocator_Error) {
byte_slice :: #force_inline proc "contextless" (data: rawptr, len: int) -> (res: []byte) {
r := (^mem.Raw_Slice)(&res);
r.data, r.len = data, len;
return;
}
//
// NOTE(tetra, 2020-01-14): The heap doesn't respect alignment.
// Instead, we overallocate by `alignment + size_of(rawptr) - 1`, and insert
@@ -170,7 +164,7 @@ heap_allocator_proc :: proc(allocator_data: rawptr, mode: mem.Allocator_Mode,
aligned_mem = rawptr(aligned_ptr);
mem.ptr_offset((^rawptr)(aligned_mem), -1)^ = allocated_mem;
return byte_slice(aligned_mem, size), .None;
return mem.byte_slice(aligned_mem, size), nil;
}
aligned_free :: proc(p: rawptr) {
@@ -207,7 +201,7 @@ heap_allocator_proc :: proc(allocator_data: rawptr, mode: mem.Allocator_Mode,
if set != nil {
set^ = {.Alloc, .Free, .Resize, .Query_Features};
}
return byte_slice(set, size_of(set^)), .None;
return nil, nil;
case .Query_Info:
return nil, nil;