Rewrite new die_info methods

This rewrites the two new die_info methods to iterate over attributes
rather than to do two separate searches.

gdb/ChangeLog
2020-03-26  Tom Tromey  <tom@tromey.com>

	* dwarf2/die.h (struct die_info) <addr_base, ranges_base>:
	Rewrite.
This commit is contained in:
Tom Tromey 2020-03-26 09:28:08 -06:00
parent a39fdb411d
commit eeb647814f
2 changed files with 21 additions and 12 deletions

View File

@ -1,3 +1,8 @@
2020-03-26 Tom Tromey <tom@tromey.com>
* dwarf2/die.h (struct die_info) <addr_base, ranges_base>:
Rewrite.
2020-03-26 Tom Tromey <tom@tromey.com>
* dwarf2/die.h (struct die_info) <addr_base, ranges_base>: New

View File

@ -38,12 +38,14 @@ struct die_info
DW_AT_addr_base. */
gdb::optional<ULONGEST> addr_base ()
{
struct attribute *attr = this->attr (DW_AT_addr_base);
if (attr == nullptr)
attr = this->attr (DW_AT_GNU_addr_base);
if (attr == nullptr)
return gdb::optional<ULONGEST> ();
return DW_UNSND (attr);
for (unsigned i = 0; i < num_attrs; ++i)
if (attrs[i].name == DW_AT_addr_base
|| attrs[i].name == DW_AT_GNU_addr_base)
{
/* If both exist, just use the first one. */
return DW_UNSND (&attrs[i]);
}
return gdb::optional<ULONGEST> ();
}
/* Return range lists base of the compile unit, which, if exists, is
@ -51,12 +53,14 @@ struct die_info
DW_AT_GNU_ranges_base. */
ULONGEST ranges_base ()
{
struct attribute *attr = this->attr (DW_AT_rnglists_base);
if (attr == nullptr)
attr = this->attr (DW_AT_GNU_ranges_base);
if (attr == nullptr)
return 0;
return DW_UNSND (attr);
for (unsigned i = 0; i < num_attrs; ++i)
if (attrs[i].name == DW_AT_rnglists_base
|| attrs[i].name == DW_AT_GNU_ranges_base)
{
/* If both exist, just use the first one. */
return DW_UNSND (&attrs[i]);
}
return 0;
}