binutils-gdb/gdb/dwarf2/abbrev.c
Tom Tromey 4444f40757 Micro-optimize abbrev reading and storage
Currently, and abbrev_info points to a separately allocated array of
attr_abbrev objects.  This array is constructed in a temporary vector,
then copied to the abbrev table's obstack.

This patch changes abbrev_info to use the struct hack to store the
objects directly, and changes abbrev_table::read to avoid an extra
copy when allocating, using the "growing objects" capability of
obstacks.

This saves a bit of space, and also perhaps a little time.

2021-03-06  Tom Tromey  <tom@tromey.com>

	* dwarf2/read.c (read_attribute): Make 'abbrev' const.
	* dwarf2/abbrev.c (abbrev_table::alloc_abbrev): Remove.
	(abbrev_table::read): Update.
	* dwarf2/abbrev.h (struct attr_abbrev): Move earlier.
	(struct abbrev_info): Reformat.
	<attrs>: Now an array.
	(struct abbrev_table) <alloc_abbrev>: Remove.
2021-03-06 09:17:28 -07:00

165 lines
5.1 KiB
C

/* DWARF 2 abbreviations
Copyright (C) 1994-2021 Free Software Foundation, Inc.
Adapted by Gary Funck (gary@intrepid.com), Intrepid Technology,
Inc. with support from Florida State University (under contract
with the Ada Joint Program Office), and Silicon Graphics, Inc.
Initial contribution by Brent Benson, Harris Computer Systems, Inc.,
based on Fred Fish's (Cygnus Support) implementation of DWARF 1
support.
This file is part of GDB.
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 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
#include "dwarf2/read.h"
#include "dwarf2/abbrev.h"
#include "dwarf2/leb.h"
#include "bfd.h"
/* Hash function for an abbrev. */
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;
}
/* Comparison function for abbrevs. */
static int
eq_abbrev (const void *lhs, const void *rhs)
{
const struct abbrev_info *l_info = (const struct abbrev_info *) lhs;
const struct abbrev_info *r_info = (const struct abbrev_info *) rhs;
return l_info->number == r_info->number;
}
/* Abbreviation tables.
In DWARF version 2, the description of the debugging information is
stored in a separate .debug_abbrev section. Before we read any
dies from a section we read in all abbreviations and install them
in a hash table. */
abbrev_table::abbrev_table (sect_offset off)
: sect_off (off),
m_abbrevs (htab_create_alloc (20, hash_abbrev, eq_abbrev,
nullptr, xcalloc, xfree))
{
}
/* Add an abbreviation to the table. */
void
abbrev_table::add_abbrev (struct abbrev_info *abbrev)
{
void **slot = htab_find_slot_with_hash (m_abbrevs.get (), abbrev,
abbrev->number, INSERT);
*slot = abbrev;
}
/* Read in an abbrev table. */
abbrev_table_up
abbrev_table::read (struct dwarf2_section_info *section,
sect_offset sect_off)
{
bfd *abfd = section->get_bfd_owner ();
const gdb_byte *abbrev_ptr;
struct abbrev_info *cur_abbrev;
unsigned int abbrev_number, bytes_read;
abbrev_table_up abbrev_table (new struct abbrev_table (sect_off));
struct obstack *obstack = &abbrev_table->m_abbrev_obstack;
/* Caller must ensure this. */
gdb_assert (section->readin);
abbrev_ptr = section->buffer + to_underlying (sect_off);
abbrev_number = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
abbrev_ptr += bytes_read;
/* Loop until we reach an abbrev number of 0. */
while (abbrev_number)
{
/* Start without any attrs. */
obstack_blank (obstack, offsetof (abbrev_info, attrs));
cur_abbrev = (struct abbrev_info *) obstack_base (obstack);
/* Read in abbrev header. */
cur_abbrev->number = abbrev_number;
cur_abbrev->tag
= (enum dwarf_tag) read_unsigned_leb128 (abfd, abbrev_ptr,
&bytes_read);
abbrev_ptr += bytes_read;
cur_abbrev->has_children = read_1_byte (abfd, abbrev_ptr);
abbrev_ptr += 1;
/* Now read in declarations. */
int num_attrs = 0;
for (;;)
{
struct attr_abbrev cur_attr;
cur_attr.name
= (enum dwarf_attribute) read_unsigned_leb128 (abfd, abbrev_ptr,
&bytes_read);
abbrev_ptr += bytes_read;
cur_attr.form
= (enum dwarf_form) read_unsigned_leb128 (abfd, abbrev_ptr,
&bytes_read);
abbrev_ptr += bytes_read;
if (cur_attr.form == DW_FORM_implicit_const)
{
cur_attr.implicit_const = read_signed_leb128 (abfd, abbrev_ptr,
&bytes_read);
abbrev_ptr += bytes_read;
}
else
cur_attr.implicit_const = -1;
if (cur_attr.name == 0)
break;
++num_attrs;
obstack_grow (obstack, &cur_attr, sizeof (cur_attr));
}
cur_abbrev = (struct abbrev_info *) obstack_finish (obstack);
cur_abbrev->num_attrs = num_attrs;
abbrev_table->add_abbrev (cur_abbrev);
/* Get next abbreviation.
Under Irix6 the abbreviations for a compilation unit are not
always properly terminated with an abbrev number of 0.
Exit loop if we encounter an abbreviation which we have
already read (which means we are about to read the abbreviations
for the next compile unit) or if the end of the abbreviation
table is reached. */
if ((unsigned int) (abbrev_ptr - section->buffer) >= section->size)
break;
abbrev_number = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
abbrev_ptr += bytes_read;
if (abbrev_table->lookup_abbrev (abbrev_number) != NULL)
break;
}
return abbrev_table;
}