/* hash.c -- hash table routines for BFD
Copyright 1993, 1994, 1995, 1997, 1999, 2001, 2002, 2003, 2004, 2005,
- 2006 Free Software Foundation, Inc.
+ 2006, 2007 Free Software Foundation, Inc.
Written by Steve Chamberlain <sac@cygnus.com>
This file is part of BFD, the Binary File Descriptor library.
This program 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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+ MA 02110-1301, USA. */
-#include "bfd.h"
#include "sysdep.h"
+#include "bfd.h"
#include "libbfd.h"
#include "objalloc.h"
#include "libiberty.h"
*/
/* The default number of entries to use when creating a hash table. */
-#define DEFAULT_SIZE (4093)
+#define DEFAULT_SIZE 4051
/* The following function returns a nearest prime number which is
- greater than N, and near a power of two. Copied from libiberty. */
+ greater than N, and near a power of two. Copied from libiberty.
+ Returns zero for ridiculously large N to signify an error. */
static unsigned long
higher_prime_number (unsigned long n)
/* These are primes that are near, but slightly smaller than, a
power of two. */
static const unsigned long primes[] = {
- (unsigned long) 7,
- (unsigned long) 13,
- (unsigned long) 31,
- (unsigned long) 61,
(unsigned long) 127,
- (unsigned long) 251,
- (unsigned long) 509,
- (unsigned long) 1021,
(unsigned long) 2039,
- (unsigned long) 4093,
- (unsigned long) 8191,
- (unsigned long) 16381,
(unsigned long) 32749,
(unsigned long) 65521,
(unsigned long) 131071,
};
const unsigned long *low = &primes[0];
- const unsigned long *high = &primes[sizeof(primes) / sizeof(primes[0])];
+ const unsigned long *high = &primes[sizeof (primes) / sizeof (primes[0])];
while (low != high)
{
high = mid;
}
- /* If we've run out of primes, abort. */
- if (n > *low)
- {
- fprintf (stderr, "Cannot find prime bigger than %lu\n", n);
- abort ();
- }
+ if (n >= *low)
+ return 0;
return *low;
}
table->size = size;
table->entsize = entsize;
table->count = 0;
+ table->frozen = 0;
table->newfunc = newfunc;
return TRUE;
}
if (! create)
return NULL;
- hashp = (*table->newfunc) (NULL, table, string);
- if (hashp == NULL)
- return NULL;
if (copy)
{
char *new;
- table->count ++;
new = objalloc_alloc ((struct objalloc *) table->memory, len + 1);
if (!new)
memcpy (new, string, len + 1);
string = new;
}
+
+ return bfd_hash_insert (table, string, hash);
+}
+
+/* Insert an entry in a hash table. */
+
+struct bfd_hash_entry *
+bfd_hash_insert (struct bfd_hash_table *table,
+ const char *string,
+ unsigned long hash)
+{
+ struct bfd_hash_entry *hashp;
+ unsigned int index;
+
+ hashp = (*table->newfunc) (NULL, table, string);
+ if (hashp == NULL)
+ return NULL;
hashp->string = string;
hashp->hash = hash;
+ index = hash % table->size;
hashp->next = table->table[index];
table->table[index] = hashp;
+ table->count++;
- if (table->count > table->size * 3 / 4)
+ if (!table->frozen && table->count > table->size * 3 / 4)
{
- int newsize = higher_prime_number (table->size);
+ unsigned long newsize = higher_prime_number (table->size);
struct bfd_hash_entry **newtable;
unsigned int hi;
- unsigned int alloc;
+ unsigned long alloc = newsize * sizeof (struct bfd_hash_entry *);
- alloc = newsize * sizeof (struct bfd_hash_entry *);
+ /* If we can't find a higher prime, or we can't possibly alloc
+ that much memory, don't try to grow the table. */
+ if (newsize == 0 || alloc / sizeof (struct bfd_hash_entry *) != newsize)
+ {
+ table->frozen = 1;
+ return hashp;
+ }
newtable = ((struct bfd_hash_entry **)
objalloc_alloc ((struct objalloc *) table->memory, alloc));
+ if (newtable == NULL)
+ {
+ table->frozen = 1;
+ return hashp;
+ }
memset ((PTR) newtable, 0, alloc);
for (hi = 0; hi < table->size; hi ++)
{
struct bfd_hash_entry *chain = table->table[hi];
struct bfd_hash_entry *chain_end = chain;
- int index;
while (chain_end->next && chain_end->next->hash == chain->hash)
- chain_end = chain_end->next;
+ chain_end = chain_end->next;
table->table[hi] = chain_end->next;
index = chain->hash % newsize;
{
unsigned int i;
+ table->frozen = 1;
for (i = 0; i < table->size; i++)
{
struct bfd_hash_entry *p;
for (p = table->table[i]; p != NULL; p = p->next)
if (! (*func) (p, info))
- return;
+ goto out;
}
+ out:
+ table->frozen = 0;
}
\f
void
projects / binutils-gdb.git / blobdiff