Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-05 15:15:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix discrepancies in nm's --line-number output by adding support for the DW_AT_specification DWARF Attttribute.

Browse Source 
PR 25676
bfd	* dwarf2.c (struct varinfo): Add unit_offset field to record the
	location of the varinfo in the unit's debug info data.  Change the
	type of the stack field to a boolean.
	(lookup_var_by_offset): New function.  Returns the varinfo
	structure for the variable described at the given offset in the
	unit's debug info.
	(scan_unit_for_symbols): Add support for variables which have the
	DW_AT_specification attribute.

binutils* testsuite/binutils-all/dw4.s: New test source file.
	* testsuite/binutils-all/nm.exp: Run the new test.
This commit is contained in:
Nick Clifton
2020-03-19 16:55:13 +00:00
parent 3734bec833
commit f3a08f7778
5 changed files with 2107 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bfd/ChangeLog
View File

@@ -1,3 +1,15 @@
2020-03-19 Nick Clifton <nickc@redhat.com>
PR 25676
* dwarf2.c (struct varinfo): Add unit_offset field to record the
location of the varinfo in the unit's debug info data. Change the
type of the stack field to a boolean.
(lookup_var_by_offset): New function. Returns the varinfo
structure for the variable described at the given offset in the
unit's debug info.
(scan_unit_for_symbols): Add support for variables which have the
DW_AT_specification attribute.
2020-03-19 Nick Clifton <nickc@redhat.com>
PR 25699

86
bfd/dwarf2.c
View File

