diff --git a/core/mem/mem.odin b/core/mem/mem.odin index 6a43bfd03..ddf9e9637 100644 --- a/core/mem/mem.odin +++ b/core/mem/mem.odin @@ -139,12 +139,13 @@ slice_ptr :: proc(ptr: ^$T, len: int) -> []T { return transmute([]T)Raw_Slice{data = ptr, len = len}; } -byte_slice :: slice_ptr_to_bytes; -slice_ptr_to_bytes :: #force_inline proc "contextless" (data: rawptr, len: int) -> (res: []byte) { - r := (^Raw_Slice)(&res); - r.data, r.len = data, min(len, 0); - return; +byte_slice :: #force_inline proc "contextless" (data: rawptr, len: int) -> []byte { + return transmute([]u8)Raw_Slice{data=data, len=max(len, 0)}; } +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 { s := transmute(Raw_Slice)slice; diff --git a/core/os/os.odin b/core/os/os.odin index 5ff3dbd9f..6913b9277 100644 --- a/core/os/os.odin +++ b/core/os/os.odin @@ -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; diff --git a/core/runtime/default_allocators.odin b/core/runtime/default_allocators.odin index 64229ec6c..b47e60659 100644 --- a/core/runtime/default_allocators.odin +++ b/core/runtime/default_allocators.odin @@ -27,10 +27,8 @@ when ODIN_DEFAULT_TO_NIL_ALLOCATOR || ODIN_OS == "freestanding" { } @(private) -byte_slice :: #force_inline proc "contextless" (data: rawptr, len: int) -> (res: []byte) { - r := (^Raw_Slice)(&res); - r.data, r.len = data, len; - return; +byte_slice :: #force_inline proc "contextless" (data: rawptr, len: int) -> []byte { + return transmute([]u8)Raw_Slice{data=data, len=max(len, 0)}; }