darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* dwarf2read.c (die_reader_specs): Tweak comment.

Browse source 
(get_section_bfd_owner, get_section_bfd_section): New functions.
	(get_section_name, get_section_file_name): New functions.
	(get_section_id, get_section_flags): New functions.
	(*): Use new functions to access section fields.
This commit is contained in:
Doug Evans 2013-09-27 20:33:20 +00:00
parent 57d63ce2b9
commit a32a892359
2 changed files with 117 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gdb/ChangeLog
View file

@ -1,5 +1,11 @@
2013-09-27 Doug Evans <dje@google.com> 2013-09-27 Doug Evans <dje@google.com>
* dwarf2read.c (die_reader_specs): Tweak comment.
(get_section_bfd_owner, get_section_bfd_section): New functions.
(get_section_name, get_section_file_name): New functions.
(get_section_id, get_section_flags): New functions.
(*): Use new functions to access section fields.
* dwarf2read.c (struct dwo_file): Add/tweak comments. * dwarf2read.c (struct dwo_file): Add/tweak comments.
(lookup_dwo_unit_in_dwp): Renamed from lookup_dwo_in_dwp. Remove (lookup_dwo_unit_in_dwp): Renamed from lookup_dwo_in_dwp. Remove
arg "htab". All callers updated. arg "htab". All callers updated.

156
gdb/dwarf2read.c
View file