@@ -295,12 +295,12 @@ struct comp_unit
/* This data structure holds the information of an abbrev. */
struct abbrev_info
{
unsigned int number; /* Number identifying abbrev. */
enum dwarf_tag tag; /* DWARF tag. */
int has_children; /* Boolean. */
unsigned int num_attrs; /* Number of attributes. */
struct attr_abbrev *attrs; /* An array of attribute descriptions. */
struct abbrev_info *next; /* Next in chain. */
unsigned int number; /* Number identifying abbrev. */
enum dwarf_tag tag; /* DWARF tag. */
bfd_boolean has_children; /* TRUE if the abbrev has children. */
unsigned int num_attrs; /* Number of attributes. */
struct attr_abbrev * attrs; /* An array of attribute descriptions. */
struct abbrev_info * next; /* Next in chain. */
};
struct attr_abbrev
@@ -1472,19 +1472,24 @@ struct lookup_funcinfo
struct varinfo
{
/* Pointer to previous variable in list of all variables */
/* Pointer to previous variable in list of all variables. */
struct varinfo *prev_var;
/* Source location file name */
/* The offset of the varinfo from the start of the unit. */
bfd_uint64_t unit_offset;
/* Source location file name. */
char *file;
/* Source location line number */
/* Source location line number. */
int line;
/* The type of this variable. */
int tag;
/* The name of the variable, if it has one. */
char *name;
/* The address of the variable. */
bfd_vma addr;
/* Where the symbol is defined */
/* Where the symbol is defined. */
asection *sec;
/* Is this a stack variable? */
unsigned int stack: 1;
/* Is this a stack variable? */
bfd_boolean stack;
};
/* Return TRUE if NEW_LINE should sort after LINE. */
@@ -2858,7 +2863,7 @@ lookup_symbol_in_variable_table (struct comp_unit *unit,
struct varinfo* each;
for (each = unit->variable_table; each; each = each->prev_var)
if (each->stack == 0
if (! each->stack
&& each->file != NULL
&& each->name != NULL
&& each->addr == addr
@@ -3153,6 +3158,20 @@ read_rangelist (struct comp_unit *unit, struct arange *arange,
return TRUE;
}
static struct varinfo *
lookup_var_by_offset (bfd_uint64_t offset, struct varinfo * table)
{
while (table)
{
if (table->unit_offset == offset)
return table;
table = table->prev_var;
}
return NULL;
}
/* DWARF2 Compilation unit functions. */
/* Scan over each die in a comp. unit looking for functions to add
@@ -3189,11 +3208,13 @@ scan_unit_for_symbols (struct comp_unit *unit)
bfd_vma low_pc = 0;
bfd_vma high_pc = 0;
bfd_boolean high_pc_relative = FALSE;
bfd_uint64_t current_offset;
/* PR 17512: file: 9f405d9d. */
if (info_ptr >= info_ptr_end)
goto fail;
current_offset = info_ptr - unit->info_ptr_unit;
abbrev_number = _bfd_safe_read_leb128 (abfd, info_ptr, &bytes_read,
FALSE, info_ptr_end);
info_ptr += bytes_read;
@@ -3221,12 +3242,13 @@ scan_unit_for_symbols (struct comp_unit *unit)
goto fail;
}
var = NULL;
if (abbrev->tag == DW_TAG_subprogram
|| abbrev->tag == DW_TAG_entry_point
|| abbrev->tag == DW_TAG_inlined_subroutine)
{
size_t amt = sizeof (struct funcinfo);
var = NULL;
func = (struct funcinfo *) bfd_zalloc (abfd, amt);
if (func == NULL)
goto fail;
@@ -3255,12 +3277,15 @@ scan_unit_for_symbols (struct comp_unit *unit)
if (var == NULL)
goto fail;
var->tag = abbrev->tag;
var->stack = 1;
var->stack = TRUE;
var->prev_var = unit->variable_table;
unit->variable_table = var;
var->unit_offset = current_offset;
/* PR 18205: Missing debug information can cause this
var to be attached to an already cached unit. */
}
else
var = NULL;
/* No inline function in scope at this nesting level. */
nested_funcs[nesting_level].func = 0;
@@ -3349,6 +3374,31 @@ scan_unit_for_symbols (struct comp_unit *unit)
{
switch (attr.name)
{
case DW_AT_specification:
if (attr.u.val)
{
struct varinfo * spec_var;
spec_var = lookup_var_by_offset (attr.u.val, unit->variable_table);
if (spec_var == NULL)
{
_bfd_error_handler
(_("DWARF error: could not find variable specification at offset %lx"),
(unsigned long) attr.u.val);
break;
}
if (var->name == NULL)
var->name = spec_var->name;
if (var->file == NULL)
var->file = strdup (spec_var->file);
if (var->line == 0)
var->line = spec_var->line;
if (var->sec == NULL)
var->sec = spec_var->sec;
}
break;
case DW_AT_name:
if (is_str_attr (attr.form))
var->name = attr.u.str;
@@ -3365,7 +3415,7 @@ scan_unit_for_symbols (struct comp_unit *unit)
case DW_AT_external:
if (attr.u.val != 0)
var->stack = 0;
var->stack = FALSE;
break;
case DW_AT_location:
@@ -3379,7 +3429,7 @@ scan_unit_for_symbols (struct comp_unit *unit)
if (attr.u.blk->data != NULL
&& *attr.u.blk->data == DW_OP_addr)
{
var->stack = 0;
var->stack = FALSE;
/* Verify that DW_OP_addr is the only opcode in the
location, in which case the block size will be 1
@@ -3875,7 +3925,7 @@ comp_unit_hash_info (struct dwarf2_debug *stash,
each_var = each_var->prev_var)
{
/* Skip stack vars and vars with no files or names. */
if (each_var->stack == 0
if (! each_var->stack
&& each_var->file != NULL
&& each_var->name != NULL)
/* There is no need to copy name string into hash table as

6
binutils/ChangeLog
View File

@@ -1,3 +1,9 @@
2020-03-19 Nick Clifton <nickc@redhat.com>
PR 25676
* testsuite/binutils-all/dw4.s: New test source file.
* testsuite/binutils-all/nm.exp: Run the new test.
2020-03-19 H.J. Lu <hongjiu.lu@intel.com>
* readelf.c (process_symbol_table): Use unsigned long for si.

1974
binutils/testsuite/binutils-all/dw4.s Normal file
View File

File diff suppressed because it is too large Load Diff

47
binutils/testsuite/binutils-all/nm.exp
View File

@@ -247,6 +247,53 @@ if [is_elf_format] {
remote_file host delete "tmpdir/nm-ver.o"
}
}
# PR binutils/25676
# Test nm --line-numbers on DWARF-4 debug info.
set testname "nm --line-numbers on DWARF-4 debug info"
# The RISCV target does not (currently) support .uleb128.
setup_xfail "riscv*-*-*"
# The SH targets complain that the pseudo-ops used to construct
# the DWARF data are misaligned.
setup_xfail "sh*-*-*"
# The pre-compiled dwarf info in dw4.s is not compatible with the
# ALPHA, HPPA, IA64 and MIPS targets.
setup_xfail "alpha*-*-*" "hppa*-*-*" "ia64*-*-*" "mips*-*-*"
# Assembling the source file triggers an ICE in the FT32 assembler.
# FIXME: Fix the ICE...
setup_xfail "ft32-*-*"
# The AVR, MSP430, NDS32, PRU and XTENSA targets do not assemble the
# (64-bit) source file.
setup_xfail "avr-*-*" "msp430-*-*" "nds32*-*-*" "pru-*-*" "xtensa-*-*"
if {![binutils_assemble $srcdir/$subdir/dw4.s tmpdir/dw4.o]} then {
fail "$testname (assembly)"
} else {
# The test source is only intended for 64-bit targets.
# FIXME: Create a 32-bit version of this test.
if {! [is_elf64 tmpdir/dw4.o]} {
unsupported "$testname (needs a 64-bit target)"
} else {
if [is_remote host] {
set tmpfile [remote_download host tmpdir/dw4r.o]
} else {
set tmpfile tmpdir/dw4.o
}
set got [binutils_run $NM "$NMFLAGS --line-numbers $tmpfile"]
if {! [regexp "g_my_externd_global.*tests/main.c:3" $got]} then {
fail "$testname (grep for externd global file/line)"
} else {
pass $testname
}
}
if { $verbose < 1 } {
remote_file host delete $tmpfile
}
}
}
# There are certainly other tests that could be run.