/* Create a new hash table, given a number of entries. */
-bfd_boolean
+bool
bfd_hash_table_init_n (struct bfd_hash_table *table,
struct bfd_hash_entry *(*newfunc) (struct bfd_hash_entry *,
struct bfd_hash_table *,
if (alloc / sizeof (struct bfd_hash_entry *) != size)
{
bfd_set_error (bfd_error_no_memory);
- return FALSE;
+ return false;
}
table->memory = (void *) objalloc_create ();
if (table->memory == NULL)
{
bfd_set_error (bfd_error_no_memory);
- return FALSE;
+ return false;
}
table->table = (struct bfd_hash_entry **)
objalloc_alloc ((struct objalloc *) table->memory, alloc);
{
bfd_hash_table_free (table);
bfd_set_error (bfd_error_no_memory);
- return FALSE;
+ return false;
}
memset ((void *) table->table, 0, alloc);
table->size = size;
table->count = 0;
table->frozen = 0;
table->newfunc = newfunc;
- return TRUE;
+ return true;
}
/* Create a new hash table with the default number of entries. */
-bfd_boolean
+bool
bfd_hash_table_init (struct bfd_hash_table *table,
struct bfd_hash_entry *(*newfunc) (struct bfd_hash_entry *,
struct bfd_hash_table *,
struct bfd_hash_entry *
bfd_hash_lookup (struct bfd_hash_table *table,
const char *string,
- bfd_boolean create,
- bfd_boolean copy)
+ bool create,
+ bool copy)
{
unsigned long hash;
struct bfd_hash_entry *hashp;
void
bfd_hash_traverse (struct bfd_hash_table *table,
- bfd_boolean (*func) (struct bfd_hash_entry *, void *),
+ bool (*func) (struct bfd_hash_entry *, void *),
void * info)
{
unsigned int i;
struct strtab_hash_entry *first;
/* Last string in strtab. */
struct strtab_hash_entry *last;
- /* Whether to precede strings with a two byte length, as in the
- XCOFF .debug section. */
- bfd_boolean xcoff;
+ /* Whether to precede strings with a two or four byte length,
+ as in the XCOFF .debug section. */
+ char length_field_size;
};
+
/* Routine to create an entry in a strtab. */
static struct bfd_hash_entry *
table->size = 0;
table->first = NULL;
table->last = NULL;
- table->xcoff = FALSE;
+ table->length_field_size = 0;
return table;
}
string. */
struct bfd_strtab_hash *
-_bfd_xcoff_stringtab_init (void)
+_bfd_xcoff_stringtab_init (bool isxcoff64)
{
struct bfd_strtab_hash *ret;
ret = _bfd_stringtab_init ();
if (ret != NULL)
- ret->xcoff = TRUE;
+ ret->length_field_size = isxcoff64 ? 4 : 2;
return ret;
}
bfd_size_type
_bfd_stringtab_add (struct bfd_strtab_hash *tab,
const char *str,
- bfd_boolean hash,
- bfd_boolean copy)
+ bool hash,
+ bool copy)
{
struct strtab_hash_entry *entry;
if (hash)
{
- entry = strtab_hash_lookup (tab, str, TRUE, copy);
+ entry = strtab_hash_lookup (tab, str, true, copy);
if (entry == NULL)
return (bfd_size_type) -1;
}
{
entry->index = tab->size;
tab->size += strlen (str) + 1;
- if (tab->xcoff)
- {
- entry->index += 2;
- tab->size += 2;
- }
+ entry->index += tab->length_field_size;
+ tab->size += tab->length_field_size;
if (tab->first == NULL)
tab->first = entry;
else
/* Write out a strtab. ABFD must already be at the right location in
the file. */
-bfd_boolean
+bool
_bfd_stringtab_emit (bfd *abfd, struct bfd_strtab_hash *tab)
{
- bfd_boolean xcoff;
struct strtab_hash_entry *entry;
- xcoff = tab->xcoff;
-
for (entry = tab->first; entry != NULL; entry = entry->next)
{
const char *str;
str = entry->root.string;
len = strlen (str) + 1;
- if (xcoff)
+ if (tab->length_field_size == 4)
+ {
+ bfd_byte buf[4];
+
+ /* The output length includes the null byte. */
+ bfd_put_32 (abfd, (bfd_vma) len, buf);
+ if (bfd_bwrite ((void *) buf, (bfd_size_type) 4, abfd) != 4)
+ return false;
+ }
+ else if (tab->length_field_size == 2)
{
bfd_byte buf[2];
/* The output length includes the null byte. */
bfd_put_16 (abfd, (bfd_vma) len, buf);
if (bfd_bwrite ((void *) buf, (bfd_size_type) 2, abfd) != 2)
- return FALSE;
+ return false;
}
if (bfd_bwrite ((void *) str, (bfd_size_type) len, abfd) != len)
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}