gas hash.h tidy

Only inline functions should be defined in hash.h, there's no benefit
in having multiple copies of hash_string_tuple and eq_string_tuple.
Also, use the table alloc_f when allocating tuples to be stored, so
that these functions are usable with different memory allocation
strategies.

	* hash.h (struct string_tuple, string_tuple_t): Move earlier.
	(string_tuple_alloc): Add table param, allocate using table alloc_f.
	(str_hash_insert): Adjust to suit.  Call table->free_f when
	entry is not used.
	(hash_string_tuple, eq_string_tuple): Move to..
	* hash.c: ..here.

2 files changed, 38 insertions, 30 deletions

diff --git a/gas/hash.c b/gas/hash.c
index 5ddd88e..aa6424e 100644
--- a/gas/hash.c
+++ b/gas/hash.c
@@ -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.  */
diff --git a/gas/hash.h b/gas/hash.h
index 2a7c996..21f4a6d 100644
--- a/gas/hash.h
+++ b/gas/hash.h
@@ -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;
 }