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

fix big alignment

Browse Source
This commit is contained in:
Laytan
2023-12-18 16:38:51 +01:00
parent 252de70b0f
commit 9a490e4e0d
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/mem/virtual/arena.odin
+1 -1
View File
@@ -106,7 +106,7 @@ arena_alloc :: proc(arena: ^Arena, size: uint, alignment: uint, loc := #caller_l
block_size := max(needed, arena.minimum_block_size) block_size := max(needed, arena.minimum_block_size)
new_block := memory_block_alloc(needed, block_size, {}) or_return new_block := memory_block_alloc(needed, block_size, alignment, {}) or_return
new_block.prev = arena.curr_block new_block.prev = arena.curr_block
arena.curr_block = new_block arena.curr_block = new_block
arena.total_reserved += new_block.reserved arena.total_reserved += new_block.reserved
core/mem/virtual/virtual.odin
+3 -3
View File
@@ -68,7 +68,7 @@ align_formula :: #force_inline proc "contextless" (size, align: uint) -> uint {
} }
@(require_results) @(require_results)
memory_block_alloc :: proc(committed, reserved: uint, flags: Memory_Block_Flags) -> (block: ^Memory_Block, err: Allocator_Error) { memory_block_alloc :: proc(committed, reserved: uint, alignment: uint, flags: Memory_Block_Flags) -> (block: ^Memory_Block, err: Allocator_Error) {
page_size := DEFAULT_PAGE_SIZE page_size := DEFAULT_PAGE_SIZE
assert(mem.is_power_of_two(uintptr(page_size))) assert(mem.is_power_of_two(uintptr(page_size)))
@@ -79,8 +79,8 @@ memory_block_alloc :: proc(committed, reserved: uint, flags: Memory_Block_Flags)
reserved = align_formula(reserved, page_size) reserved = align_formula(reserved, page_size)
committed = clamp(committed, 0, reserved) committed = clamp(committed, 0, reserved)
total_size := uint(reserved + size_of(Platform_Memory_Block)) total_size := uint(reserved + max(alignment, size_of(Platform_Memory_Block)))
base_offset := uintptr(size_of(Platform_Memory_Block)) base_offset := uintptr(max(alignment, size_of(Platform_Memory_Block)))
protect_offset := uintptr(0) protect_offset := uintptr(0)
do_protection := false do_protection := false
core/runtime/default_allocators_arena.odin
+6 -6
View File
@@ -28,11 +28,11 @@ safe_add :: #force_inline proc "contextless" (x, y: uint) -> (uint, bool) {
} }
@(require_results) @(require_results)
memory_block_alloc :: proc(allocator: Allocator, capacity: uint, loc := #caller_location) -> (block: ^Memory_Block, err: Allocator_Error) { memory_block_alloc :: proc(allocator: Allocator, capacity: uint, alignment: uint, loc := #caller_location) -> (block: ^Memory_Block, err: Allocator_Error) {
total_size := uint(capacity + size_of(Memory_Block)) total_size := uint(capacity + max(alignment, size_of(Memory_Block)))
base_offset := uintptr(size_of(Memory_Block)) base_offset := uintptr(max(alignment, size_of(Memory_Block)))
min_alignment: int = max(16, align_of(Memory_Block)) min_alignment: int = max(16, align_of(Memory_Block), int(alignment))
data := mem_alloc(int(total_size), min_alignment, allocator, loc) or_return data := mem_alloc(int(total_size), min_alignment, allocator, loc) or_return
block = (^Memory_Block)(raw_data(data)) block = (^Memory_Block)(raw_data(data))
end := uintptr(raw_data(data)[len(data):]) end := uintptr(raw_data(data)[len(data):])
@@ -115,7 +115,7 @@ arena_alloc :: proc(arena: ^Arena, size, alignment: uint, loc := #caller_locatio
arena.backing_allocator = default_allocator() arena.backing_allocator = default_allocator()
} }
new_block := memory_block_alloc(arena.backing_allocator, block_size, loc) or_return new_block := memory_block_alloc(arena.backing_allocator, block_size, alignment, loc) or_return
new_block.prev = arena.curr_block new_block.prev = arena.curr_block
arena.curr_block = new_block arena.curr_block = new_block
arena.total_capacity += new_block.capacity arena.total_capacity += new_block.capacity
@@ -134,7 +134,7 @@ arena_init :: proc(arena: ^Arena, size: uint, backing_allocator: Allocator, loc
arena^ = {} arena^ = {}
arena.backing_allocator = backing_allocator arena.backing_allocator = backing_allocator
arena.minimum_block_size = max(size, 1<<12) // minimum block size of 4 KiB arena.minimum_block_size = max(size, 1<<12) // minimum block size of 4 KiB
new_block := memory_block_alloc(arena.backing_allocator, arena.minimum_block_size, loc) or_return new_block := memory_block_alloc(arena.backing_allocator, arena.minimum_block_size, 0, loc) or_return
arena.curr_block = new_block arena.curr_block = new_block
arena.total_capacity += new_block.capacity arena.total_capacity += new_block.capacity
return nil return nil