Add --inlines option to objdump to include scope backtrace of inlined functions when generating source line number information.

* objdump.c (unwind_inlines): Add.
	(option_values): Add OPTION_INLINES.
	(show_line): Unwind inlines if requested.
	(main): Parse OPTION_INLINES.
	(usage): Document --inlines.
	* doc/binutils.texi: Document --inlines.
	* NEWS: Likewise.
This commit is contained in:
Andi Kleen
2017-03-21 13:05:19 +00:00
committed by Nick Clifton
parent 645d3342ba
commit 4a14e30646
4 changed files with 44 additions and 2 deletions

View File

@@ -117,6 +117,7 @@ static bfd_boolean display_file_offsets;/* -F */
static const char *prefix; /* --prefix */
static int prefix_strip; /* --prefix-strip */
static size_t prefix_length;
static bfd_boolean unwind_inlines; /* --inlines. */
/* A structure to record the sections mentioned in -j switches. */
struct only
@@ -257,6 +258,7 @@ usage (FILE *stream, int status)
--insn-width=WIDTH Display WIDTH bytes on a single line for -d\n\
--adjust-vma=OFFSET Add OFFSET to all displayed section addresses\n\
--special-syms Include special symbols in symbol dumps\n\
--inlines Print all inlines for source line (with -l)\n\
--prefix=PREFIX Add PREFIX to absolute paths for -S\n\
--prefix-strip=LEVEL Strip initial directory names for -S\n"));
fprintf (stream, _("\
@@ -296,7 +298,8 @@ enum option_values
OPTION_ADJUST_VMA,
OPTION_DWARF_DEPTH,
OPTION_DWARF_CHECK,
OPTION_DWARF_START
OPTION_DWARF_START,
OPTION_INLINES
};
static struct option long_options[]=
@@ -348,6 +351,7 @@ static struct option long_options[]=
{"dwarf-depth", required_argument, 0, OPTION_DWARF_DEPTH},
{"dwarf-start", required_argument, 0, OPTION_DWARF_START},
{"dwarf-check", no_argument, 0, OPTION_DWARF_CHECK},
{"inlines", no_argument, 0, OPTION_INLINES},
{0, no_argument, 0, 0}
};
@@ -1543,6 +1547,17 @@ show_line (bfd *abfd, asection *section, bfd_vma addr_offset)
else
printf ("%s:%u\n", filename == NULL ? "???" : filename, linenumber);
}
if (unwind_inlines)
{
const char *filename2;
const char *functionname2;
unsigned line2;
while (bfd_find_inliner_info (abfd, &filename2, &functionname2,
&line2))
printf ("inlined by %s:%u (%s)\n", filename2, line2,
functionname2);
}
}
if (with_source_code
@@ -3808,6 +3823,9 @@ main (int argc, char **argv)
if (insn_width <= 0)
fatal (_("error: instruction width must be positive"));
break;
case OPTION_INLINES:
unwind_inlines = TRUE;
break;
case 'E':
if (strcmp (optarg, "B") == 0)
endian = BFD_ENDIAN_BIG;