aboutsummaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
Diffstat (limited to 'base')
-rw-r--r--base/runtime/heap_allocator.odin13
-rw-r--r--base/runtime/heap_allocator_other.odin6
-rw-r--r--base/runtime/heap_allocator_unix.odin6
-rw-r--r--base/runtime/heap_allocator_windows.odin49
-rw-r--r--base/runtime/os_specific_windows.odin57
5 files changed, 44 insertions, 87 deletions
diff --git a/base/runtime/heap_allocator.odin b/base/runtime/heap_allocator.odin
index a9d299275..c77a14a79 100644
--- a/base/runtime/heap_allocator.odin
+++ b/base/runtime/heap_allocator.odin
@@ -94,4 +94,17 @@ heap_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode,
}
return nil, nil
+}
+
+
+heap_alloc :: proc(size: int, zero_memory := true) -> rawptr {
+ return _heap_alloc(size, zero_memory)
+}
+
+heap_resize :: proc(ptr: rawptr, new_size: int) -> rawptr {
+ return heap_resize(ptr, new_size)
+}
+
+heap_free :: proc(ptr: rawptr) {
+ _heap_free(ptr)
} \ No newline at end of file
diff --git a/base/runtime/heap_allocator_other.odin b/base/runtime/heap_allocator_other.odin
index f3f199d7b..45049c7e9 100644
--- a/base/runtime/heap_allocator_other.odin
+++ b/base/runtime/heap_allocator_other.odin
@@ -2,14 +2,14 @@
//+private
package runtime
-heap_alloc :: proc(size: int, zero_memory := true) -> rawptr {
+_heap_alloc :: proc(size: int, zero_memory := true) -> rawptr {
unimplemented("base:runtime 'heap_alloc' procedure is not supported on this platform")
}
-heap_resize :: proc(ptr: rawptr, new_size: int) -> rawptr {
+_heap_resize :: proc(ptr: rawptr, new_size: int) -> rawptr {
unimplemented("base:runtime 'heap_resize' procedure is not supported on this platform")
}
-heap_free :: proc(ptr: rawptr) {
+_heap_free :: proc(ptr: rawptr) {
unimplemented("base:runtime 'heap_free' procedure is not supported on this platform")
} \ No newline at end of file
diff --git a/base/runtime/heap_allocator_unix.odin b/base/runtime/heap_allocator_unix.odin
index 87fb655b1..bfbbb5303 100644
--- a/base/runtime/heap_allocator_unix.odin
+++ b/base/runtime/heap_allocator_unix.odin
@@ -16,7 +16,7 @@ foreign libc {
@(link_name="realloc") _unix_realloc :: proc(ptr: rawptr, size: int) -> rawptr ---
}
-heap_alloc :: proc(size: int, zero_memory := true) -> rawptr {
+_heap_alloc :: proc(size: int, zero_memory := true) -> rawptr {
if size <= 0 {
return nil
}
@@ -27,12 +27,12 @@ heap_alloc :: proc(size: int, zero_memory := true) -> rawptr {
}
}
-heap_resize :: proc(ptr: rawptr, new_size: int) -> rawptr {
+_heap_resize :: proc(ptr: rawptr, new_size: int) -> rawptr {
// NOTE: _unix_realloc doesn't guarantee new memory will be zeroed on
// POSIX platforms. Ensure your caller takes this into account.
return _unix_realloc(ptr, new_size)
}
-heap_free :: proc(ptr: rawptr) {
+_heap_free :: proc(ptr: rawptr) {
_unix_free(ptr)
} \ No newline at end of file
diff --git a/base/runtime/heap_allocator_windows.odin b/base/runtime/heap_allocator_windows.odin
index 1c521c42f..2097c3671 100644
--- a/base/runtime/heap_allocator_windows.odin
+++ b/base/runtime/heap_allocator_windows.odin
@@ -5,34 +5,35 @@ foreign import kernel32 "system:Kernel32.lib"
@(private="file")
@(default_calling_convention="system")
foreign kernel32 {
- // NOTE(bill): The types are not using the standard names (e.g. DWORD and LPVOID) to just minimizing the dependency
+ // NOTE(bill): The types are not using the standard names (e.g. DWORD and LPVOID) to just minimizing the dependency
- // default_allocator
- GetProcessHeap :: proc() -> rawptr ---
- HeapAlloc :: proc(hHeap: rawptr, dwFlags: u32, dwBytes: uint) -> rawptr ---
- HeapReAlloc :: proc(hHeap: rawptr, dwFlags: u32, lpMem: rawptr, dwBytes: uint) -> rawptr ---
- HeapFree :: proc(hHeap: rawptr, dwFlags: u32, lpMem: rawptr) -> b32 ---
+ // default_allocator
+ GetProcessHeap :: proc() -> rawptr ---
+ HeapAlloc :: proc(hHeap: rawptr, dwFlags: u32, dwBytes: uint) -> rawptr ---
+ HeapReAlloc :: proc(hHeap: rawptr, dwFlags: u32, lpMem: rawptr, dwBytes: uint) -> rawptr ---
+ HeapFree :: proc(hHeap: rawptr, dwFlags: u32, lpMem: rawptr) -> b32 ---
}
-heap_alloc :: proc "contextless" (size: int, zero_memory := true) -> rawptr {
- HEAP_ZERO_MEMORY :: 0x00000008
- return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY if zero_memory else 0, uint(size))
+_heap_alloc :: proc(size: int, zero_memory := true) -> rawptr {
+ HEAP_ZERO_MEMORY :: 0x00000008
+ return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY if zero_memory else 0, uint(size))
}
-heap_resize :: proc "contextless" (ptr: rawptr, new_size: int) -> rawptr {
- if new_size == 0 {
- heap_free(ptr)
- return nil
- }
- if ptr == nil {
- return heap_alloc(new_size)
- }
+_heap_resize :: proc(ptr: rawptr, new_size: int) -> rawptr {
+ if new_size == 0 {
+ _heap_free(ptr)
+ return nil
+ }
+ if ptr == nil {
+ return _heap_alloc(new_size)
+ }
- HEAP_ZERO_MEMORY :: 0x00000008
- return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ptr, uint(new_size))
+ HEAP_ZERO_MEMORY :: 0x00000008
+ return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ptr, uint(new_size))
}
-heap_free :: proc "contextless" (ptr: rawptr) {
- if ptr == nil {
- return
- }
- HeapFree(GetProcessHeap(), 0, ptr)
+_heap_free :: proc(ptr: rawptr) {
+ if ptr == nil {
+ return
+ }
+ HeapFree(GetProcessHeap(), 0, ptr)
}
+
diff --git a/base/runtime/os_specific_windows.odin b/base/runtime/os_specific_windows.odin
index 3eb96c0cc..74681a3ab 100644
--- a/base/runtime/os_specific_windows.odin
+++ b/base/runtime/os_specific_windows.odin
@@ -49,60 +49,3 @@ _os_write :: proc "contextless" (data: []byte) -> (n: int, err: _OS_Errno) #no_b
n = int(total_write)
return
}
-
-
-
-//
-// NOTE(tetra, 2020-01-14): The heap doesn't respect alignment.
-// Instead, we overallocate by `alignment + size_of(rawptr) - 1`, and insert
-// padding. We also store the original pointer returned by heap_alloc right before
-// the pointer we return to the user.
-//
-
-
-
-_windows_default_alloc_or_resize :: proc "contextless" (size, alignment: int, old_ptr: rawptr = nil, zero_memory := true) -> ([]byte, Allocator_Error) {
- if size == 0 {
- _windows_default_free(old_ptr)
- return nil, nil
- }
-
- a := max(alignment, align_of(rawptr))
- space := size + a - 1
-
- allocated_mem: rawptr
- if old_ptr != nil {
- original_old_ptr := ([^]rawptr)(old_ptr)[-1]
- allocated_mem = heap_resize(original_old_ptr, space+size_of(rawptr))
- } else {
- allocated_mem = heap_alloc(space+size_of(rawptr), zero_memory)
- }
- aligned_mem := ([^]u8)(allocated_mem)[size_of(rawptr):]
-
- ptr := uintptr(aligned_mem)
- aligned_ptr := (ptr - 1 + uintptr(a)) & -uintptr(a)
- diff := int(aligned_ptr - ptr)
- if (size + diff) > space || allocated_mem == nil {
- return nil, .Out_Of_Memory
- }
-
- aligned_mem = ([^]byte)(aligned_ptr)
- ([^]rawptr)(aligned_mem)[-1] = allocated_mem
-
- return aligned_mem[:size], nil
-}
-
-_windows_default_alloc :: proc "contextless" (size, alignment: int, zero_memory := true) -> ([]byte, Allocator_Error) {
- return _windows_default_alloc_or_resize(size, alignment, nil, zero_memory)
-}
-
-
-_windows_default_free :: proc "contextless" (ptr: rawptr) {
- if ptr != nil {
- heap_free(([^]rawptr)(ptr)[-1])
- }
-}
-
-_windows_default_resize :: proc "contextless" (p: rawptr, old_size: int, new_size: int, new_alignment: int) -> ([]byte, Allocator_Error) {
- return _windows_default_alloc_or_resize(new_size, new_alignment, p)
-}
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-15 07:46:13 +0000