@ -874,7 +874,7 @@ struct dwz_file
struct die_reader_specs struct die_reader_specs
{ {
/* die_section->asection->owner. */ /* The bfd of die_section. */
bfd* abfd; bfd* abfd;
/* The CU of the DIE we are parsing. */ /* The CU of the DIE we are parsing. */
@ -1245,6 +1245,10 @@ show_dwarf2_max_cache_age (struct ui_file *file, int from_tty,
/* local function prototypes */ /* local function prototypes */
static const char *get_section_name (const struct dwarf2_section_info *);
static const char *get_section_file_name (const struct dwarf2_section_info *);
static void dwarf2_locate_sections (bfd *, asection *, void *); static void dwarf2_locate_sections (bfd *, asection *, void *);
static void dwarf2_find_base_address (struct die_info *die, static void dwarf2_find_base_address (struct die_info *die,
@ -1771,8 +1775,8 @@ dwarf2_section_buffer_overflow_complaint (struct dwarf2_section_info *section)
complaint (&symfile_complaints, complaint (&symfile_complaints,
_("debug info runs off end of %s section" _("debug info runs off end of %s section"
" [in module %s]"), " [in module %s]"),
section->asection->name, get_section_name (section),
bfd_get_filename (section->asection->owner)); get_section_file_name (section));
} }
static void static void
@ -1844,6 +1848,69 @@ dwarf2_has_info (struct objfile *objfile,
&& dwarf2_per_objfile->abbrev.asection != NULL); && dwarf2_per_objfile->abbrev.asection != NULL);
} }
/* Return the bfd owner of SECTION. */
static struct bfd *
get_section_bfd_owner (const struct dwarf2_section_info *section)
{
return section->asection->owner;
}
/* Return the bfd section of SECTION.
Returns NULL if the section is not present. */
static asection *
get_section_bfd_section (const struct dwarf2_section_info *section)
{
return section->asection;
}
/* Return the name of SECTION. */
static const char *
get_section_name (const struct dwarf2_section_info *section)
{
asection *sectp = get_section_bfd_section (section);
gdb_assert (sectp != NULL);
return bfd_section_name (get_section_bfd_owner (section), sectp);
}
/* Return the name of the file SECTION is in. */
static const char *
get_section_file_name (const struct dwarf2_section_info *section)
{
bfd *abfd = get_section_bfd_owner (section);
return bfd_get_filename (abfd);
}
/* Return the id of SECTION.
Returns 0 if SECTION doesn't exist. */
static int
get_section_id (const struct dwarf2_section_info *section)
{
asection *sectp = get_section_bfd_section (section);
if (sectp == NULL)
return 0;
return sectp->id;
}
/* Return the flags of SECTION.
SECTION must exist. */
static int
get_section_flags (const struct dwarf2_section_info *section)
{
asection *sectp = get_section_bfd_section (section);
gdb_assert (sectp != NULL);
return bfd_get_section_flags (sectp->owner, sectp);
}
/* When loading sections, we look either for uncompressed section or for /* When loading sections, we look either for uncompressed section or for
compressed section names. */ compressed section names. */
@ -1966,14 +2033,14 @@ dwarf2_section_empty_p (struct dwarf2_section_info *info)
/* Read the contents of the section INFO. /* Read the contents of the section INFO.
OBJFILE is the main object file, but not necessarily the file where OBJFILE is the main object file, but not necessarily the file where
the section comes from. E.g., for DWO files INFO->asection->owner the section comes from. E.g., for DWO files the bfd of INFO is the bfd
is the bfd of the DWO file. of the DWO file.
If the section is compressed, uncompress it before returning. */ If the section is compressed, uncompress it before returning. */
static void static void
dwarf2_read_section (struct objfile *objfile, struct dwarf2_section_info *info) dwarf2_read_section (struct objfile *objfile, struct dwarf2_section_info *info)
{ {
asection *sectp = info->asection; asection *sectp;
bfd *abfd; bfd *abfd;
gdb_byte *buf, *retbuf; gdb_byte *buf, *retbuf;
unsigned char header[4]; unsigned char header[4];
@ -1986,7 +2053,7 @@ dwarf2_read_section (struct objfile *objfile, struct dwarf2_section_info *info)
if (dwarf2_section_empty_p (info)) if (dwarf2_section_empty_p (info))
return; return;
abfd = sectp->owner; sectp = get_section_bfd_section (info);
/* If the section has relocations, we must read it ourselves. /* If the section has relocations, we must read it ourselves.
Otherwise we attach it to the BFD. */ Otherwise we attach it to the BFD. */
@ -2010,6 +2077,9 @@ dwarf2_read_section (struct objfile *objfile, struct dwarf2_section_info *info)
return; return;
} }
abfd = get_section_bfd_owner (info);
gdb_assert (abfd != NULL);
if (bfd_seek (abfd, sectp->filepos, SEEK_SET) != 0 if (bfd_seek (abfd, sectp->filepos, SEEK_SET) != 0
|| bfd_bread (buf, info->size, abfd) != info->size) || bfd_bread (buf, info->size, abfd) != info->size)
error (_("Dwarf Error: Can't read DWARF data from '%s'"), error (_("Dwarf Error: Can't read DWARF data from '%s'"),
@ -2068,7 +2138,7 @@ dwarf2_get_section_info (struct objfile *objfile,
dwarf2_read_section (objfile, info); dwarf2_read_section (objfile, info);
*sectp = info->asection; *sectp = get_section_bfd_section (info);
*bufp = info->buffer; *bufp = info->buffer;
*sizep = info->size; *sizep = info->size;
} }
@ -2738,7 +2808,7 @@ read_index_from_section (struct objfile *objfile,
/* Older elfutils strip versions could keep the section in the main /* Older elfutils strip versions could keep the section in the main
executable while splitting it for the separate debug info file. */ executable while splitting it for the separate debug info file. */
if ((bfd_get_file_flags (section->asection) & SEC_HAS_CONTENTS) == 0) if ((get_section_flags (section) & SEC_HAS_CONTENTS) == 0)
return 0; return 0;
dwarf2_read_section (objfile, section); dwarf2_read_section (objfile, section);
@ -3989,8 +4059,8 @@ error_check_comp_unit_head (struct comp_unit_head *header,
struct dwarf2_section_info *section, struct dwarf2_section_info *section,
struct dwarf2_section_info *abbrev_section) struct dwarf2_section_info *abbrev_section)
{ {
bfd *abfd = section->asection->owner; bfd *abfd = get_section_bfd_owner (section);
const char *filename = bfd_get_filename (abfd); const char *filename = get_section_file_name (section);
if (header->version != 2 && header->version != 3 && header->version != 4) if (header->version != 2 && header->version != 3 && header->version != 4)
error (_("Dwarf Error: wrong version in compilation unit header " error (_("Dwarf Error: wrong version in compilation unit header "
@ -4026,7 +4096,7 @@ read_and_check_comp_unit_head (struct comp_unit_head *header,
int is_debug_types_section) int is_debug_types_section)
{ {
const gdb_byte *beg_of_comp_unit = info_ptr; const gdb_byte *beg_of_comp_unit = info_ptr;
bfd *abfd = section->asection->owner; bfd *abfd = get_section_bfd_owner (section);
header->offset.sect_off = beg_of_comp_unit - section->buffer; header->offset.sect_off = beg_of_comp_unit - section->buffer;
@ -4056,7 +4126,7 @@ read_and_check_type_unit_head (struct comp_unit_head *header,
cu_offset *type_offset_in_tu) cu_offset *type_offset_in_tu)
{ {
const gdb_byte *beg_of_comp_unit = info_ptr; const gdb_byte *beg_of_comp_unit = info_ptr;
bfd *abfd = section->asection->owner; bfd *abfd = get_section_bfd_owner (section);
header->offset.sect_off = beg_of_comp_unit - section->buffer; header->offset.sect_off = beg_of_comp_unit - section->buffer;
@ -4085,7 +4155,7 @@ static sect_offset
read_abbrev_offset (struct dwarf2_section_info *section, read_abbrev_offset (struct dwarf2_section_info *section,
sect_offset offset) sect_offset offset)
{ {
bfd *abfd = section->asection->owner; bfd *abfd = get_section_bfd_owner (section);
const gdb_byte *info_ptr; const gdb_byte *info_ptr;
unsigned int length, initial_length_size, offset_size; unsigned int length, initial_length_size, offset_size;
sect_offset abbrev_offset; sect_offset abbrev_offset;
@ -4237,7 +4307,7 @@ create_debug_types_hash_table (struct dwo_file *dwo_file,
if (dwarf2_read_debug) if (dwarf2_read_debug)
fprintf_unfiltered (gdb_stdlog, "Reading .debug_types%s for %s:\n", fprintf_unfiltered (gdb_stdlog, "Reading .debug_types%s for %s:\n",
dwo_file ? ".dwo" : "", dwo_file ? ".dwo" : "",
bfd_get_filename (abbrev_section->asection->owner)); get_section_file_name (abbrev_section));
for (ix = 0; for (ix = 0;
VEC_iterate (dwarf2_section_info_def, types, ix, section); VEC_iterate (dwarf2_section_info_def, types, ix, section);
@ -4253,8 +4323,8 @@ create_debug_types_hash_table (struct dwo_file *dwo_file,
continue; continue;
/* We can't set abfd until now because the section may be empty or /* We can't set abfd until now because the section may be empty or
not present, in which case section->asection will be NULL. */ not present, in which case the bfd is unknown. */
abfd = section->asection->owner; abfd = get_section_bfd_owner (section);
/* We don't use init_cutu_and_read_dies_simple, or some such, here /* We don't use init_cutu_and_read_dies_simple, or some such, here
because we don't need to read any dies: the signature is in the because we don't need to read any dies: the signature is in the
@ -4613,7 +4683,7 @@ init_cu_die_reader (struct die_reader_specs *reader,
struct dwo_file *dwo_file) struct dwo_file *dwo_file)
{ {
gdb_assert (section->readin && section->buffer != NULL); gdb_assert (section->readin && section->buffer != NULL);
reader->abfd = section->asection->owner; reader->abfd = get_section_bfd_owner (section);
reader->cu = cu; reader->cu = cu;
reader->dwo_file = dwo_file; reader->dwo_file = dwo_file;
reader->die_section = section; reader->die_section = section;
@ -4719,7 +4789,7 @@ read_cutu_die_from_dwo (struct dwarf2_per_cu_data *this_cu,
cu->dwo_unit = dwo_unit; cu->dwo_unit = dwo_unit;
section = dwo_unit->section; section = dwo_unit->section;
dwarf2_read_section (objfile, section); dwarf2_read_section (objfile, section);
abfd = section->asection->owner; abfd = get_section_bfd_owner (section);
begin_info_ptr = info_ptr = section->buffer + dwo_unit->offset.sect_off; begin_info_ptr = info_ptr = section->buffer + dwo_unit->offset.sect_off;
dwo_abbrev_section = &dwo_unit->dwo_file->sections.abbrev; dwo_abbrev_section = &dwo_unit->dwo_file->sections.abbrev;
init_cu_die_reader (result_reader, cu, section, dwo_unit->dwo_file); init_cu_die_reader (result_reader, cu, section, dwo_unit->dwo_file);
@ -4815,7 +4885,7 @@ read_cutu_die_from_dwo (struct dwarf2_per_cu_data *this_cu,
{ {
fprintf_unfiltered (gdb_stdlog, fprintf_unfiltered (gdb_stdlog,
"Read die from %s@0x%x of %s:\n", "Read die from %s@0x%x of %s:\n",
bfd_section_name (abfd, section->asection), get_section_name (section),
(unsigned) (begin_info_ptr - section->buffer), (unsigned) (begin_info_ptr - section->buffer),
bfd_get_filename (abfd)); bfd_get_filename (abfd));
dump_die (comp_unit_die, dwarf2_die_debug); dump_die (comp_unit_die, dwarf2_die_debug);
@ -4983,7 +5053,7 @@ init_cutu_and_read_dies (struct dwarf2_per_cu_data *this_cu,
{ {
struct objfile *objfile = dwarf2_per_objfile->objfile; struct objfile *objfile = dwarf2_per_objfile->objfile;
struct dwarf2_section_info *section = this_cu->section; struct dwarf2_section_info *section = this_cu->section;
bfd *abfd = section->asection->owner; bfd *abfd = get_section_bfd_owner (section);
struct dwarf2_cu *cu; struct dwarf2_cu *cu;
const gdb_byte *begin_info_ptr, *info_ptr; const gdb_byte *begin_info_ptr, *info_ptr;
struct die_reader_specs reader; struct die_reader_specs reader;
@ -5227,7 +5297,7 @@ init_cutu_and_read_dies_no_follow (struct dwarf2_per_cu_data *this_cu,
{ {
struct objfile *objfile = dwarf2_per_objfile->objfile; struct objfile *objfile = dwarf2_per_objfile->objfile;
struct dwarf2_section_info *section = this_cu->section; struct dwarf2_section_info *section = this_cu->section;
bfd *abfd = section->asection->owner; bfd *abfd = get_section_bfd_owner (section);
struct dwarf2_cu cu; struct dwarf2_cu cu;
const gdb_byte *begin_info_ptr, *info_ptr; const gdb_byte *begin_info_ptr, *info_ptr;
struct die_reader_specs reader; struct die_reader_specs reader;
@ -6064,11 +6134,12 @@ read_comp_units_from_section (struct objfile *objfile,
struct dwarf2_per_cu_data ***all_comp_units) struct dwarf2_per_cu_data ***all_comp_units)
{ {
const gdb_byte *info_ptr; const gdb_byte *info_ptr;
bfd *abfd = section->asection->owner; bfd *abfd = get_section_bfd_owner (section);
if (dwarf2_read_debug) if (dwarf2_read_debug)
fprintf_unfiltered (gdb_stdlog, "Reading %s for %s\n", fprintf_unfiltered (gdb_stdlog, "Reading %s for %s\n",
section->asection->name, bfd_get_filename (abfd)); get_section_name (section),
get_section_file_name (section));
dwarf2_read_section (objfile, section); dwarf2_read_section (objfile, section);
@ -8869,13 +8940,13 @@ create_dwo_cu (struct dwo_file *dwo_file)
/* We can't set abfd until now because the section may be empty or /* We can't set abfd until now because the section may be empty or
not present, in which case section->asection will be NULL. */ not present, in which case section->asection will be NULL. */
abfd = section->asection->owner; abfd = get_section_bfd_owner (section);
if (dwarf2_read_debug) if (dwarf2_read_debug)
{ {
fprintf_unfiltered (gdb_stdlog, "Reading %s for %s:\n", fprintf_unfiltered (gdb_stdlog, "Reading %s for %s:\n",
bfd_section_name (abfd, section->asection), get_section_name (section),
bfd_get_filename (abfd)); get_section_file_name (section));
} }
create_dwo_cu_data.dwo_file = dwo_file; create_dwo_cu_data.dwo_file = dwo_file;
@ -9201,8 +9272,8 @@ create_dwo_in_dwp (struct dwp_file *dwp_file,
} }
if (i < 2 if (i < 2
|| sections.info_or_types.asection == NULL || dwarf2_section_empty_p (&sections.info_or_types)
|| sections.abbrev.asection == NULL) || dwarf2_section_empty_p (&sections.abbrev))
{ {
error (_("Dwarf Error: bad DWP hash table, missing DWO sections" error (_("Dwarf Error: bad DWP hash table, missing DWO sections"
" [in module %s]"), " [in module %s]"),
@ -9226,12 +9297,10 @@ create_dwo_in_dwp (struct dwp_file *dwp_file,
virtual_dwo_name = virtual_dwo_name =
xstrprintf ("virtual-dwo/%d-%d-%d-%d", xstrprintf ("virtual-dwo/%d-%d-%d-%d",
sections.abbrev.asection ? sections.abbrev.asection->id : 0, get_section_id (&sections.abbrev),
sections.line.asection ? sections.line.asection->id : 0, get_section_id (&sections.line),
sections.loc.asection ? sections.loc.asection->id : 0, get_section_id (&sections.loc),
(sections.str_offsets.asection get_section_id (&sections.str_offsets));
? sections.str_offsets.asection->id
: 0));
make_cleanup (xfree, virtual_dwo_name); make_cleanup (xfree, virtual_dwo_name);
/* Can we use an existing virtual DWO file? */ /* Can we use an existing virtual DWO file? */
dwo_file_slot = lookup_dwo_file_slot (virtual_dwo_name, comp_dir); dwo_file_slot = lookup_dwo_file_slot (virtual_dwo_name, comp_dir);
@ -13689,8 +13758,7 @@ read_die_and_siblings (const struct die_reader_specs *reader,
{ {
fprintf_unfiltered (gdb_stdlog, fprintf_unfiltered (gdb_stdlog,
"Read die from %s@0x%x of %s:\n", "Read die from %s@0x%x of %s:\n",
bfd_section_name (reader->abfd, get_section_name (reader->die_section),
reader->die_section->asection),
(unsigned) (info_ptr - reader->die_section->buffer), (unsigned) (info_ptr - reader->die_section->buffer),
bfd_get_filename (reader->abfd)); bfd_get_filename (reader->abfd));
dump_die (die, dwarf2_die_debug); dump_die (die, dwarf2_die_debug);
@ -13772,8 +13840,7 @@ read_full_die (const struct die_reader_specs *reader,
{ {
fprintf_unfiltered (gdb_stdlog, fprintf_unfiltered (gdb_stdlog,
"Read die from %s@0x%x of %s:\n", "Read die from %s@0x%x of %s:\n",
bfd_section_name (reader->abfd, get_section_name (reader->die_section),
reader->die_section->asection),
(unsigned) (info_ptr - reader->die_section->buffer), (unsigned) (info_ptr - reader->die_section->buffer),
bfd_get_filename (reader->abfd)); bfd_get_filename (reader->abfd));
dump_die (*diep, dwarf2_die_debug); dump_die (*diep, dwarf2_die_debug);
@ -13845,7 +13912,7 @@ abbrev_table_read_table (struct dwarf2_section_info *section,
sect_offset offset) sect_offset offset)
{ {
struct objfile *objfile = dwarf2_per_objfile->objfile; struct objfile *objfile = dwarf2_per_objfile->objfile;
bfd *abfd = section->asection->owner; bfd *abfd = get_section_bfd_owner (section);
struct abbrev_table *abbrev_table; struct abbrev_table *abbrev_table;
const gdb_byte *abbrev_ptr; const gdb_byte *abbrev_ptr;
struct abbrev_info *cur_abbrev; struct abbrev_info *cur_abbrev;
@ -15781,7 +15848,7 @@ dwarf_decode_line_header (unsigned int offset, struct dwarf2_cu *cu)
/* We can't do this until we know the section is non-empty. /* We can't do this until we know the section is non-empty.
Only then do we know we have such a section. */ Only then do we know we have such a section. */
abfd = section->asection->owner; abfd = get_section_bfd_owner (section);
/* Make sure that at least there's room for the total_length field. /* Make sure that at least there's room for the total_length field.
That could be 12 bytes long, but we're just going to fudge that. */ That could be 12 bytes long, but we're just going to fudge that. */
@ -19309,8 +19376,7 @@ skip_form_bytes (bfd *abfd, const gdb_byte *bytes, const gdb_byte *buffer_end,
complain: complain:
complaint (&symfile_complaints, complaint (&symfile_complaints,
_("invalid form 0x%x in `%s'"), _("invalid form 0x%x in `%s'"),
form, form, get_section_name (section));
section->asection->name);
return NULL; return NULL;
} }
} }
@ -19640,8 +19706,8 @@ dwarf_decode_macro_bytes (bfd *abfd,
dwarf2_read_section (dwarf2_per_objfile->objfile, dwarf2_read_section (dwarf2_per_objfile->objfile,
&dwz->macro); &dwz->macro);
include_bfd = dwz->macro.asection->owner;
include_section = &dwz->macro; include_section = &dwz->macro;
include_bfd = get_section_bfd_owner (include_section);
include_mac_end = dwz->macro.buffer + dwz->macro.size; include_mac_end = dwz->macro.buffer + dwz->macro.size;
is_dwz = 1; is_dwz = 1;
} }
@ -19750,7 +19816,7 @@ dwarf_decode_macros (struct dwarf2_cu *cu, unsigned int offset,
complaint (&symfile_complaints, _("missing %s section"), section_name); complaint (&symfile_complaints, _("missing %s section"), section_name);
return; return;
} }
abfd = section->asection->owner; abfd = get_section_bfd_owner (section);
/* First pass: Find the name of the base filename. /* First pass: Find the name of the base filename.
This filename is needed in order to process all macros whose definition This filename is needed in order to process all macros whose definition