ed/SectrPrototype
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfixing the runtime (rendering not working yet)

Browse Source
This commit is contained in:
Edward R. Gonzalez
2024-06-11 22:20:19 -04:00
parent 82e7482c85
commit 5bd6519b6a
11 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/grime/array.odin
View File

@ -79,10 +79,11 @@ array_append_array :: proc( using self: ^Array( $ Type), other : Array(Type)) ->
// Note(Ed) : Original code from gencpp
// libc.memcpy( ptr_offset(data, num), raw_data(items), len(items) * size_of(Type) )
// TODO(Ed) : VERIFY VIA DEBUG THIS COPY IS FINE.
ensure(false, "time to check....")
target := ptr_offset( data, num )
copy( slice_ptr(target, int(capacity - num)), array_to_slice(other) )
dst_slice := slice_ptr(target, int(capacity - num))
src_slice := array_to_slice(other)
copy( dst_slice, src_slice )
num += other.num
return AllocatorError.None

17
code/grime/hashmap_chained.odin
View File

@ -14,6 +14,7 @@ and direct pointers are kept across the codebase instead of a key to the slot.
package grime
import "core:mem"
import "base:runtime"
HTable_Minimum_Capacity :: 4 * Kilobyte
@ -111,7 +112,11 @@ hmap_chained_lookup_id :: #force_inline proc( using self : HMapChained($Type), k
hmap_chained_get :: proc( using self : HMapChained($Type), key : u64) -> ^Type
{
// profile(#procedure)
surface_slot := lookup[hmap_chained_lookup_id(self, key)]
hash_index := hmap_chained_lookup_id(self, key)
// if hash_index == 565 {
// runtime.debug_trap()
// }
surface_slot := lookup[hash_index]
if surface_slot == nil {
return nil
@ -178,7 +183,7 @@ hmap_chained_set :: proc( self : HMapChained($Type), key : u64, value : Type ) -
error := AllocatorError.None
if slot.next == nil {
block : []byte
block, error = pool_grab(pool)
block, error = pool_grab(pool, true)
next := transmute( ^HMapChainedSlot(Type)) & block[0]
slot.next = next
next.prev = slot
@ -190,7 +195,7 @@ hmap_chained_set :: proc( self : HMapChained($Type), key : u64, value : Type ) -
}
if surface_slot == nil {
block, error := pool_grab(pool)
block, error := pool_grab(pool, true)
surface_slot := transmute( ^HMapChainedSlot(Type)) & block[0]
surface_slot.key = key
surface_slot.value = value
@ -201,7 +206,7 @@ hmap_chained_set :: proc( self : HMapChained($Type), key : u64, value : Type ) -
}
lookup[hash_index] = surface_slot
block, error = pool_grab(pool)
block, error = pool_grab(pool, true)
next := transmute( ^HMapChainedSlot(Type)) & block[0]
surface_slot.next = next
next.prev = surface_slot
@ -214,12 +219,12 @@ hmap_chained_set :: proc( self : HMapChained($Type), key : u64, value : Type ) -
return result, error
}
slot := surface_slot.next
slot : ^HMapChainedSlot(Type) = surface_slot.next
for ; slot != nil; slot = slot.next
{
if !slot.occupied
{
result, error := set_slot( self, surface_slot, key, value)
result, error := set_slot( self, slot, key, value)
return result, error
}
}