X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fgcov-dump.c;h=74ae799637b8673d0334a4fef9110d223f6f6c9e;hb=89370a1eb374e74c85ca1a61447b853ee4f0c938;hp=818c6efed1132fb782734fd914790af72c8e9dd4;hpb=3f2c2dd8bcd38bd0773b6136df705b314cb244de;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/gcov-dump.c b/gcc/gcov-dump.c index 818c6efed11..74ae799637b 100644 --- a/gcc/gcov-dump.c +++ b/gcc/gcov-dump.c @@ -1,5 +1,5 @@ /* Dump a gcov file, for debugging use. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Contributed by Nathan Sidwell Gcov is free software; you can redistribute it and/or modify @@ -14,8 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Gcov; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include "config.h" #include "system.h" @@ -27,17 +27,17 @@ Boston, MA 02111-1307, USA. */ #include "gcov-io.h" #include "gcov-io.c" -static void dump_file PARAMS ((const char *)); -static void print_prefix PARAMS ((const char *, unsigned)); -static void print_usage PARAMS ((void)); -static void print_version PARAMS ((void)); -static void tag_function PARAMS ((const char *, unsigned, unsigned)); -static void tag_blocks PARAMS ((const char *, unsigned, unsigned)); -static void tag_arcs PARAMS ((const char *, unsigned, unsigned)); -static void tag_lines PARAMS ((const char *, unsigned, unsigned)); -static void tag_counters PARAMS ((const char *, unsigned, unsigned)); -static void tag_summary PARAMS ((const char *, unsigned, unsigned)); -extern int main PARAMS ((int, char **)); +static void dump_file (const char *); +static void print_prefix (const char *, unsigned, gcov_position_t); +static void print_usage (void); +static void print_version (void); +static void tag_function (const char *, unsigned, unsigned); +static void tag_blocks (const char *, unsigned, unsigned); +static void tag_arcs (const char *, unsigned, unsigned); +static void tag_lines (const char *, unsigned, unsigned); +static void tag_counters (const char *, unsigned, unsigned); +static void tag_summary (const char *, unsigned, unsigned); +extern int main (int, char **); typedef struct tag_format { @@ -47,12 +47,15 @@ typedef struct tag_format } tag_format_t; static int flag_dump_contents = 0; +static int flag_dump_positions = 0; static const struct option options[] = { { "help", no_argument, NULL, 'h' }, { "version", no_argument, NULL, 'v' }, { "long", no_argument, NULL, 'l' }, + { "positions", no_argument, NULL, 'o' }, + { 0, 0, 0, 0 } }; static const tag_format_t tag_table[] = @@ -69,13 +72,15 @@ static const tag_format_t tag_table[] = {0, NULL, NULL} }; -int main (argc, argv) - int argc ATTRIBUTE_UNUSED; - char **argv; +int +main (int argc ATTRIBUTE_UNUSED, char **argv) { int opt; - while ((opt = getopt_long (argc, argv, "hlv", options, NULL)) != -1) + /* Unlock the stdio streams. */ + unlock_std_streams (); + + while ((opt = getopt_long (argc, argv, "hlpv", options, NULL)) != -1) { switch (opt) { @@ -88,120 +93,126 @@ int main (argc, argv) case 'l': flag_dump_contents = 1; break; + case 'p': + flag_dump_positions = 1; + break; default: fprintf (stderr, "unknown flag `%c'\n", opt); } } - + while (argv[optind]) dump_file (argv[optind++]); return 0; } static void -print_usage () +print_usage (void) { printf ("Usage: gcov-dump [OPTION] ... gcovfiles\n"); printf ("Print coverage file contents\n"); printf (" -h, --help Print this help\n"); printf (" -v, --version Print version number\n"); printf (" -l, --long Dump record contents too\n"); + printf (" -p, --positions Dump record positions\n"); } static void -print_version () +print_version (void) { - char v[4]; - unsigned version = GCOV_VERSION; - unsigned ix; - - for (ix = 4; ix--; version >>= 8) - v[ix] = version; - printf ("gcov %.4s (GCC %s)\n", v, version_string); - printf ("Copyright (C) 2002 Free Software Foundation, Inc.\n"); - printf ("This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"); + printf ("gcov-dump (GCC) %s\n", version_string); + printf ("Copyright (C) 2003 Free Software Foundation, Inc.\n"); + printf ("This is free software; see the source for copying conditions.\n" + "There is NO warranty; not even for MERCHANTABILITY or \n" + "FITNESS FOR A PARTICULAR PURPOSE.\n\n"); } static void -print_prefix (filename, depth) - const char *filename; - unsigned depth; +print_prefix (const char *filename, unsigned depth, gcov_position_t position) { static const char prefix[] = " "; - - printf ("%s:%.*s", filename, (int) depth, prefix); + + printf ("%s:", filename); + if (flag_dump_positions) + printf ("%lu:", (unsigned long) position); + printf ("%.*s", (int) depth, prefix); } static void -dump_file (filename) - const char *filename; +dump_file (const char *filename) { unsigned tags[4]; unsigned depth = 0; - + if (!gcov_open (filename, 1)) { fprintf (stderr, "%s:cannot open\n", filename); return; } - + /* magic */ { unsigned magic = gcov_read_unsigned (); - unsigned version = gcov_read_unsigned (); + unsigned version; const char *type = NULL; - char e[4], v[4], m[4]; - unsigned expected = GCOV_VERSION; - unsigned ix; - int different = version != GCOV_VERSION; + int endianness = 0; + char m[4], v[4]; - if (magic == GCOV_DATA_MAGIC) + if ((endianness = gcov_magic (magic, GCOV_DATA_MAGIC))) type = "data"; - else if (magic == GCOV_GRAPH_MAGIC) - type = "graph"; + else if ((endianness = gcov_magic (magic, GCOV_NOTE_MAGIC))) + type = "note"; else { printf ("%s:not a gcov file\n", filename); gcov_close (); return; } - for (ix = 4; ix--; expected >>= 8, version >>= 8, magic >>= 8) + version = gcov_read_unsigned (); + GCOV_UNSIGNED2STRING (v, version); + GCOV_UNSIGNED2STRING (m, magic); + + printf ("%s:%s:magic `%.4s':version `%.4s'%s\n", filename, type, + m, v, endianness < 0 ? " (swapped endianness)" : ""); + if (version != GCOV_VERSION) { - e[ix] = expected; - v[ix] = version; - m[ix] = magic; + char e[4]; + + GCOV_UNSIGNED2STRING (e, GCOV_VERSION); + printf ("%s:warning:current version is `%.4s'\n", filename, e); } - - printf ("%s:%s:magic `%.4s':version `%.4s'\n", filename, type, m, v); - if (different) - printf ("%s:warning:current version is `%.4s'\n", filename, e); } - while (!gcov_is_eof ()) + /* stamp */ + { + unsigned stamp = gcov_read_unsigned (); + + printf ("%s:stamp %lu\n", filename, (unsigned long)stamp); + } + + while (1) { - unsigned tag = gcov_read_unsigned (); - unsigned length = gcov_read_unsigned (); - unsigned long base = gcov_position (); + gcov_position_t base, position = gcov_position (); + unsigned tag, length; tag_format_t const *format; unsigned tag_depth; int error; - + unsigned mask; + + tag = gcov_read_unsigned (); if (!tag) - tag_depth = depth; - else + break; + length = gcov_read_unsigned (); + base = gcov_position (); + mask = GCOV_TAG_MASK (tag) >> 1; + for (tag_depth = 4; mask; mask >>= 8) { - unsigned mask = GCOV_TAG_MASK (tag) >> 1; - - for (tag_depth = 4; mask; mask >>= 8) + if ((mask & 0xff) != 0xff) { - if ((mask & 0xff) != 0xff) - { - printf ("%s:tag `%08x' is invalid\n", filename, tag); - break; - } - tag_depth--; + printf ("%s:tag `%08x' is invalid\n", filename, tag); + break; } + tag_depth--; } for (format = tag_table; format->name; format++) if (format->tag == tag) @@ -219,17 +230,17 @@ dump_file (filename) depth = tag_depth; tags[depth - 1] = tag; } - - print_prefix (filename, tag_depth); + + print_prefix (filename, tag_depth, position); printf ("%08x:%4u:%s", tag, length, format->name); if (format->proc) (*format->proc) (filename, tag, length); - + printf ("\n"); if (flag_dump_contents && format->proc) { unsigned long actual_length = gcov_position () - base; - + if (actual_length > length) printf ("%s:record size mismatch %lu bytes overread\n", filename, actual_length - length); @@ -237,11 +248,12 @@ dump_file (filename) printf ("%s:record size mismatch %lu bytes unread\n", filename, length - actual_length); } - gcov_seek (base, length); + gcov_sync (base, length); if ((error = gcov_is_error ())) { printf (error < 0 ? "%s:counter overflow at %lu\n" : - "%s:read error at %lu\n", filename, gcov_position ()); + "%s:read error at %lu\n", filename, + (long unsigned) gcov_position ()); break; } } @@ -249,20 +261,18 @@ dump_file (filename) } static void -tag_function (filename, tag, length) - const char *filename ATTRIBUTE_UNUSED; - unsigned tag ATTRIBUTE_UNUSED; - unsigned length ATTRIBUTE_UNUSED; +tag_function (const char *filename ATTRIBUTE_UNUSED, + unsigned tag ATTRIBUTE_UNUSED, unsigned length ATTRIBUTE_UNUSED) { unsigned long pos = gcov_position (); - + printf (" ident=%u", gcov_read_unsigned ()); printf (", checksum=0x%08x", gcov_read_unsigned ()); if (gcov_position () - pos < length) { const char *name; - + name = gcov_read_string (); printf (", `%s'", name ? name : "NULL"); name = gcov_read_string (); @@ -272,13 +282,11 @@ tag_function (filename, tag, length) } static void -tag_blocks (filename, tag, length) - const char *filename ATTRIBUTE_UNUSED; - unsigned tag ATTRIBUTE_UNUSED; - unsigned length ATTRIBUTE_UNUSED; +tag_blocks (const char *filename ATTRIBUTE_UNUSED, + unsigned tag ATTRIBUTE_UNUSED, unsigned length ATTRIBUTE_UNUSED) { - unsigned n_blocks = length / 4; - + unsigned n_blocks = GCOV_TAG_BLOCKS_NUM (length); + printf (" %u blocks", n_blocks); if (flag_dump_contents) @@ -288,19 +296,21 @@ tag_blocks (filename, tag, length) for (ix = 0; ix != n_blocks; ix++) { if (!(ix & 7)) - printf ("\n%s:\t\t%u", filename, ix); + { + printf ("\n"); + print_prefix (filename, 0, gcov_position ()); + printf ("\t\t%u", ix); + } printf (" %04x", gcov_read_unsigned ()); } } } static void -tag_arcs (filename, tag, length) - const char *filename ATTRIBUTE_UNUSED; - unsigned tag ATTRIBUTE_UNUSED; - unsigned length ATTRIBUTE_UNUSED; +tag_arcs (const char *filename ATTRIBUTE_UNUSED, + unsigned tag ATTRIBUTE_UNUSED, unsigned length ATTRIBUTE_UNUSED) { - unsigned n_arcs = (length - 4) / 8; + unsigned n_arcs = GCOV_TAG_ARCS_NUM (length); printf (" %u arcs", n_arcs); if (flag_dump_contents) @@ -310,21 +320,24 @@ tag_arcs (filename, tag, length) for (ix = 0; ix != n_arcs; ix++) { - unsigned dst = gcov_read_unsigned (); - unsigned flags = gcov_read_unsigned (); - + unsigned dst, flags; + if (!(ix & 3)) - printf ("\n%s:\tblock %u:", filename, blockno); + { + printf ("\n"); + print_prefix (filename, 0, gcov_position ()); + printf ("\tblock %u:", blockno); + } + dst = gcov_read_unsigned (); + flags = gcov_read_unsigned (); printf (" %u:%04x", dst, flags); } } } static void -tag_lines (filename, tag, length) - const char *filename ATTRIBUTE_UNUSED; - unsigned tag ATTRIBUTE_UNUSED; - unsigned length ATTRIBUTE_UNUSED; +tag_lines (const char *filename ATTRIBUTE_UNUSED, + unsigned tag ATTRIBUTE_UNUSED, unsigned length ATTRIBUTE_UNUSED) { if (flag_dump_contents) { @@ -333,9 +346,10 @@ tag_lines (filename, tag, length) while (1) { + gcov_position_t position = gcov_position (); const char *source = NULL; unsigned lineno = gcov_read_unsigned (); - + if (!lineno) { source = gcov_read_string (); @@ -343,10 +357,12 @@ tag_lines (filename, tag, length) break; sep = NULL; } - + if (!sep) { - printf ("\n%s:\tblock %u:", filename, blockno); + printf ("\n"); + print_prefix (filename, 0, position); + printf ("\tblock %u:", blockno); sep = ""; } if (lineno) @@ -364,14 +380,12 @@ tag_lines (filename, tag, length) } static void -tag_counters (filename, tag, length) - const char *filename ATTRIBUTE_UNUSED; - unsigned tag ATTRIBUTE_UNUSED; - unsigned length ATTRIBUTE_UNUSED; +tag_counters (const char *filename ATTRIBUTE_UNUSED, + unsigned tag ATTRIBUTE_UNUSED, unsigned length ATTRIBUTE_UNUSED) { static const char *const counter_names[] = GCOV_COUNTER_NAMES; - unsigned n_counts = length / 8; - + unsigned n_counts = GCOV_TAG_COUNTER_NUM (length); + printf (" %s %u counts", counter_names[GCOV_COUNTER_FOR_TAG (tag)], n_counts); if (flag_dump_contents) @@ -380,10 +394,16 @@ tag_counters (filename, tag, length) for (ix = 0; ix != n_counts; ix++) { - gcov_type count = gcov_read_counter (); - + gcov_type count; + if (!(ix & 7)) - printf ("\n%s:\t\t%u", filename, ix); + { + printf ("\n"); + print_prefix (filename, 0, gcov_position ()); + printf ("\t\t%u", ix); + } + + count = gcov_read_counter (); printf (" "); printf (HOST_WIDEST_INT_PRINT_DEC, count); } @@ -391,22 +411,22 @@ tag_counters (filename, tag, length) } static void -tag_summary (filename, tag, length) - const char *filename ATTRIBUTE_UNUSED; - unsigned tag ATTRIBUTE_UNUSED; - unsigned length ATTRIBUTE_UNUSED; +tag_summary (const char *filename ATTRIBUTE_UNUSED, + unsigned tag ATTRIBUTE_UNUSED, unsigned length ATTRIBUTE_UNUSED) { struct gcov_summary summary; unsigned ix; - + gcov_read_summary (&summary); printf (" checksum=0x%08x", summary.checksum); - + for (ix = 0; ix != GCOV_COUNTERS; ix++) { - printf ("\n%sL\t\tcounts=%u, runs=%u", filename, + printf ("\n"); + print_prefix (filename, 0, 0); + printf ("\t\tcounts=%u, runs=%u", summary.ctrs[ix].num, summary.ctrs[ix].runs); - + printf (", sum_all=" HOST_WIDEST_INT_PRINT_DEC, (HOST_WIDEST_INT)summary.ctrs[ix].sum_all); printf (", run_max=" HOST_WIDEST_INT_PRINT_DEC,