X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fauxiliary%2Fcso_cache%2Fcso_hash.c;h=2939d719042d316c379e384336fb56e0263e3fd0;hb=e395ce03e92b707bef7080eae3c2daa7d9760e70;hp=e3495d5165a67c293e00ace96b33d5ce854ed9b0;hpb=789ed29d59b9c7c8cbef371311bfb3c507ae725a;p=mesa.git

diff --git a/src/gallium/auxiliary/cso_cache/cso_hash.c b/src/gallium/auxiliary/cso_cache/cso_hash.c
index e3495d5165a..2939d719042 100644
--- a/src/gallium/auxiliary/cso_cache/cso_hash.c
+++ b/src/gallium/auxiliary/cso_cache/cso_hash.c
@@ -73,22 +73,12 @@ static int countBits(int hint)
    return numBits;
 }
 
-static void *cso_data_allocate_node(struct cso_hash_data *hash)
-{
-   return MALLOC(sizeof(struct cso_node));
-}
-
-static void cso_free_node(struct cso_node *node)
-{
-   FREE(node);
-}
-
 static struct cso_node *
 cso_hash_create_node(struct cso_hash *hash,
-                      unsigned akey, void *avalue,
-                      struct cso_node **anextNode)
+                     unsigned akey, void *avalue,
+                     struct cso_node **anextNode)
 {
-   struct cso_node *node = cso_data_allocate_node(hash->data.d);
+   struct cso_node *node = MALLOC(sizeof(struct cso_node));
 
    if (!node)
       return NULL;
@@ -96,9 +86,9 @@ cso_hash_create_node(struct cso_hash *hash,
    node->key = akey;
    node->value = avalue;
 
-   node->next = (struct cso_node*)(*anextNode);
+   node->next = *anextNode;
    *anextNode = node;
-   ++hash->data.d->size;
+   ++hash->data.size;
    return node;
 }
 
@@ -116,7 +106,7 @@ static void cso_data_rehash(struct cso_hash_data *hash, int hint)
    }
 
    if (hash->numBits != hint) {
-      struct cso_node *e = (struct cso_node *)(hash);
+      struct cso_node *e = (struct cso_node *)hash;
       struct cso_node **oldBuckets = hash->buckets;
       int oldNumBuckets = hash->numBuckets;
       int  i = 0;
@@ -168,9 +158,10 @@ static void cso_data_has_shrunk(struct cso_hash_data *hash)
 
 static struct cso_node *cso_data_first_node(struct cso_hash_data *hash)
 {
-   struct cso_node *e = (struct cso_node *)(hash);
+   struct cso_node *e = (struct cso_node *)hash;
    struct cso_node **bucket = hash->buckets;
    int n = hash->numBuckets;
+
    while (n--) {
       if (*bucket != e)
          return *bucket;
@@ -180,61 +171,52 @@ static struct cso_node *cso_data_first_node(struct cso_hash_data *hash)
 }
 
 struct cso_hash_iter cso_hash_insert(struct cso_hash *hash,
-                                       unsigned key, void *data)
+                                     unsigned key, void *data)
 {
-   cso_data_might_grow(hash->data.d);
-
-   {
-      struct cso_node **nextNode = cso_hash_find_node(hash, key);
-      struct cso_node *node = cso_hash_create_node(hash, key, data, nextNode);
-      if (!node) {
-         struct cso_hash_iter null_iter = {hash, 0};
-         return null_iter;
-      }
+   cso_data_might_grow(&hash->data);
 
-      {
-         struct cso_hash_iter iter = {hash, node};
-         return iter;
-      }
+   struct cso_node **nextNode = cso_hash_find_node(hash, key);
+   struct cso_node *node = cso_hash_create_node(hash, key, data, nextNode);
+   if (!node) {
+      struct cso_hash_iter null_iter = {hash, 0};
+      return null_iter;
    }
+
+   struct cso_hash_iter iter = {hash, node};
+   return iter;
 }
 
-bool cso_hash_init(struct cso_hash *hash)
+void cso_hash_init(struct cso_hash *hash)
 {
-   hash->data.d = MALLOC_STRUCT(cso_hash_data);
-   if (!hash->data.d)
-      return false;
-
-   hash->data.d->fakeNext = 0;
-   hash->data.d->buckets = 0;
-   hash->data.d->size = 0;
-   hash->data.d->userNumBits = (short)MinNumBits;
-   hash->data.d->numBits = 0;
-   hash->data.d->numBuckets = 0;
-   return true;
+   hash->data.fakeNext = 0;
+   hash->data.buckets = 0;
+   hash->data.size = 0;
+   hash->data.userNumBits = (short)MinNumBits;
+   hash->data.numBits = 0;
+   hash->data.numBuckets = 0;
+   hash->end = (struct cso_node*)&hash->data;
 }
 
 void cso_hash_deinit(struct cso_hash *hash)
 {
-   struct cso_node *e_for_x = (struct cso_node *)(hash->data.d);
-   struct cso_node **bucket = (struct cso_node **)(hash->data.d->buckets);
-   int n = hash->data.d->numBuckets;
+   struct cso_node *e_for_x = hash->end;
+   struct cso_node **bucket = hash->data.buckets;
+   int n = hash->data.numBuckets;
+
    while (n--) {
       struct cso_node *cur = *bucket++;
       while (cur != e_for_x) {
          struct cso_node *next = cur->next;
-         cso_free_node(cur);
+         FREE(cur);
          cur = next;
       }
    }
-   FREE(hash->data.d->buckets);
-   FREE(hash->data.d);
-   hash->data.d = NULL;
+   FREE(hash->data.buckets);
 }
 
 unsigned cso_hash_iter_key(struct cso_hash_iter iter)
 {
-   if (!iter.node || iter.hash->data.e == iter.node)
+   if (!iter.node || iter.hash->end == iter.node)
       return 0;
    return iter.node->key;
 }
@@ -253,7 +235,7 @@ struct cso_node *cso_hash_data_next(struct cso_node *node)
    a.next = node->next;
    if (!a.next) {
       debug_printf("iterating beyond the last element\n");
-      return 0;
+      return NULL;
    }
    if (a.next->next)
       return a.next;
@@ -307,38 +289,38 @@ static struct cso_node *cso_hash_data_prev(struct cso_node *node)
    return a.e;
 }
 
-void * cso_hash_take(struct cso_hash *hash,
-                      unsigned akey)
+void *cso_hash_take(struct cso_hash *hash, unsigned akey)
 {
    struct cso_node **node = cso_hash_find_node(hash, akey);
-   if (*node != hash->data.e) {
+
+   if (*node != hash->end) {
       void *t = (*node)->value;
       struct cso_node *next = (*node)->next;
-      cso_free_node(*node);
+      FREE(*node);
       *node = next;
-      --hash->data.d->size;
-      cso_data_has_shrunk(hash->data.d);
+      --hash->data.size;
+      cso_data_has_shrunk(&hash->data);
       return t;
    }
-   return 0;
+   return NULL;
 }
 
 struct cso_hash_iter cso_hash_iter_prev(struct cso_hash_iter iter)
 {
    struct cso_hash_iter prev = {iter.hash,
-                                 cso_hash_data_prev(iter.node)};
+                                cso_hash_data_prev(iter.node)};
    return prev;
 }
 
 struct cso_hash_iter cso_hash_first_node(struct cso_hash *hash)
 {
-   struct cso_hash_iter iter = {hash, cso_data_first_node(hash->data.d)};
+   struct cso_hash_iter iter = {hash, cso_data_first_node(&hash->data)};
    return iter;
 }
 
 int cso_hash_size(struct cso_hash *hash)
 {
-   return hash->data.d->size;
+   return hash->data.size;
 }
 
 struct cso_hash_iter cso_hash_erase(struct cso_hash *hash, struct cso_hash_iter iter)
@@ -347,21 +329,21 @@ struct cso_hash_iter cso_hash_erase(struct cso_hash *hash, struct cso_hash_iter
    struct cso_node *node = iter.node;
    struct cso_node **node_ptr;
 
-   if (node == hash->data.e)
+   if (node == hash->end)
       return iter;
 
    ret = cso_hash_iter_next(ret);
-   node_ptr = (struct cso_node**)(&hash->data.d->buckets[node->key % hash->data.d->numBuckets]);
+   node_ptr = &hash->data.buckets[node->key % hash->data.numBuckets];
    while (*node_ptr != node)
       node_ptr = &(*node_ptr)->next;
    *node_ptr = node->next;
-   cso_free_node(node);
-   --hash->data.d->size;
+   FREE(node);
+   --hash->data.size;
    return ret;
 }
 
-boolean cso_hash_contains(struct cso_hash *hash, unsigned key)
+bool cso_hash_contains(struct cso_hash *hash, unsigned key)
 {
    struct cso_node **node = cso_hash_find_node(hash, key);
-   return (*node != hash->data.e);
+   return *node != hash->end;
 }