adding stuff

1 files changed, 106 insertions, 12 deletions

diff --git a/cheesemap.c b/cheesemap.c
index 5e6c124..efa4751 100644
--- a/cheesemap.c
+++ b/cheesemap.c
@@ -1,33 +1,129 @@
 #include "cheesemap.h"
 
+#include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
+#include <string.h>
 
-static inline uintptr_t cm_raw_capacity(const struct cheesemap_raw* map) {
-  assert(map != NULL);
-  return map->cap_mask + 1;
+static inline uintptr_t cm_ctz(uintptr_t val) {
+  assert(val != 0);
+#if defined(__GNUC__) || defined(__clang__)
+#if UINTPTR_MAX == UINT64_MAX
+  return (uintptr_t)__builtin_ctzll(val);
+#elif UINTPTR_MAX == UINT32_MAX
+  return (uintptr_t)__builtin_ctz(val);
+#else
+#error "unknown word width"
+#endif
+#else
+#error "ctz not implemented for this compiler"
+#endif
+}
+
+struct sequence {
+  uintptr_t pos;
+  uintptr_t stride;
+};
+
+#define sequence_init(pos, stride) ((struct sequence){pos, stride})
+
+static inline void cm_sequence_next(struct sequence* sequence,
+                                    uintptr_t bucket_mask) {
+  assert(sequence != NULL);
+  assert(sequence->stride <= bucket_mask);
+
+  sequence->stride += CM_GROUP_SIZE;
+  sequence->pos += sequence->stride;
+  sequence->pos &= bucket_mask;
 }
 
+/* group ops */
+static inline group_t cm_group_load(const uint8_t* ctrl);
+static inline bitmask_t cm_group_empty_or_deleted(group_t group);
+
+/* scalar implementation */
+static inline group_t cm_group_repeat(uint8_t v) {
+  return (group_t)v * (((group_t)-1) / (uint8_t)~0);
+}
+
+static inline group_t cm_group_load(const uint8_t* ctrl) {
+  assert(ctrl != NULL);
+
+  group_t v;
+  memcpy(&v, ctrl, sizeof(v));
+  return v;
+}
+
+static inline bitmask_t cm_group_empty_or_deleted(group_t group) {
+  return group & cm_group_repeat(CM_CTRL_DELETED);
+}
+
+/* static ctrl's */
+const uint8_t CM_CTRL_STATIC_EMPTY[CM_GROUP_SIZE] = {
+    CM_CTRL_EMPTY, CM_CTRL_EMPTY, CM_CTRL_EMPTY, CM_CTRL_EMPTY,
+    CM_CTRL_EMPTY, CM_CTRL_EMPTY, CM_CTRL_EMPTY, CM_CTRL_EMPTY,
+};
+
+/* hashmap implementation */
 static inline uint8_t* cm_raw_origin(const struct cheesemap_raw* map,
                                      uintptr_t entry_size) {
   assert(map != NULL);
-  return map->ctrl - entry_size * cm_raw_capacity(map);
+  return map->ctrl - entry_size * (map->bucket_mask + 1);
+}
+
+static bool cm_raw_find_insert_index_in_group(const struct cheesemap_raw* map,
+                                              const group_t* group,
+                                              const struct sequence* seq,
+                                              uintptr_t* out_index) {
+  assert(map != NULL);
+  assert(group != NULL && seq != NULL);
+  assert(out_index != NULL);
+
+  bitmask_t mask = cm_group_empty_or_deleted(*group);
+  if (mask == 0) return false;
+
+  uintptr_t bit = cm_ctz(mask);
+  *out_index = (seq->pos + bit) & map->bucket_mask;
+  return true;
+}
+
+static uintptr_t cm_raw_find_insert_index(const struct cheesemap_raw* map,
+                                          cm_hash_t hash) {
+  assert(map != NULL);
+
+  struct sequence seq = sequence_init(cm_h1(hash) & map->bucket_mask, 0);
+  while (true) {
+    uint8_t* ctrl = &map->ctrl[seq.pos];
+    group_t group = cm_group_load(ctrl);
+
+    uintptr_t index;
+    if (cm_raw_find_insert_index_in_group(map, &group, &seq, &index)) return index;
+    cm_sequence_next(&seq, map->bucket_mask);
+  }
+}
+
+void cm_raw_insert(struct cheesemap_raw* map, const struct cheesemap_fns* fns,
+                   cm_hash_t hash, const void* value) {
+  assert(map != NULL && fns != NULL);
+  assert(value != NULL);
 }
 
 void cm_raw_drop(struct cheesemap_raw* map, uintptr_t entry_size,
-                 struct cheesemap_fns* fns) {
+                 const struct cheesemap_fns* fns) {
   assert(map != NULL);
   assert(fns != NULL);
 
-  if (map->ctrl == NULL) return;
+  if (map->ctrl == CM_CTRL_STATIC_EMPTY || map->ctrl == NULL) return;
 
   uint8_t* origin = cm_raw_origin(map, entry_size);
   fns->free(origin, fns->mem_usr);
+
+  *map = cm_raw_new();
 }
 
-void cm_new(struct cheesemap* map, uintptr_t entry_size,
-                          uint8_t* mem_usr, cm_malloc_fn malloc, cm_free_fn free,
-                          uint8_t* map_usr, cm_hash_fn hash,
-                          cm_compare_fn compare) {
+void cm_new(struct cheesemap* map, uintptr_t entry_size, uint8_t* mem_usr,
+            cm_malloc_fn malloc, cm_free_fn free, uint8_t* map_usr,
+            cm_hash_fn hash, cm_compare_fn compare) {
   assert(map != NULL);
   assert(malloc != NULL && free != NULL);
   assert(hash != NULL && compare != NULL);
@@ -37,7 +133,5 @@ void cm_new(struct cheesemap* map, uintptr_t entry_size,
       malloc,  free,     //
       hash,    compare,  //
   };
-
   *map = (struct cheesemap){entry_size, fns, cm_raw_new()};
 }
-