mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-06-06 18:54:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Default to panic allocator for wasm targets

Browse Source
This commit is contained in:
gingerBill
2023-06-26 15:55:52 +01:00
parent 6c6f9f7d25
commit 3d9328fd79
4 changed files with 59 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/mem/allocators.odin
View File

@@ -813,22 +813,22 @@ panic_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode,
switch mode {
case .Alloc:
if size > 0 {
panic("mem: panic allocator, .Alloc called")
panic("mem: panic allocator, .Alloc called", loc=loc)
}
case .Alloc_Non_Zeroed:
if size > 0 {
panic("mem: panic allocator, .Alloc_Non_Zeroed called")
panic("mem: panic allocator, .Alloc_Non_Zeroed called", loc=loc)
}
case .Resize:
if size > 0 {
panic("mem: panic allocator, .Resize called")
panic("mem: panic allocator, .Resize called", loc=loc)
}
case .Free:
if old_memory != nil {
panic("mem: panic allocator, .Free called")
panic("mem: panic allocator, .Free called", loc=loc)
}
case .Free_All:
panic("mem: panic allocator, .Free_All called")
panic("mem: panic allocator, .Free_All called", loc=loc)
case .Query_Features:
set := (^Allocator_Mode_Set)(old_memory)
@@ -838,7 +838,7 @@ panic_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode,
return nil, nil
case .Query_Info:
panic("mem: panic allocator, .Query_Info called")
panic("mem: panic allocator, .Query_Info called", loc=loc)
}
return nil, nil

4
core/runtime/default_allocators_js.odin
View File

@@ -1,5 +1,5 @@
//+build js
package runtime
default_allocator_proc :: nil_allocator_proc
default_allocator :: nil_allocator
default_allocator_proc :: panic_allocator_proc
default_allocator :: panic_allocator

50
core/runtime/default_allocators_nil.odin
View File

@@ -35,4 +35,52 @@ nil_allocator :: proc() -> Allocator {
when ODIN_OS == .Freestanding {
default_allocator_proc :: nil_allocator_proc
default_allocator :: nil_allocator
}
}
panic_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode,
size, alignment: int,
old_memory: rawptr, old_size: int, loc := #caller_location) -> ([]byte, Allocator_Error) {
switch mode {
case .Alloc:
if size > 0 {
panic("panic allocator, .Alloc called", loc=loc)
}
case .Alloc_Non_Zeroed:
if size > 0 {
panic("panic allocator, .Alloc_Non_Zeroed called", loc=loc)
}
case .Resize:
if size > 0 {
panic("panic allocator, .Resize called", loc=loc)
}
case .Free:
if old_memory != nil {
panic("panic allocator, .Free called", loc=loc)
}
case .Free_All:
panic("panic allocator, .Free_All called", loc=loc)
case .Query_Features:
set := (^Allocator_Mode_Set)(old_memory)
if set != nil {
set^ = {.Query_Features}
}
return nil, nil
case .Query_Info:
panic("panic allocator, .Query_Info called", loc=loc)
}
return nil, nil
}
panic_allocator :: proc() -> Allocator {
return Allocator{
procedure = nil_allocator_proc,
data = nil,
}
}

4
core/runtime/default_allocators_wasi.odin
View File

@@ -1,5 +1,5 @@
//+build wasi
package runtime
default_allocator_proc :: nil_allocator_proc
default_allocator :: nil_allocator
default_allocator_proc :: panic_allocator_proc
default_allocator :: panic_allocator