diff options
Diffstat (limited to 'gas')
-rw-r--r-- | gas/hash.c | 20 | ||||
-rw-r--r-- | gas/hash.h | 48 |
2 files changed, 38 insertions, 30 deletions
@@ -20,6 +20,26 @@ #include "as.h" +/* Hash function for a string_tuple. */ + +hashval_t +hash_string_tuple (const void *e) +{ + string_tuple_t *tuple = (string_tuple_t *) e; + return htab_hash_string (tuple->key); +} + +/* Equality function for a string_tuple. */ + +int +eq_string_tuple (const void *a, const void *b) +{ + const string_tuple_t *ea = (const string_tuple_t *) a; + const string_tuple_t *eb = (const string_tuple_t *) b; + + return strcmp (ea->key, eb->key) == 0; +} + /* Insert ELEMENT into HTAB. If REPLACE is non-zero existing elements are overwritten. If ELEMENT already exists, a pointer to the slot is returned. Otherwise NULL is returned. */ @@ -21,18 +21,6 @@ #ifndef HASH_H #define HASH_H -/* Insert ELEMENT into HTAB. If REPLACE is non-zero existing elements - are overwritten. If ELEMENT already exists, a pointer to the slot - is returned. Otherwise NULL is returned. */ - -extern void **htab_insert (htab_t, void * /* element */, int /* replace */); - -/* Print statistics about a hash table. */ - -extern void htab_print_statistics (FILE *f, const char *name, htab_t table); - -/* String hash table functions. */ - struct string_tuple { const char *key; @@ -43,28 +31,28 @@ typedef struct string_tuple string_tuple_t; /* Hash function for a string_tuple. */ -static hashval_t -hash_string_tuple (const void *e) -{ - string_tuple_t *tuple = (string_tuple_t *) e; - return htab_hash_string (tuple->key); -} +extern hashval_t hash_string_tuple (const void *); /* Equality function for a string_tuple. */ -static int -eq_string_tuple (const void *a, const void *b) -{ - const string_tuple_t *ea = (const string_tuple_t *) a; - const string_tuple_t *eb = (const string_tuple_t *) b; +extern int eq_string_tuple (const void *, const void *); - return strcmp (ea->key, eb->key) == 0; -} +/* Insert ELEMENT into HTAB. If REPLACE is non-zero existing elements + are overwritten. If ELEMENT already exists, a pointer to the slot + is returned. Otherwise NULL is returned. */ + +extern void **htab_insert (htab_t, void * /* element */, int /* replace */); + +/* Print statistics about a hash table. */ + +extern void htab_print_statistics (FILE *f, const char *name, htab_t table); + +/* Inline string hash table functions. */ static inline string_tuple_t * -string_tuple_alloc (const char *key, const void *value) +string_tuple_alloc (htab_t table, const char *key, const void *value) { - string_tuple_t *tuple = XNEW (string_tuple_t); + string_tuple_t *tuple = table->alloc_f (1, sizeof (*tuple)); tuple->key = key; tuple->value = value; return tuple; @@ -100,10 +88,10 @@ str_hash_delete (htab_t table, const char *key) static inline void ** str_hash_insert (htab_t table, const char *key, const void *value, int replace) { - string_tuple_t *elt = string_tuple_alloc (key, value); + string_tuple_t *elt = string_tuple_alloc (table, key, value); void **slot = htab_insert (table, elt, replace); - if (slot && !replace) - free (elt); + if (slot && !replace && table->free_f) + table->free_f (elt); return slot; } |