Use hash tables even for context-sensitive macros

Normally, contexts aren't used with a large number of macros, but in
case someone does, do use hash tables for those as well.  This
simplifies the code somewhat, since *all* handling of macros is now
done via hash tables.

Future note: consider if it wouldn't be better to allow struct
hash_table to be allocated by the caller, instead of being allocated
by the hash table routine.

1 files changed, 4 insertions, 5 deletions

diff --git a/hashtbl.c b/hashtbl.c
index 458bb25..568f755 100644
--- a/hashtbl.c
+++ b/hashtbl.c
@@ -11,7 +11,6 @@
 #include "nasm.h"
 #include "hashtbl.h"
 
-#define HASH_INITIAL_SIZE	64
 #define HASH_MAX_LOAD		2 /* Higher = more memory-efficient, slower */
 
 static struct hash_tbl_node *alloc_table(size_t newsize)
@@ -22,14 +21,14 @@ static struct hash_tbl_node *alloc_table(size_t newsize)
     return newtbl;
 }
 
-struct hash_table *hash_init(void)
+struct hash_table *hash_init(size_t size)
 {
     struct hash_table *head = nasm_malloc(sizeof(struct hash_table));
 
-    head->table    = alloc_table(HASH_INITIAL_SIZE);
+    head->table    = alloc_table(size);
     head->load     = 0;
-    head->size     = HASH_INITIAL_SIZE;
-    head->max_load = HASH_INITIAL_SIZE*(HASH_MAX_LOAD-1)/HASH_MAX_LOAD;
+    head->size     = size;
+    head->max_load = size*(HASH_MAX_LOAD-1)/HASH_MAX_LOAD;
 
     return head;
 }