/* hash.c -- hash table routines for BFD
- Copyright (C) 1993-2014 Free Software Foundation, Inc.
+ Copyright (C) 1993-2021 Free Software Foundation, Inc.
Written by Steve Chamberlain <sac@cygnus.com>
This file is part of BFD, the Binary File Descriptor library.
.struct bfd_hash_entry *
.@var{function_name} (struct bfd_hash_entry *entry,
-. struct bfd_hash_table *table,
-. const char *string)
+. struct bfd_hash_table *table,
+. const char *string)
.{
. struct @var{entry_type} *ret = (@var{entry_type} *) entry;
.
. {
. ret = bfd_hash_allocate (table, sizeof (* ret));
. if (ret == NULL)
-. return NULL;
+. return NULL;
. }
.
. {* Call the allocation method of the base class. *}
. ret = ((@var{entry_type} *)
-. @var{base_newfunc} ((struct bfd_hash_entry *) ret, table, string));
+. @var{base_newfunc} ((struct bfd_hash_entry *) ret, table, string));
.
. {* Initialize the local fields here. *}
.
unsigned int len;
unsigned int c;
+ BFD_ASSERT (string != NULL);
hash = 0;
len = 0;
s = (const unsigned char *) string;
char *new_string;
new_string = (char *) objalloc_alloc ((struct objalloc *) table->memory,
- len + 1);
+ len + 1);
if (!new_string)
{
bfd_set_error (bfd_error_no_memory);
{
if (entry == NULL)
entry = (struct bfd_hash_entry *) bfd_hash_allocate (table,
- sizeof (* entry));
+ sizeof (* entry));
return entry;
}
unsigned long
bfd_hash_set_default_size (unsigned long hash_size)
{
- /* Extend this prime list if you want more granularity of hash table size. */
- static const unsigned long hash_size_primes[] =
- {
- 31, 61, 127, 251, 509, 1021, 2039, 4091, 8191, 16381, 32749, 65537
- };
- unsigned int _index;
-
- /* Work out best prime number near the hash_size. */
- for (_index = 0; _index < ARRAY_SIZE (hash_size_primes) - 1; ++_index)
- if (hash_size <= hash_size_primes[_index])
- break;
-
- bfd_default_hash_table_size = hash_size_primes[_index];
+ /* These silly_size values result in around 1G and 32M of memory
+ being allocated for the table of pointers. Note that the number
+ of elements allocated will be almost twice the size of any power
+ of two chosen here. */
+ unsigned long silly_size = sizeof (size_t) > 4 ? 0x4000000 : 0x400000;
+ if (hash_size > silly_size)
+ hash_size = silly_size;
+ else if (hash_size != 0)
+ hash_size--;
+ hash_size = higher_prime_number (hash_size);
+ BFD_ASSERT (hash_size != 0);
+ bfd_default_hash_table_size = hash_size;
return bfd_default_hash_table_size;
}
\f
subclass. */
if (ret == NULL)
ret = (struct strtab_hash_entry *) bfd_hash_allocate (table,
- sizeof (* ret));
+ sizeof (* ret));
if (ret == NULL)
return NULL;
_bfd_stringtab_init (void)
{
struct bfd_strtab_hash *table;
- bfd_size_type amt = sizeof (* table);
+ size_t amt = sizeof (* table);
table = (struct bfd_strtab_hash *) bfd_malloc (amt);
if (table == NULL)
else
{
entry = (struct strtab_hash_entry *) bfd_hash_allocate (&tab->table,
- sizeof (* entry));
+ sizeof (* entry));
if (entry == NULL)
return (bfd_size_type) -1;
if (! copy)
n = (char *) bfd_hash_allocate (&tab->table, len);
if (n == NULL)
return (bfd_size_type) -1;
- memcpy (n, str, len);
+ memcpy (n, str, len);
entry->root.string = n;
}
entry->index = (bfd_size_type) -1;