@@ -36,6 +36,8 @@ static hashval_t
hash_abbrev (const void *item)
{
const struct abbrev_info *info = (const struct abbrev_info *) item;
+ /* Warning: if you change this next line, you must also update the
+ other code in this class using the _with_hash functions. */
return info->number;
}
@@ -79,25 +81,13 @@ abbrev_table::alloc_abbrev ()
/* Add an abbreviation to the table. */
void
-abbrev_table::add_abbrev (unsigned int abbrev_number,
- struct abbrev_info *abbrev)
+abbrev_table::add_abbrev (struct abbrev_info *abbrev)
{
- void **slot = htab_find_slot (m_abbrevs.get (), abbrev, INSERT);
+ void **slot = htab_find_slot_with_hash (m_abbrevs.get (), abbrev,
+ abbrev->number, INSERT);
*slot = abbrev;
}
-/* Look up an abbrev in the table.
- Returns NULL if the abbrev is not found. */
-
-struct abbrev_info *
-abbrev_table::lookup_abbrev (unsigned int abbrev_number)
-{
- struct abbrev_info search;
- search.number = abbrev_number;
-
- return (struct abbrev_info *) htab_find (m_abbrevs.get (), &search);
-}
-
/* Read in an abbrev table. */
abbrev_table_up
@@ -172,7 +162,7 @@ abbrev_table::read (struct objfile *objfile,
memcpy (cur_abbrev->attrs, cur_attrs.data (),
cur_abbrev->num_attrs * sizeof (struct attr_abbrev));
- abbrev_table->add_abbrev (abbrev_number, cur_abbrev);
+ abbrev_table->add_abbrev (cur_abbrev);
/* Get next abbreviation.
Under Irix6 the abbreviations for a compilation unit are not
@@ -27,6 +27,8 @@
#ifndef GDB_DWARF2_ABBREV_H
#define GDB_DWARF2_ABBREV_H
+#include "hashtab.h"
+
/* This data structure holds the information of an abbrev. */
struct abbrev_info
{
@@ -60,8 +62,15 @@ struct abbrev_table
/* Look up an abbrev in the table.
Returns NULL if the abbrev is not found. */
- struct abbrev_info *lookup_abbrev (unsigned int abbrev_number);
+ struct abbrev_info *lookup_abbrev (unsigned int abbrev_number)
+ {
+ struct abbrev_info search;
+ search.number = abbrev_number;
+ return (struct abbrev_info *) htab_find_with_hash (m_abbrevs.get (),
+ &search,
+ abbrev_number);
+ }
/* Where the abbrev table came from.
This is used as a sanity check when the table is used. */
@@ -78,7 +87,7 @@ struct abbrev_table
struct abbrev_info *alloc_abbrev ();
/* Add an abbreviation to the table. */
- void add_abbrev (unsigned int abbrev_number, struct abbrev_info *abbrev);
+ void add_abbrev (struct abbrev_info *abbrev);
/* Hash table of abbrevs. */
htab_up m_abbrevs;