* SUCH DAMAGE.
*/
-#include "libiberty.h"
#include "gprof.h"
+#include "libiberty.h"
+#include "bfdver.h"
#include "search_list.h"
#include "source.h"
#include "symtab.h"
static void usage (FILE *, int) ATTRIBUTE_NORETURN;
-const char *whoami;
-const char *function_mapping_file;
-const char *a_out_name = A_OUTNAME;
+const char * whoami;
+const char * function_mapping_file;
+static const char * external_symbol_table;
+const char * a_out_name = A_OUTNAME;
long hz = HZ_WRONG;
/*
int output_width = 80;
bfd_boolean bsd_style_output = FALSE;
bfd_boolean demangle = TRUE;
-bfd_boolean discard_underscores = TRUE;
bfd_boolean ignore_direct_calls = FALSE;
bfd_boolean ignore_static_funcs = FALSE;
bfd_boolean ignore_zeros = TRUE;
bfd_boolean print_descriptions = TRUE;
bfd_boolean print_path = FALSE;
bfd_boolean ignore_non_functions = FALSE;
+bfd_boolean inline_file_names = FALSE;
File_Format file_format = FF_AUTO;
bfd_boolean first_output = TRUE;
{
"_gprof_mcount", "mcount", "_mcount", "__mcount", "__mcount_internal",
"__mcleanup",
- "<locore>", "<hicore>",
0
};
/* Codes used for the long options with no short synonyms. 150 isn't
special; it's just an arbitrary non-ASCII char value. */
-#define OPTION_DEMANGLE (150)
-#define OPTION_NO_DEMANGLE (OPTION_DEMANGLE + 1)
+#define OPTION_DEMANGLE (150)
+#define OPTION_NO_DEMANGLE (OPTION_DEMANGLE + 1)
+#define OPTION_INLINE_FILE_NAMES (OPTION_DEMANGLE + 2)
static struct option long_options[] =
{
{"line", no_argument, 0, 'l'},
{"no-static", no_argument, 0, 'a'},
{"ignore-non-functions", no_argument, 0, 'D'},
+ {"external-symbol-table", required_argument, 0, 'S'},
/* output styles: */
{"no-demangle", no_argument, 0, OPTION_NO_DEMANGLE},
{"directory-path", required_argument, 0, 'I'},
{"display-unused-functions", no_argument, 0, 'z'},
+ {"inline-file-names", no_argument, 0, OPTION_INLINE_FILE_NAMES},
{"min-count", required_argument, 0, 'm'},
{"print-path", no_argument, 0, 'L'},
{"separate-files", no_argument, 0, 'y'},
usage (FILE *stream, int status)
{
fprintf (stream, _("\
-Usage: %s [-[abcDhilLsTvwxyz]] [-[ACeEfFJnNOpPqQZ][name]] [-I dirs]\n\
+Usage: %s [-[abcDhilLrsTvwxyz]] [-[ACeEfFJnNOpPqQRStZ][name]] [-I dirs]\n\
[-d[num]] [-k from/to] [-m min-count] [-t table-length]\n\
[--[no-]annotated-source[=name]] [--[no-]exec-counts[=name]]\n\
[--[no-]flat-profile[=name]] [--[no-]graph[=name]]\n\
[--[no-]time=name] [--all-lines] [--brief] [--debug[=level]]\n\
- [--function-ordering] [--file-ordering]\n\
+ [--function-ordering] [--file-ordering] [--inline-file-names]\n\
[--directory-path=dirs] [--display-unused-functions]\n\
[--file-format=name] [--file-info] [--help] [--line] [--min-count=n]\n\
[--no-static] [--print-path] [--separate-files]\n\
[--static-call-graph] [--sum] [--table-length=len] [--traditional]\n\
[--version] [--width=n] [--ignore-non-functions]\n\
- [--demangle[=STYLE]] [--no-demangle] [@FILE]\n\
+ [--demangle[=STYLE]] [--no-demangle] [--external-symbol-table=name] [@FILE]\n\
[image-file] [profile-file...]\n"),
whoami);
- if (status == 0)
+ if (REPORT_BUGS_TO[0] && status == 0)
fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);
done (status);
}
expandargv (&argc, &argv);
while ((ch = getopt_long (argc, argv,
- "aA::bBcCd::De:E:f:F:hiI:J::k:lLm:n::N::O:p::P::q::Q::st:Tvw:xyzZ::",
+ "aA::bBcC::d::De:E:f:F:hiI:J::k:lLm:n:N:O:p::P::q::Q::rR:sS:t:Tvw:xyzZ::",
long_options, 0))
!= EOF)
{
break;
case 'E':
sym_id_add (optarg, EXCL_TIME);
+ /* Fall through. */
case 'e':
sym_id_add (optarg, EXCL_GRAPH);
break;
case 'F':
sym_id_add (optarg, INCL_TIME);
+ /* Fall through. */
case 'f':
sym_id_add (optarg, INCL_GRAPH);
break;
+ /* FIXME: The -g and -G options are not present in the getopt_long
+ invocation above, and they are not documented in gprof.texi.
+ Therefore they appear to be deprecated. Test this theory and
+ delete them if true. */
case 'g':
sym_id_add (optarg, EXCL_FLAT);
break;
output_style |= STYLE_SUMMARY_FILE;
user_specified |= STYLE_SUMMARY_FILE;
break;
+ case 'S':
+ external_symbol_table = optarg;
+ DBG (AOUTDEBUG, printf ("external-symbol-table: %s\n", optarg));
+ break;
case 't':
bb_table_length = atoi (optarg);
if (bb_table_length < 0)
break;
case 'v':
/* This output is intended to follow the GNU standards document. */
- printf (_("GNU gprof %s\n"), VERSION);
+ printf (_("GNU gprof %s\n"), BFD_VERSION_STRING);
printf (_("Based on BSD gprof, copyright 1983 Regents of the University of California.\n"));
printf (_("\
This program is free software. This program has absolutely no warranty.\n"));
{
output_style &= ~STYLE_EXEC_COUNTS;
}
- user_specified |= STYLE_ANNOTATED_SOURCE;
+ user_specified |= STYLE_EXEC_COUNTS;
break;
case OPTION_DEMANGLE:
demangle = TRUE;
case OPTION_NO_DEMANGLE:
demangle = FALSE;
break;
+ case OPTION_INLINE_FILE_NAMES:
+ inline_file_names = TRUE;
+ break;
default:
usage (stderr, 1);
}
core_get_text_space (core_bfd);
/* Create symbols from core image. */
- if (line_granularity)
+ if (external_symbol_table)
+ core_create_syms_from (external_symbol_table);
+ else if (line_granularity)
core_create_line_syms ();
else
core_create_function_syms ();
if (output_style == 0)
{
if (gmon_input & (INPUT_HISTOGRAM | INPUT_CALL_GRAPH))
- output_style = STYLE_FLAT_PROFILE | STYLE_CALL_GRAPH;
+ {
+ if (gmon_input & INPUT_HISTOGRAM)
+ output_style |= STYLE_FLAT_PROFILE;
+ if (gmon_input & INPUT_CALL_GRAPH)
+ output_style |= STYLE_CALL_GRAPH;
+ }
else
output_style = STYLE_EXEC_COUNTS;
if (output_style & STYLE_FLAT_PROFILE)
{
/* Print the flat profile. */
- hist_print ();
+ hist_print ();
}
if (cg && (output_style & STYLE_CALL_GRAPH))
if (!bsd_style_output)
{
/* Print the dynamic profile. */
- cg_print (cg);
+ cg_print (cg);
}
cg_print_index ();
}
if (output_style & STYLE_EXEC_COUNTS)
print_exec_counts ();
-
+
if (output_style & STYLE_ANNOTATED_SOURCE)
print_annotated_source ();
-
+
if (output_style & STYLE_FUNCTION_ORDER)
cg_print_function_ordering ();
-
+
if (output_style & STYLE_FILE_ORDER)
cg_print_file_ordering ();
projects / deliverable / binutils-gdb.git / blobdiff