X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Fhash.c;h=6fc8543a90dde5953ac8cb6f66f8ae9e5af32fe0;hb=284a3db38319f151535522c6a3bb978dffd7be4b;hp=6977ceeb53284c98e986d653f5152be82577547f;hpb=c19d120533277585363d82db26dec8f9ff603d0f;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/hash.c b/gas/hash.c index 6977ceeb53..6fc8543a90 100644 --- a/gas/hash.c +++ b/gas/hash.c @@ -1,13 +1,13 @@ /* hash.c -- gas hash table code Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, - 2000, 2001, 2002, 2003, 2005 + 2000, 2001, 2002, 2003, 2005, 2007, 2008, 2009 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) + the Free Software Foundation; either version 3, or (at your option) any later version. GAS is distributed in the hope that it will be useful, @@ -44,7 +44,7 @@ struct hash_entry { table. */ unsigned long hash; /* Pointer being stored in the hash table. */ - PTR data; + void *data; }; /* A hash table. */ @@ -90,16 +90,16 @@ get_gas_hash_table_size (void) { 1021, 4051, 8599, 16699, 65537 }; - unsigned int index; + unsigned int hindex; /* Work out the best prime number near the hash_size. FIXME: This could be a more sophisticated algorithm, but is it really worth implementing it ? */ - for (index = 0; index < ARRAY_SIZE (hash_size_primes) - 1; ++index) - if (gas_hash_table_size <= hash_size_primes[index]) + for (hindex = 0; hindex < ARRAY_SIZE (hash_size_primes) - 1; ++ hindex) + if (gas_hash_table_size <= hash_size_primes[hindex]) break; - return hash_size_primes[index]; + return hash_size_primes[hindex]; } /* Create a hash table. This return a control block. */ @@ -113,10 +113,10 @@ hash_new (void) size = get_gas_hash_table_size (); - ret = xmalloc (sizeof *ret); + ret = (struct hash_control *) xmalloc (sizeof *ret); obstack_begin (&ret->memory, chunksize); alloc = size * sizeof (struct hash_entry *); - ret->table = obstack_alloc (&ret->memory, alloc); + ret->table = (struct hash_entry **) obstack_alloc (&ret->memory, alloc); memset (ret->table, 0, alloc); ret->size = size; @@ -157,7 +157,7 @@ hash_lookup (struct hash_control *table, const char *key, size_t len, unsigned long hash; size_t n; unsigned int c; - unsigned int index; + unsigned int hindex; struct hash_entry **list; struct hash_entry *p; struct hash_entry *prev; @@ -179,8 +179,8 @@ hash_lookup (struct hash_control *table, const char *key, size_t len, if (phash != NULL) *phash = hash; - index = hash % table->size; - list = table->table + index; + hindex = hash % table->size; + list = table->table + hindex; if (plist != NULL) *plist = list; @@ -223,7 +223,7 @@ hash_lookup (struct hash_control *table, const char *key, size_t len, hash table. */ const char * -hash_insert (struct hash_control *table, const char *key, PTR value) +hash_insert (struct hash_control *table, const char *key, void *val) { struct hash_entry *p; struct hash_entry **list; @@ -240,7 +240,7 @@ hash_insert (struct hash_control *table, const char *key, PTR value) p = (struct hash_entry *) obstack_alloc (&table->memory, sizeof (*p)); p->string = key; p->hash = hash; - p->data = value; + p->data = val; p->next = *list; *list = p; @@ -253,7 +253,7 @@ hash_insert (struct hash_control *table, const char *key, PTR value) error. If an entry already exists, its value is replaced. */ const char * -hash_jam (struct hash_control *table, const char *key, PTR value) +hash_jam (struct hash_control *table, const char *key, void *val) { struct hash_entry *p; struct hash_entry **list; @@ -266,7 +266,7 @@ hash_jam (struct hash_control *table, const char *key, PTR value) ++table->replacements; #endif - p->data = value; + p->data = val; } else { @@ -277,7 +277,7 @@ hash_jam (struct hash_control *table, const char *key, PTR value) p = (struct hash_entry *) obstack_alloc (&table->memory, sizeof (*p)); p->string = key; p->hash = hash; - p->data = value; + p->data = val; p->next = *list; *list = p; @@ -290,11 +290,11 @@ hash_jam (struct hash_control *table, const char *key, PTR value) value stored for the entry. If the entry is not found in the hash table, this does nothing and returns NULL. */ -PTR -hash_replace (struct hash_control *table, const char *key, PTR value) +void * +hash_replace (struct hash_control *table, const char *key, void *value) { struct hash_entry *p; - PTR ret; + void *ret; p = hash_lookup (table, key, strlen (key), NULL, NULL); if (p == NULL) @@ -314,7 +314,7 @@ hash_replace (struct hash_control *table, const char *key, PTR value) /* Find an entry in a hash table, returning its value. Returns NULL if the entry is not found. */ -PTR +void * hash_find (struct hash_control *table, const char *key) { struct hash_entry *p; @@ -329,7 +329,7 @@ hash_find (struct hash_control *table, const char *key) /* As hash_find, but KEY is of length LEN and is not guaranteed to be NUL-terminated. */ -PTR +void * hash_find_n (struct hash_control *table, const char *key, size_t len) { struct hash_entry *p; @@ -344,8 +344,8 @@ hash_find_n (struct hash_control *table, const char *key, size_t len) /* Delete an entry from a hash table. This returns the value stored for that entry, or NULL if there is no such entry. */ -PTR -hash_delete (struct hash_control *table, const char *key) +void * +hash_delete (struct hash_control *table, const char *key, int freeme) { struct hash_entry *p; struct hash_entry **list; @@ -363,9 +363,8 @@ hash_delete (struct hash_control *table, const char *key) *list = p->next; - /* Note that we never reclaim the memory for this entry. If gas - ever starts deleting hash table entries in a big way, this will - have to change. */ + if (freeme) + obstack_free (&table->memory, p); return p->data; } @@ -375,7 +374,7 @@ hash_delete (struct hash_control *table, const char *key) void hash_traverse (struct hash_control *table, - void (*pfn) (const char *key, PTR value)) + void (*pfn) (const char *key, void *value)) { unsigned int i;