ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 15:18:49 +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/mem/mem.odin
+6 -5
View File
@@ -139,12 +139,13 @@ slice_ptr :: proc(ptr: ^$T, len: int) -> []T {
return transmute([]T)Raw_Slice{data = ptr, len = len}; return transmute([]T)Raw_Slice{data = ptr, len = len};
} }
byte_slice :: slice_ptr_to_bytes; byte_slice :: #force_inline proc "contextless" (data: rawptr, len: int) -> []byte {
slice_ptr_to_bytes :: #force_inline proc "contextless" (data: rawptr, len: int) -> (res: []byte) { return transmute([]u8)Raw_Slice{data=data, len=max(len, 0)};
r := (^Raw_Slice)(&res);
r.data, r.len = data, min(len, 0);
return;
} }
slice_ptr_to_bytes :: proc(data: rawptr, len: int) -> []byte {
return transmute([]u8)Raw_Slice{data=data, len=max(len, 0)};
}
slice_to_bytes :: proc(slice: $E/[]$T) -> []byte { slice_to_bytes :: proc(slice: $E/[]$T) -> []byte {
s := transmute(Raw_Slice)slice; s := transmute(Raw_Slice)slice;
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, heap_allocator_proc :: proc(allocator_data: rawptr, mode: mem.Allocator_Mode,
size, alignment: int, size, alignment: int,
old_memory: rawptr, old_size: int, loc := #caller_location) -> ([]byte, mem.Allocator_Error) { 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. // NOTE(tetra, 2020-01-14): The heap doesn't respect alignment.
// Instead, we overallocate by `alignment + size_of(rawptr) - 1`, and insert // 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); aligned_mem = rawptr(aligned_ptr);
mem.ptr_offset((^rawptr)(aligned_mem), -1)^ = allocated_mem; 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) { aligned_free :: proc(p: rawptr) {
@@ -207,7 +201,7 @@ heap_allocator_proc :: proc(allocator_data: rawptr, mode: mem.Allocator_Mode,
if set != nil { if set != nil {
set^ = {.Alloc, .Free, .Resize, .Query_Features}; set^ = {.Alloc, .Free, .Resize, .Query_Features};
} }
return byte_slice(set, size_of(set^)), .None; return nil, nil;
case .Query_Info: case .Query_Info:
return nil, nil; return nil, nil;
core/runtime/default_allocators.odin
+2 -4
View File
@@ -27,10 +27,8 @@ when ODIN_DEFAULT_TO_NIL_ALLOCATOR || ODIN_OS == "freestanding" {
} }
@(private) @(private)
byte_slice :: #force_inline proc "contextless" (data: rawptr, len: int) -> (res: []byte) { byte_slice :: #force_inline proc "contextless" (data: rawptr, len: int) -> []byte {
r := (^Raw_Slice)(&res); return transmute([]u8)Raw_Slice{data=data, len=max(len, 0)};
r.data, r.len = data, len;
return;
} }