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

Try to make PtrMap work for 32-bit compilers

Browse Source
This commit is contained in:
gingerBill
2025-10-27 11:06:07 +00:00
parent 43529dda38
commit 13f2090608
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common.cpp
+5
View File
@@ -59,6 +59,11 @@ template <typename T> struct TypeIsPtrSizedInteger { enum {value = false}; };
template <> struct TypeIsPtrSizedInteger<isize> { enum {value = true}; }; template <> struct TypeIsPtrSizedInteger<isize> { enum {value = true}; };
template <> struct TypeIsPtrSizedInteger<usize> { enum {value = true}; }; template <> struct TypeIsPtrSizedInteger<usize> { enum {value = true}; };
template <typename T> struct TypeIs64BitInteger { enum {value = false}; };
template <> struct TypeIs64BitInteger<u64> { enum {value = true}; };
template <> struct TypeIs64BitInteger<i64> { enum {value = true}; };
#include "unicode.cpp" #include "unicode.cpp"
#include "array.cpp" #include "array.cpp"
src/ptr_map.cpp
+22 -8
View File
@@ -10,11 +10,25 @@ enum {
enum : MapIndex { MAP_SENTINEL = ~(MapIndex)0 }; enum : MapIndex { MAP_SENTINEL = ~(MapIndex)0 };
static void *const MAP_TOMBSTONE = (void *)~(uintptr)0;
template <typename T>
struct PtrMapConstant {
static constexpr T TOMBSTONE = (T)(void *)~(uintptr)0;
};
template <>
struct PtrMapConstant<u64> {
static constexpr u64 TOMBSTONE = ~(u64)0;
};
template <>
struct PtrMapConstant<i64> {
static constexpr i64 TOMBSTONE = ~(i64)0;
};
template <typename K, typename V> template <typename K, typename V>
struct PtrMapEntry { struct PtrMapEntry {
static_assert(sizeof(K) == sizeof(void *), "Key size must be pointer size"); static_assert(TypeIsPointer<K>::value || TypeIsPtrSizedInteger<K>::value || TypeIs64BitInteger<K>::value,
"PtrMapEntry::K must be a pointer or 8-byte integer");
K key; K key;
V value; V value;
@@ -99,7 +113,7 @@ gb_internal void map__insert(PtrMap<K, V> *h, K key, V const &value) {
MapIndex original_index = index; MapIndex original_index = index;
do { do {
auto *entry = h->entries+index; auto *entry = h->entries+index;
if (!entry->key || entry->key == cast(K)MAP_TOMBSTONE) { if (!entry->key || entry->key == PtrMapConstant<K>::TOMBSTONE) {
entry->key = key; entry->key = key;
entry->value = value; entry->value = value;
h->count += 1; h->count += 1;
@@ -147,7 +161,7 @@ gb_internal void map_reserve(PtrMap<K, V> *h, isize cap) {
for (u32 i = 0; i < h->capacity; i++) { for (u32 i = 0; i < h->capacity; i++) {
auto *entry = h->entries+i; auto *entry = h->entries+i;
if (entry->key && if (entry->key &&
entry->key != cast(K)MAP_TOMBSTONE) { entry->key != PtrMapConstant<K>::TOMBSTONE) {
map__insert(&new_h, entry->key, entry->value); map__insert(&new_h, entry->key, entry->value);
} }
} }
@@ -257,7 +271,7 @@ template <typename K, typename V>
gb_internal void map_remove(PtrMap<K, V> *h, K key) { gb_internal void map_remove(PtrMap<K, V> *h, K key) {
MapIndex found_index = 0; MapIndex found_index = 0;
if (map_try_get(h, key, &found_index)) { if (map_try_get(h, key, &found_index)) {
h->entries[found_index].key = cast(K)MAP_TOMBSTONE; h->entries[found_index].key = PtrMapConstant<K>::TOMBSTONE;
h->count -= 1; h->count -= 1;
} }
} }
@@ -367,7 +381,7 @@ struct PtrMapIterator {
return *this; return *this;
} }
PtrMapEntry<K, V> *entry = map->entries+index; PtrMapEntry<K, V> *entry = map->entries+index;
if (entry->key && entry->key != cast(K)MAP_TOMBSTONE) { if (entry->key && entry->key != PtrMapConstant<K>::TOMBSTONE) {
return *this; return *this;
} }
} }
@@ -404,7 +418,7 @@ gb_internal PtrMapIterator<K, V> begin(PtrMap<K, V> &m) noexcept {
MapIndex index = 0; MapIndex index = 0;
while (index < m.capacity) { while (index < m.capacity) {
auto key = m.entries[index].key; auto key = m.entries[index].key;
if (key && key != cast(K)MAP_TOMBSTONE) { if (key && key != PtrMapConstant<K>::TOMBSTONE) {
break; break;
} }
index++; index++;
@@ -420,7 +434,7 @@ gb_internal PtrMapIterator<K, V> const begin(PtrMap<K, V> const &m) noexcept {
MapIndex index = 0; MapIndex index = 0;
while (index < m.capacity) { while (index < m.capacity) {
auto key = m.entries[index].key; auto key = m.entries[index].key;
if (key && key != cast(K)MAP_TOMBSTONE) { if (key && key != PtrMapConstant<K>::TOMBSTONE) {
break; break;
} }
index++; index++;