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

Correctly support -default-to-nil-allocator for all platforms

Browse Source
This commit is contained in:
gingerBill
2021-11-04 11:03:21 +00:00
parent 1980f32bd6
commit 3fa7dabaa8
8 changed files with 81 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/runtime/core.odin
+4 -2
View File
@@ -506,8 +506,10 @@ __init_context :: proc "contextless" (c: ^Context) {
c.temp_allocator.procedure = default_temp_allocator_proc c.temp_allocator.procedure = default_temp_allocator_proc
c.temp_allocator.data = &global_default_temp_allocator_data c.temp_allocator.data = &global_default_temp_allocator_data
c.assertion_failure_proc = default_assertion_failure_proc when !ODIN_DISABLE_ASSERT {
c.assertion_failure_proc = default_assertion_failure_proc
}
c.logger.procedure = default_logger_proc c.logger.procedure = default_logger_proc
c.logger.data = nil c.logger.data = nil
core/runtime/default_allocators_general.odin
+2 -13
View File
@@ -5,19 +5,8 @@ package runtime
when ODIN_DEFAULT_TO_NIL_ALLOCATOR { when ODIN_DEFAULT_TO_NIL_ALLOCATOR {
// mem.nil_allocator reimplementation // mem.nil_allocator reimplementation
default_allocator_proc :: nil_allocator_proc
default_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode, default_allocator :: nil_allocator
size, alignment: int,
old_memory: rawptr, old_size: int, loc := #caller_location) -> ([]byte, Allocator_Error) {
return nil, .None
}
default_allocator :: proc() -> Allocator {
return Allocator{
procedure = default_allocator_proc,
data = nil,
}
}
} else { } else {
// TODO(bill): reimplement these procedures in the os_specific stuff // TODO(bill): reimplement these procedures in the os_specific stuff
import "core:os" import "core:os"
core/runtime/default_allocators_nil.odin
+27 -6
View File
@@ -1,17 +1,38 @@
//+build freestanding
package runtime package runtime
// mem.nil_allocator reimplementation nil_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode,
default_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode,
size, alignment: int, size, alignment: int,
old_memory: rawptr, old_size: int, loc := #caller_location) -> ([]byte, Allocator_Error) { old_memory: rawptr, old_size: int, loc := #caller_location) -> ([]byte, Allocator_Error) {
switch mode {
case .Alloc:
return nil, .Out_Of_Memory
case .Free:
return nil, .None
case .Free_All:
return nil, .Mode_Not_Implemented
case .Resize:
if size == 0 {
return nil, .None
}
return nil, .Out_Of_Memory
case .Query_Features:
return nil, .Mode_Not_Implemented
case .Query_Info:
return nil, .Mode_Not_Implemented
}
return nil, .None return nil, .None
} }
default_allocator :: proc() -> Allocator { nil_allocator :: proc() -> Allocator {
return Allocator{ return Allocator{
procedure = default_allocator_proc, procedure = nil_allocator_proc,
data = nil, data = nil,
} }
} }
when ODIN_OS == "freestanding" {
default_allocator_proc :: nil_allocator_proc
default_allocator :: nil_allocator
}
core/runtime/default_allocators_wasi.odin
+2 -29
View File
@@ -1,32 +1,5 @@
//+build wasi //+build wasi
package runtime package runtime
default_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode, default_allocator_proc :: nil_allocator_proc
size, alignment: int, default_allocator :: nil_allocator
old_memory: rawptr, old_size: int, loc := #caller_location) -> ([]byte, Allocator_Error) {
switch mode {
case .Alloc:
return nil, .Out_Of_Memory
case .Free:
return nil, .None
case .Free_All:
return nil, .Mode_Not_Implemented
case .Resize:
if size == 0 {
return nil, .None
}
return nil, .Out_Of_Memory
case .Query_Features:
return nil, .Mode_Not_Implemented
case .Query_Info:
return nil, .Mode_Not_Implemented
}
return nil, .None
}
default_allocator :: proc() -> Allocator {
return Allocator{
procedure = default_allocator_proc,
data = nil,
}
}
core/runtime/default_allocators_windows.odin
+32 -26
View File
@@ -1,38 +1,44 @@
//+build windows //+build windows
package runtime package runtime
default_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode, when ODIN_DEFAULT_TO_NIL_ALLOCATOR {
size, alignment: int, // mem.nil_allocator reimplementation
old_memory: rawptr, old_size: int, loc := #caller_location) -> (data: []byte, err: Allocator_Error) { default_allocator_proc :: nil_allocator_proc
switch mode { default_allocator :: nil_allocator
case .Alloc: } else {
data, err = _windows_default_alloc(size, alignment) default_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode,
size, alignment: int,
old_memory: rawptr, old_size: int, loc := #caller_location) -> (data: []byte, err: Allocator_Error) {
switch mode {
case .Alloc:
data, err = _windows_default_alloc(size, alignment)
case .Free: case .Free:
_windows_default_free(old_memory) _windows_default_free(old_memory)
case .Free_All: case .Free_All:
// NOTE(tetra): Do nothing. // NOTE(tetra): Do nothing.
case .Resize: case .Resize:
data, err = _windows_default_resize(old_memory, old_size, size, alignment) data, err = _windows_default_resize(old_memory, old_size, size, alignment)
case .Query_Features: case .Query_Features:
set := (^Allocator_Mode_Set)(old_memory) set := (^Allocator_Mode_Set)(old_memory)
if set != nil { if set != nil {
set^ = {.Alloc, .Free, .Resize, .Query_Features} set^ = {.Alloc, .Free, .Resize, .Query_Features}
}
case .Query_Info:
// Do nothing
} }
case .Query_Info: return
// Do nothing
} }
return default_allocator :: proc() -> Allocator {
} return Allocator{
procedure = default_allocator_proc,
default_allocator :: proc() -> Allocator { data = nil,
return Allocator{ }
procedure = default_allocator_proc,
data = nil,
} }
} }
core/runtime/default_temporary_allocator.odin
+5 -12
View File
@@ -3,21 +3,14 @@ package runtime
DEFAULT_TEMP_ALLOCATOR_BACKING_SIZE: int : #config(DEFAULT_TEMP_ALLOCATOR_BACKING_SIZE, 1<<22) DEFAULT_TEMP_ALLOCATOR_BACKING_SIZE: int : #config(DEFAULT_TEMP_ALLOCATOR_BACKING_SIZE, 1<<22)
when ODIN_OS == "freestanding" { when ODIN_OS == "freestanding" || ODIN_DEFAULT_TO_NIL_ALLOCATOR {
Default_Temp_Allocator :: struct { Default_Temp_Allocator :: struct {}
}
default_temp_allocator_init :: proc(s: ^Default_Temp_Allocator, size: int, backup_allocator := context.allocator) { default_temp_allocator_init :: proc(s: ^Default_Temp_Allocator, size: int, backup_allocator := context.allocator) {}
}
default_temp_allocator_destroy :: proc(s: ^Default_Temp_Allocator) { default_temp_allocator_destroy :: proc(s: ^Default_Temp_Allocator) {}
}
default_temp_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode, default_temp_allocator_proc :: nil_allocator_proc
size, alignment: int,
old_memory: rawptr, old_size: int, loc := #caller_location) -> (data: []byte, err: Allocator_Error) {
return nil, nil
}
} else { } else {
Default_Temp_Allocator :: struct { Default_Temp_Allocator :: struct {
data: []byte, data: []byte,
core/runtime/procs.odin
+3
View File
@@ -26,6 +26,7 @@ when ODIN_ARCH == "wasm32" || ODIN_ARCH == "wasm64" {
} }
} else when ODIN_NO_CRT { } else when ODIN_NO_CRT {
@(export)
@(link_name="memset") @(link_name="memset")
memset :: proc "c" (ptr: rawptr, val: i32, len: int) -> rawptr { memset :: proc "c" (ptr: rawptr, val: i32, len: int) -> rawptr {
if ptr != nil && len != 0 { if ptr != nil && len != 0 {
@@ -38,6 +39,7 @@ when ODIN_ARCH == "wasm32" || ODIN_ARCH == "wasm64" {
return ptr return ptr
} }
@(export)
@(link_name="memmove") @(link_name="memmove")
memmove :: proc "c" (dst, src: rawptr, len: int) -> rawptr { memmove :: proc "c" (dst, src: rawptr, len: int) -> rawptr {
if dst != src { if dst != src {
@@ -50,6 +52,7 @@ when ODIN_ARCH == "wasm32" || ODIN_ARCH == "wasm64" {
return dst return dst
} }
@(export)
@(link_name="memcpy") @(link_name="memcpy")
memcpy :: proc "c" (dst, src: rawptr, len: int) -> rawptr { memcpy :: proc "c" (dst, src: rawptr, len: int) -> rawptr {
if dst != src { if dst != src {
core/runtime/procs_windows_amd64.odin
+6 -4
View File
@@ -20,11 +20,13 @@ windows_trap_type_assertion :: proc "contextless" () -> ! {
} }
when ODIN_NO_CRT { when ODIN_NO_CRT {
@private @(private, export, link_name="_tls_index")
@(link_name="_tls_index")
_tls_index: u32 _tls_index: u32
@private @(private, export, link_name="_fltused")
@(link_name="_fltused")
_fltused: i32 = 0x9875 _fltused: i32 = 0x9875
@(private, export, link_name="__chkstk")
__chkstk :: proc "c" (rawptr) {
}
} }