ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 15:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unify hash logic for PtrSet

Browse Source
This commit is contained in:
gingerBill
2021-11-05 17:58:11 +00:00
parent 899cc71990
commit eb0faf9602
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ptr_set.cpp
+4 -6
View File
@@ -53,9 +53,8 @@ template <typename T>
gb_internal MapFindResult ptr_set__find(PtrSet<T> *s, T ptr) { gb_internal MapFindResult ptr_set__find(PtrSet<T> *s, T ptr) {
MapFindResult fr = {MAP_SENTINEL, MAP_SENTINEL, MAP_SENTINEL}; MapFindResult fr = {MAP_SENTINEL, MAP_SENTINEL, MAP_SENTINEL};
if (s->hashes.count != 0) { if (s->hashes.count != 0) {
u64 hash = 0xcbf29ce484222325ull ^ cast(u64)cast(uintptr)ptr; u32 hash = ptr_map_hash_key(ptr);
u64 n = cast(u64)s->hashes.count; fr.hash_index = cast(MapIndex)(hash & (s->hashes.count-1));
fr.hash_index = cast(MapIndex)(hash & (n-1));
fr.entry_index = s->hashes.data[fr.hash_index]; fr.entry_index = s->hashes.data[fr.hash_index];
while (fr.entry_index != MAP_SENTINEL) { while (fr.entry_index != MAP_SENTINEL) {
if (s->entries.data[fr.entry_index].ptr == ptr) { if (s->entries.data[fr.entry_index].ptr == ptr) {
@@ -72,9 +71,8 @@ template <typename T>
gb_internal MapFindResult ptr_set__find_from_entry(PtrSet<T> *s, PtrSetEntry<T> *e) { gb_internal MapFindResult ptr_set__find_from_entry(PtrSet<T> *s, PtrSetEntry<T> *e) {
MapFindResult fr = {MAP_SENTINEL, MAP_SENTINEL, MAP_SENTINEL}; MapFindResult fr = {MAP_SENTINEL, MAP_SENTINEL, MAP_SENTINEL};
if (s->hashes.count != 0) { if (s->hashes.count != 0) {
u64 hash = 0xcbf29ce484222325ull ^ cast(u64)cast(uintptr)e->ptr; u32 hash = ptr_map_hash_key(e->ptr);
u64 n = cast(u64)s->hashes.count; fr.hash_index = cast(MapIndex)(hash & (s->hashes.count-1));
fr.hash_index = cast(MapIndex)(hash & (n-1));
fr.entry_index = s->hashes.data[fr.hash_index]; fr.entry_index = s->hashes.data[fr.hash_index];
while (fr.entry_index != MAP_SENTINEL) { while (fr.entry_index != MAP_SENTINEL) {
if (&s->entries.data[fr.entry_index] == e) { if (&s->entries.data[fr.entry_index] == e) {