Mercurial > hg > CbC > CbC_gcc
diff gcc/gcov.c @ 111:04ced10e8804
gcc 7
| author | kono |
|---|---|
| date | Fri, 27 Oct 2017 22:46:09 +0900 |
| parents | f6334be47118 |
| children | 84e7813d76e9 |
line wrap: on
line diff
--- a/gcc/gcov.c Sun Aug 21 07:07:55 2011 +0900 +++ b/gcc/gcov.c Fri Oct 27 22:46:09 2017 +0900 @@ -1,8 +1,6 @@ /* Gcov.c: prepend line execution counts and branch probabilities to a source file. - Copyright (C) 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999, - 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 - Free Software Foundation, Inc. + Copyright (C) 1990-2017 Free Software Foundation, Inc. Contributed by James E. Wilson of Cygnus Support. Mangled by Bob Manson of Cygnus Support. Mangled further by Nathan Sidwell <nathan@codesourcery.com> @@ -33,14 +31,22 @@ probabilities of fall through arcs. */ #include "config.h" +#define INCLUDE_ALGORITHM +#define INCLUDE_VECTOR #include "system.h" #include "coretypes.h" #include "tm.h" #include "intl.h" +#include "diagnostic.h" #include "version.h" +#include "demangle.h" #include <getopt.h> +#include "md5.h" + +using namespace std; + #define IN_GCOV 1 #include "gcov-io.h" #include "gcov-io.c" @@ -54,9 +60,14 @@ some places we make use of the knowledge of how profile.c works to select particular algorithms here. */ -/* This is the size of the buffer used to read in source file lines. */ +/* The code validates that the profile information read in corresponds + to the code currently being compiled. Rather than checking for + identical files, the code below compares a checksum on the CFG + (based on the order of basic blocks and the arcs in the CFG). If + the CFG checksum in the gcda file match the CFG checksum in the + gcno file, the profile data will be used. */ -#define STRING_SIZE 200 +/* This is the size of the buffer used to read in source file lines. */ struct function_info; struct block_info; @@ -80,6 +91,9 @@ unsigned int fake : 1; unsigned int fall_through : 1; + /* Arc to a catch handler. */ + unsigned int is_throw : 1; + /* Arc is for a function that abnormally returns. */ unsigned int is_call_non_return : 1; @@ -100,11 +114,27 @@ struct arc_info *pred_next; } arc_t; +/* Describes which locations (lines and files) are associated with + a basic block. */ + +struct block_location_info +{ + block_location_info (unsigned _source_file_idx): + source_file_idx (_source_file_idx) + {} + + unsigned source_file_idx; + vector<unsigned> lines; +}; + /* Describes a basic block. Contains lists of arcs to successor and predecessor blocks. */ typedef struct block_info { + /* Constructor. */ + block_info (); + /* Chain of exit and entry arcs. */ arc_t *succ; arc_t *pred; @@ -113,12 +143,14 @@ gcov_type num_succ; gcov_type num_pred; + unsigned id; + /* Block execution count. */ gcov_type count; - unsigned flags : 13; unsigned count_valid : 1; unsigned valid_chain : 1; unsigned invalid_chain : 1; + unsigned exceptional : 1; /* Block is a call instrumenting site. */ unsigned is_call_site : 1; /* Does the call. */ @@ -127,26 +159,16 @@ /* Block is a landing pad for longjmp or throw. */ unsigned is_nonlocal_return : 1; - union + vector<block_location_info> locations; + + struct { - struct - { - /* Array of line numbers and source files. source files are - introduced by a linenumber of zero, the next 'line number' is - the number of the source file. Always starts with a source - file. */ - unsigned *encoding; - unsigned num; - } line; /* Valid until blocks are linked onto lines */ - struct - { - /* Single line graph cycle workspace. Used for all-blocks - mode. */ - arc_t *arc; - unsigned ident; - } cycle; /* Used in all-blocks mode, after blocks are linked onto - lines. */ - } u; + /* Single line graph cycle workspace. Used for all-blocks + mode. */ + arc_t *arc; + unsigned ident; + } cycle; /* Used in all-blocks mode, after blocks are linked onto + lines. */ /* Temporary chain for solving graph, and for chaining blocks on one line. */ @@ -154,30 +176,48 @@ } block_t; +block_info::block_info (): succ (NULL), pred (NULL), num_succ (0), num_pred (0), + id (0), count (0), count_valid (0), valid_chain (0), invalid_chain (0), + exceptional (0), is_call_site (0), is_call_return (0), is_nonlocal_return (0), + locations (), chain (NULL) +{ + cycle.arc = NULL; +} + /* Describes a single function. Contains an array of basic blocks. */ typedef struct function_info { + function_info (); + ~function_info (); + /* Name of function. */ char *name; + char *demangled_name; unsigned ident; - unsigned checksum; + unsigned lineno_checksum; + unsigned cfg_checksum; - /* Array of basic blocks. */ - block_t *blocks; - unsigned num_blocks; + /* The graph contains at least one fake incoming edge. */ + unsigned has_catch : 1; + + /* Array of basic blocks. Like in GCC, the entry block is + at blocks[0] and the exit block is at blocks[1]. */ +#define ENTRY_BLOCK (0) +#define EXIT_BLOCK (1) + vector<block_t> blocks; unsigned blocks_executed; /* Raw arc coverage counts. */ gcov_type *counts; unsigned num_counts; - /* First line number. */ + /* First line number & file. */ unsigned line; - struct source_info *src; + unsigned src; /* Next function in same source file. */ - struct function_info *line_next; + struct function_info *next_file_fn; /* Next function. */ struct function_info *next; @@ -205,26 +245,34 @@ typedef struct line_info { + /* Return true when NEEDLE is one of basic blocks the line belongs to. */ + bool has_block (block_t *needle); + gcov_type count; /* execution count */ - union - { - arc_t *branches; /* branches from blocks that end on this - line. Used for branch-counts when not - all-blocks mode. */ - block_t *blocks; /* blocks which start on this line. Used - in all-blocks mode. */ - } u; + arc_t *branches; /* branches from blocks that end on this line. */ + block_t *blocks; /* blocks which start on this line. + Used in all-blocks mode. */ unsigned exists : 1; + unsigned unexceptional : 1; } line_t; +bool +line_t::has_block (block_t *needle) +{ + for (block_t *n = blocks; n; n = n->chain) + if (n == needle) + return true; + + return false; +} + /* Describes a file mentioned in the block graph. Contains an array of line info. */ typedef struct source_info { - /* Name of source file. */ + /* Canonical name of source file. */ char *name; - unsigned index; time_t file_time; /* Array of line information. */ @@ -236,41 +284,49 @@ /* Functions in this source file. These are in ascending line number order. */ function_t *functions; +} source_t; - /* Next source file. */ - struct source_info *next; -} source_t; +typedef struct name_map +{ + char *name; /* Source file name */ + unsigned src; /* Source file */ +} name_map_t; /* Holds a list of function basic block graphs. */ static function_t *functions; - -/* This points to the head of the sourcefile structure list. New elements - are always prepended. */ +static function_t **fn_end = &functions; -static source_t *sources; +static source_t *sources; /* Array of source files */ +static unsigned n_sources; /* Number of sources */ +static unsigned a_sources; /* Allocated sources */ -/* Next index for a source file. */ - -static unsigned source_index; +static name_map_t *names; /* Mapping of file names to sources */ +static unsigned n_names; /* Number of names */ +static unsigned a_names; /* Allocated names */ /* This holds data summary information. */ -static struct gcov_summary object_summary; +static unsigned object_runs; static unsigned program_count; +static unsigned total_lines; +static unsigned total_executed; + /* Modification time of graph file. */ static time_t bbg_file_time; -/* Name and file pointer of the input file for the basic block graph. */ +/* Name of the notes (gcno) output file. The "bbg" prefix is for + historical reasons, when the notes file contained only the + basic block graph notes. */ static char *bbg_file_name; /* Stamp of the bbg file */ static unsigned bbg_stamp; -/* Name and file pointer of the input file for the arc count data. */ +/* Name and file pointer of the input file for the count data (gcda). */ static char *da_file_name; @@ -302,12 +358,29 @@ static int flag_display_progress = 0; +/* Output *.gcov file in intermediate format used by 'lcov'. */ + +static int flag_intermediate_format = 0; + +/* Output demangled function names. */ + +static int flag_demangled_names = 0; + /* For included files, make the gcov output file name include the name of the input source file. For example, if x.h is included in a.c, then the output file name is a.c##x.h.gcov instead of x.h.gcov. */ static int flag_long_names = 0; +/* For situations when a long name can potentially hit filesystem path limit, + let's calculate md5sum of the path and append it to a file name. */ + +static int flag_hash_filenames = 0; + +/* Print verbose informations. */ + +static int flag_verbose = 0; + /* Output count information for every basic block, not merely those that contain line number information. */ @@ -322,6 +395,17 @@ static char *object_directory = 0; +/* Source directory prefix. This is removed from source pathnames + that match, when generating the output file name. */ + +static char *source_prefix = 0; +static size_t source_length = 0; + +/* Only show data for sources with relative pathnames. Absolute ones + usually indicate a system header file, which although it may + contain inline functions, is usually uninteresting. */ +static int flag_relative_only = 0; + /* Preserve all pathname components. Needed when object files and source files are in subdirectories. '/' is mangled as '#', '.' is elided and '..' mangled to '^'. */ @@ -334,42 +418,248 @@ static int flag_counts = 0; /* Forward declarations. */ -static void fnotice (FILE *, const char *, ...) ATTRIBUTE_PRINTF_2; static int process_args (int, char **); static void print_usage (int) ATTRIBUTE_NORETURN; static void print_version (void) ATTRIBUTE_NORETURN; static void process_file (const char *); static void generate_results (const char *); static void create_file_names (const char *); -static source_t *find_source (const char *); -static int read_graph_file (void); -static int read_count_file (void); +static int name_search (const void *, const void *); +static int name_sort (const void *, const void *); +static char *canonicalize_name (const char *); +static unsigned find_source (const char *); +static function_t *read_graph_file (void); +static int read_count_file (function_t *); static void solve_flow_graph (function_t *); +static void find_exception_blocks (function_t *); static void add_branch_counts (coverage_t *, const arc_t *); static void add_line_counts (coverage_t *, function_t *); +static void executed_summary (unsigned, unsigned); static void function_summary (const coverage_t *, const char *); static const char *format_gcov (gcov_type, gcov_type, int); static void accumulate_line_counts (source_t *); +static void output_gcov_file (const char *, source_t *); static int output_branch_count (FILE *, int, const arc_t *); static void output_lines (FILE *, const source_t *); static char *make_gcov_file_name (const char *, const char *); +static char *mangle_name (const char *, char *); static void release_structures (void); extern int main (int, char **); +function_info::function_info (): name (NULL), demangled_name (NULL), + ident (0), lineno_checksum (0), cfg_checksum (0), has_catch (0), + blocks (), blocks_executed (0), counts (NULL), num_counts (0), + line (0), src (0), next_file_fn (NULL), next (NULL) +{ +} + +function_info::~function_info () +{ + for (int i = blocks.size () - 1; i >= 0; i--) + { + arc_t *arc, *arc_n; + + for (arc = blocks[i].succ; arc; arc = arc_n) + { + arc_n = arc->succ_next; + free (arc); + } + } + free (counts); + if (flag_demangled_names && demangled_name != name) + free (demangled_name); + free (name); +} + +/* Cycle detection! + There are a bajillion algorithms that do this. Boost's function is named + hawick_cycles, so I used the algorithm by K. A. Hawick and H. A. James in + "Enumerating Circuits and Loops in Graphs with Self-Arcs and Multiple-Arcs" + (url at <http://complexity.massey.ac.nz/cstn/013/cstn-013.pdf>). + + The basic algorithm is simple: effectively, we're finding all simple paths + in a subgraph (that shrinks every iteration). Duplicates are filtered by + "blocking" a path when a node is added to the path (this also prevents non- + simple paths)--the node is unblocked only when it participates in a cycle. + */ + +typedef vector<arc_t *> arc_vector_t; +typedef vector<const block_t *> block_vector_t; + +/* Enum with types of loop in CFG. */ + +enum loop_type +{ + NO_LOOP = 0, + LOOP = 1, + NEGATIVE_LOOP = 3 +}; + +/* Loop_type operator that merges two values: A and B. */ + +inline loop_type& operator |= (loop_type& a, loop_type b) +{ + return a = static_cast<loop_type> (a | b); +} + +/* Handle cycle identified by EDGES, where the function finds minimum cs_count + and subtract the value from all counts. The subtracted value is added + to COUNT. Returns type of loop. */ + +static loop_type +handle_cycle (const arc_vector_t &edges, int64_t &count) +{ + /* Find the minimum edge of the cycle, and reduce all nodes in the cycle by + that amount. */ + int64_t cycle_count = INTTYPE_MAXIMUM (int64_t); + for (unsigned i = 0; i < edges.size (); i++) + { + int64_t ecount = edges[i]->cs_count; + if (cycle_count > ecount) + cycle_count = ecount; + } + count += cycle_count; + for (unsigned i = 0; i < edges.size (); i++) + edges[i]->cs_count -= cycle_count; + + return cycle_count < 0 ? NEGATIVE_LOOP : LOOP; +} + +/* Unblock a block U from BLOCKED. Apart from that, iterate all blocks + blocked by U in BLOCK_LISTS. */ + +static void +unblock (const block_t *u, block_vector_t &blocked, + vector<block_vector_t > &block_lists) +{ + block_vector_t::iterator it = find (blocked.begin (), blocked.end (), u); + if (it == blocked.end ()) + return; + + unsigned index = it - blocked.begin (); + blocked.erase (it); + + block_vector_t to_unblock (block_lists[index]); + + block_lists.erase (block_lists.begin () + index); + + for (block_vector_t::iterator it = to_unblock.begin (); + it != to_unblock.end (); it++) + unblock (*it, blocked, block_lists); +} + +/* Find circuit going to block V, PATH is provisional seen cycle. + BLOCKED is vector of blocked vertices, BLOCK_LISTS contains vertices + blocked by a block. COUNT is accumulated count of the current LINE. + Returns what type of loop it contains. */ + +static loop_type +circuit (block_t *v, arc_vector_t &path, block_t *start, + block_vector_t &blocked, vector<block_vector_t> &block_lists, + line_t &linfo, int64_t &count) +{ + loop_type result = NO_LOOP; + + /* Add v to the block list. */ + gcc_assert (find (blocked.begin (), blocked.end (), v) == blocked.end ()); + blocked.push_back (v); + block_lists.push_back (block_vector_t ()); + + for (arc_t *arc = v->succ; arc; arc = arc->succ_next) + { + block_t *w = arc->dst; + if (w < start || !linfo.has_block (w)) + continue; + + path.push_back (arc); + if (w == start) + /* Cycle has been found. */ + result |= handle_cycle (path, count); + else if (find (blocked.begin (), blocked.end (), w) == blocked.end ()) + result |= circuit (w, path, start, blocked, block_lists, linfo, count); + + path.pop_back (); + } + + if (result != NO_LOOP) + unblock (v, blocked, block_lists); + else + for (arc_t *arc = v->succ; arc; arc = arc->succ_next) + { + block_t *w = arc->dst; + if (w < start || !linfo.has_block (w)) + continue; + + size_t index + = find (blocked.begin (), blocked.end (), w) - blocked.begin (); + gcc_assert (index < blocked.size ()); + block_vector_t &list = block_lists[index]; + if (find (list.begin (), list.end (), v) == list.end ()) + list.push_back (v); + } + + return result; +} + +/* Find cycles for a LINFO. If HANDLE_NEGATIVE_CYCLES is set and the line + contains a negative loop, then perform the same function once again. */ + +static gcov_type +get_cycles_count (line_t &linfo, bool handle_negative_cycles = true) +{ + /* Note that this algorithm works even if blocks aren't in sorted order. + Each iteration of the circuit detection is completely independent + (except for reducing counts, but that shouldn't matter anyways). + Therefore, operating on a permuted order (i.e., non-sorted) only + has the effect of permuting the output cycles. */ + + loop_type result = NO_LOOP; + gcov_type count = 0; + for (block_t *block = linfo.blocks; block; block = block->chain) + { + arc_vector_t path; + block_vector_t blocked; + vector<block_vector_t > block_lists; + result |= circuit (block, path, block, blocked, block_lists, linfo, + count); + } + + /* If we have a negative cycle, repeat the find_cycles routine. */ + if (result == NEGATIVE_LOOP && handle_negative_cycles) + count += get_cycles_count (linfo, false); + + return count; +} + int main (int argc, char **argv) { int argno; int first_arg; + const char *p; + + p = argv[0] + strlen (argv[0]); + while (p != argv[0] && !IS_DIR_SEPARATOR (p[-1])) + --p; + progname = p; + + xmalloc_set_program_name (progname); /* Unlock the stdio streams. */ unlock_std_streams (); gcc_init_libintl (); + diagnostic_initialize (global_dc, 0); + /* Handle response files. */ expandargv (&argc, &argv); + a_names = 10; + names = XNEWVEC (name_map_t, a_names); + a_sources = 10; + sources = XNEWVEC (source_t, a_sources); + argno = process_args (argc, argv); if (optind == argc) print_usage (true); @@ -378,12 +668,12 @@ multiple_files = 1; first_arg = argno; - + for (; argno != argc; argno++) { if (flag_display_progress) - printf("Processing file %d out of %d\n", - argno - first_arg + 1, argc - first_arg); + printf ("Processing file %d out of %d\n", argno - first_arg + 1, + argc - first_arg); process_file (argv[argno]); } @@ -393,16 +683,6 @@ return 0; } - -static void -fnotice (FILE *file, const char *cmsgid, ...) -{ - va_list ap; - - va_start (ap, cmsgid); - vfprintf (file, _(cmsgid), ap); - va_end (ap); -} /* Print a usage message and exit. If ERROR_P is nonzero, this is an error, otherwise the output of --help. */ @@ -413,22 +693,28 @@ FILE *file = error_p ? stderr : stdout; int status = error_p ? FATAL_EXIT_CODE : SUCCESS_EXIT_CODE; - fnotice (file, "Usage: gcov [OPTION]... SOURCEFILE...\n\n"); + fnotice (file, "Usage: gcov [OPTION...] SOURCE|OBJ...\n\n"); fnotice (file, "Print code coverage information.\n\n"); - fnotice (file, " -h, --help Print this help, then exit\n"); - fnotice (file, " -v, --version Print version number, then exit\n"); fnotice (file, " -a, --all-blocks Show information for every basic block\n"); fnotice (file, " -b, --branch-probabilities Include branch probabilities in output\n"); - fnotice (file, " -c, --branch-counts Given counts of branches taken\n\ + fnotice (file, " -c, --branch-counts Output counts of branches taken\n\ rather than percentages\n"); - fnotice (file, " -n, --no-output Do not create an output file\n"); + fnotice (file, " -d, --display-progress Display progress information\n"); + fnotice (file, " -f, --function-summaries Output summaries for each function\n"); + fnotice (file, " -h, --help Print this help, then exit\n"); + fnotice (file, " -i, --intermediate-format Output .gcov file in intermediate text format\n"); fnotice (file, " -l, --long-file-names Use long output file names for included\n\ source files\n"); - fnotice (file, " -f, --function-summaries Output summaries for each function\n"); + fnotice (file, " -m, --demangled-names Output demangled function names\n"); + fnotice (file, " -n, --no-output Do not create an output file\n"); fnotice (file, " -o, --object-directory DIR|FILE Search for object files in DIR or called FILE\n"); fnotice (file, " -p, --preserve-paths Preserve all pathname components\n"); + fnotice (file, " -r, --relative-only Only show data for relative sources\n"); + fnotice (file, " -s, --source-prefix DIR Source prefix to elide\n"); fnotice (file, " -u, --unconditional-branches Show unconditional branch counts too\n"); - fnotice (file, " -d, --display-progress Display progress information\n"); + fnotice (file, " -v, --version Print version number, then exit\n"); + fnotice (file, " -w, --verbose Print verbose informations\n"); + fnotice (file, " -x, --hash-filenames Hash long pathnames\n"); fnotice (file, "\nFor bug reporting instructions, please see:\n%s.\n", bug_report_url); exit (status); @@ -440,7 +726,7 @@ print_version (void) { fnotice (stdout, "gcov %s%s\n", pkgversion_string, version_string); - fprintf (stdout, "Copyright %s 2011 Free Software Foundation, Inc.\n", + fprintf (stdout, "Copyright %s 2017 Free Software Foundation, Inc.\n", _("(C)")); fnotice (stdout, _("This is free software; see the source for copying conditions.\n" @@ -453,17 +739,23 @@ { { "help", no_argument, NULL, 'h' }, { "version", no_argument, NULL, 'v' }, + { "verbose", no_argument, NULL, 'w' }, { "all-blocks", no_argument, NULL, 'a' }, { "branch-probabilities", no_argument, NULL, 'b' }, { "branch-counts", no_argument, NULL, 'c' }, + { "intermediate-format", no_argument, NULL, 'i' }, { "no-output", no_argument, NULL, 'n' }, { "long-file-names", no_argument, NULL, 'l' }, { "function-summaries", no_argument, NULL, 'f' }, + { "demangled-names", no_argument, NULL, 'm' }, { "preserve-paths", no_argument, NULL, 'p' }, + { "relative-only", no_argument, NULL, 'r' }, { "object-directory", required_argument, NULL, 'o' }, { "object-file", required_argument, NULL, 'o' }, + { "source-prefix", required_argument, NULL, 's' }, { "unconditional-branches", no_argument, NULL, 'u' }, { "display-progress", no_argument, NULL, 'd' }, + { "hash-filenames", no_argument, NULL, 'x' }, { 0, 0, 0, 0 } }; @@ -474,7 +766,8 @@ { int opt; - while ((opt = getopt_long (argc, argv, "abcdfhlno:puv", options, NULL)) != -1) + const char *opts = "abcdfhilmno:prs:uvwx"; + while ((opt = getopt_long (argc, argv, opts, options, NULL)) != -1) { switch (opt) { @@ -496,21 +789,41 @@ case 'l': flag_long_names = 1; break; + case 'm': + flag_demangled_names = 1; + break; case 'n': flag_gcov_file = 0; break; case 'o': object_directory = optarg; break; + case 's': + source_prefix = optarg; + source_length = strlen (source_prefix); + break; + case 'r': + flag_relative_only = 1; + break; case 'p': flag_preserve_paths = 1; break; case 'u': flag_unconditional = 1; break; + case 'i': + flag_intermediate_format = 1; + flag_gcov_file = 1; + break; case 'd': flag_display_progress = 1; break; + case 'x': + flag_hash_filenames = 1; + break; + case 'w': + flag_verbose = 1; + break; case 'v': print_version (); /* print_version will exit. */ @@ -523,54 +836,204 @@ return optind; } -/* Process a single source file. */ +/* Output the result in intermediate format used by 'lcov'. + +The intermediate format contains a single file named 'foo.cc.gcov', +with no source code included. A sample output is + +file:foo.cc +function:5,1,_Z3foov +function:13,1,main +function:19,1,_GLOBAL__sub_I__Z3foov +function:19,1,_Z41__static_initialization_and_destruction_0ii +lcount:5,1 +lcount:7,9 +lcount:9,8 +lcount:11,1 +file:/.../iostream +lcount:74,1 +file:/.../basic_ios.h +file:/.../ostream +file:/.../ios_base.h +function:157,0,_ZStorSt12_Ios_IostateS_ +lcount:157,0 +file:/.../char_traits.h +function:258,0,_ZNSt11char_traitsIcE6lengthEPKc +lcount:258,0 +... + +The default gcov outputs multiple files: 'foo.cc.gcov', +'iostream.gcov', 'ios_base.h.gcov', etc. with source code +included. Instead the intermediate format here outputs only a single +file 'foo.cc.gcov' similar to the above example. */ + +static void +output_intermediate_file (FILE *gcov_file, source_t *src) +{ + unsigned line_num; /* current line number. */ + const line_t *line; /* current line info ptr. */ + function_t *fn; /* current function info ptr. */ + + fprintf (gcov_file, "file:%s\n", src->name); /* source file name */ + + for (fn = src->functions; fn; fn = fn->next_file_fn) + { + /* function:<name>,<line_number>,<execution_count> */ + fprintf (gcov_file, "function:%d,%s,%s\n", fn->line, + format_gcov (fn->blocks[0].count, 0, -1), + flag_demangled_names ? fn->demangled_name : fn->name); + } + + for (line_num = 1, line = &src->lines[line_num]; + line_num < src->num_lines; + line_num++, line++) + { + arc_t *arc; + if (line->exists) + fprintf (gcov_file, "lcount:%u,%s\n", line_num, + format_gcov (line->count, 0, -1)); + if (flag_branches) + for (arc = line->branches; arc; arc = arc->line_next) + { + if (!arc->is_unconditional && !arc->is_call_non_return) + { + const char *branch_type; + /* branch:<line_num>,<branch_coverage_type> + branch_coverage_type + : notexec (Branch not executed) + : taken (Branch executed and taken) + : nottaken (Branch executed, but not taken) + */ + if (arc->src->count) + branch_type = (arc->count > 0) ? "taken" : "nottaken"; + else + branch_type = "notexec"; + fprintf (gcov_file, "branch:%d,%s\n", line_num, branch_type); + } + } + } +} + +/* Process a single input file. */ static void process_file (const char *file_name) { - function_t *fn; - function_t *fn_p; - function_t *old_functions; - - /* Save and clear the list of current functions. They will be appended - later. */ - old_functions = functions; - functions = NULL; + function_t *fns; create_file_names (file_name); - if (read_graph_file ()) + fns = read_graph_file (); + if (!fns) return; - if (!functions) + read_count_file (fns); + while (fns) { - fnotice (stderr, "%s:no functions found\n", bbg_file_name); - return; - } + function_t *fn = fns; + + fns = fn->next; + fn->next = NULL; + if (fn->counts || no_data_file) + { + unsigned src = fn->src; + unsigned line = fn->line; + unsigned block_no; + function_t *probe, **prev; + + /* Now insert it into the source file's list of + functions. Normally functions will be encountered in + ascending order, so a simple scan is quick. Note we're + building this list in reverse order. */ + for (prev = &sources[src].functions; + (probe = *prev); prev = &probe->next_file_fn) + if (probe->line <= line) + break; + fn->next_file_fn = probe; + *prev = fn; + + /* Mark last line in files touched by function. */ + for (block_no = 0; block_no != fn->blocks.size (); block_no++) + { + block_t *block = &fn->blocks[block_no]; + for (unsigned i = 0; i < block->locations.size (); i++) + { + unsigned s = block->locations[i].source_file_idx; + + /* Sort lines of locations. */ + sort (block->locations[i].lines.begin (), + block->locations[i].lines.end ()); - if (read_count_file ()) - return; + if (!block->locations[i].lines.empty ()) + { + unsigned last_line + = block->locations[i].lines.back () + 1; + if (last_line > sources[s].num_lines) + sources[s].num_lines = last_line; + } + } + } + + solve_flow_graph (fn); + if (fn->has_catch) + find_exception_blocks (fn); + *fn_end = fn; + fn_end = &fn->next; + } + else + /* The function was not in the executable -- some other + instance must have been selected. */ + delete fn; + } +} - for (fn_p = NULL, fn = functions; fn; fn_p = fn, fn = fn->next) - solve_flow_graph (fn); +static void +output_gcov_file (const char *file_name, source_t *src) +{ + char *gcov_file_name = make_gcov_file_name (file_name, src->coverage.name); + + if (src->coverage.lines) + { + FILE *gcov_file = fopen (gcov_file_name, "w"); + if (gcov_file) + { + fnotice (stdout, "Creating '%s'\n", gcov_file_name); - if (fn_p) - fn_p->next = old_functions; + if (flag_intermediate_format) + output_intermediate_file (gcov_file, src); + else + output_lines (gcov_file, src); + if (ferror (gcov_file)) + fnotice (stderr, "Error writing output file '%s'\n", gcov_file_name); + fclose (gcov_file); + } + else + fnotice (stderr, "Could not open output file '%s'\n", gcov_file_name); + } + else + { + unlink (gcov_file_name); + fnotice (stdout, "Removing '%s'\n", gcov_file_name); + } + free (gcov_file_name); } static void generate_results (const char *file_name) { + unsigned ix; source_t *src; function_t *fn; - for (src = sources; src; src = src->next) - src->lines = XCNEWVEC (line_t, src->num_lines); + for (ix = n_sources, src = sources; ix--; src++) + if (src->num_lines) + src->lines = XCNEWVEC (line_t, src->num_lines); + for (fn = functions; fn; fn = fn->next) { coverage_t coverage; memset (&coverage, 0, sizeof (coverage)); - coverage.name = fn->name; + coverage.name = flag_demangled_names ? fn->demangled_name : fn->name; add_line_counts (flag_function_summary ? &coverage : NULL, fn); if (flag_function_summary) { @@ -579,32 +1042,45 @@ } } - for (src = sources; src; src = src->next) + if (file_name) + { + name_map_t *name_map = (name_map_t *)bsearch + (file_name, names, n_names, sizeof (*names), name_search); + if (name_map) + file_name = sources[name_map->src].coverage.name; + else + file_name = canonicalize_name (file_name); + } + + for (ix = n_sources, src = sources; ix--; src++) { + if (flag_relative_only) + { + /* Ignore this source, if it is an absolute path (after + source prefix removal). */ + char first = src->coverage.name[0]; + +#if HAVE_DOS_BASED_FILE_SYSTEM + if (first && src->coverage.name[1] == ':') + first = src->coverage.name[2]; +#endif + if (IS_DIR_SEPARATOR (first)) + continue; + } + accumulate_line_counts (src); function_summary (&src->coverage, "File"); + total_lines += src->coverage.lines; + total_executed += src->coverage.lines_executed; if (flag_gcov_file) { - char *gcov_file_name = make_gcov_file_name (file_name, src->name); - FILE *gcov_file = fopen (gcov_file_name, "w"); + output_gcov_file (file_name, src); + fnotice (stdout, "\n"); + } + } - if (gcov_file) - { - fnotice (stdout, "%s:creating '%s'\n", - src->name, gcov_file_name); - output_lines (gcov_file, src); - if (ferror (gcov_file)) - fnotice (stderr, "%s:error writing output file '%s'\n", - src->name, gcov_file_name); - fclose (gcov_file); - } - else - fnotice (stderr, "%s:could not open output file '%s'\n", - src->name, gcov_file_name); - free (gcov_file_name); - } - fnotice (stdout, "\n"); - } + if (!file_name) + executed_summary (total_lines, total_executed); } /* Release all memory used. */ @@ -612,45 +1088,30 @@ static void release_structures (void) { + unsigned ix; function_t *fn; - source_t *src; - while ((src = sources)) - { - sources = src->next; + for (ix = n_sources; ix--;) + free (sources[ix].lines); + free (sources); - free (src->name); - free (src->lines); - } + for (ix = n_names; ix--;) + free (names[ix].name); + free (names); while ((fn = functions)) { - unsigned ix; - block_t *block; - functions = fn->next; - for (ix = fn->num_blocks, block = fn->blocks; ix--; block++) - { - arc_t *arc, *arc_n; - - for (arc = block->succ; arc; arc = arc_n) - { - arc_n = arc->succ_next; - free (arc); - } - } - free (fn->blocks); - free (fn->counts); + delete fn; } } -/* Generate the names of the graph and data files. If OBJECT_DIRECTORY - is not specified, these are looked for in the current directory, - and named from the basename of the FILE_NAME sans extension. If - OBJECT_DIRECTORY is specified and is a directory, the files are in - that directory, but named from the basename of the FILE_NAME, sans - extension. Otherwise OBJECT_DIRECTORY is taken to be the name of - the object *file*, and the data files are named from that. */ +/* Generate the names of the graph and data files. If OBJECT_DIRECTORY + is not specified, these are named from FILE_NAME sans extension. If + OBJECT_DIRECTORY is specified and is a directory, the files are in that + directory, but named from the basename of the FILE_NAME, sans extension. + Otherwise OBJECT_DIRECTORY is taken to be the name of the object *file* + and the data files are named from that. */ static void create_file_names (const char *file_name) @@ -661,10 +1122,8 @@ int base; /* Free previous file names. */ - if (bbg_file_name) - free (bbg_file_name); - if (da_file_name) - free (da_file_name); + free (bbg_file_name); + free (da_file_name); da_file_name = bbg_file_name = NULL; bbg_file_time = 0; bbg_stamp = 0; @@ -679,14 +1138,14 @@ base = !stat (object_directory, &status) && S_ISDIR (status.st_mode); strcat (name, object_directory); - if (base && (! IS_DIR_SEPARATOR (name[strlen (name) - 1]))) + if (base && (!IS_DIR_SEPARATOR (name[strlen (name) - 1]))) strcat (name, "/"); } else { name = XNEWVEC (char, length + 1); - name[0] = 0; - base = 1; + strcpy (name, file_name); + base = 0; } if (base) @@ -697,7 +1156,7 @@ } /* Remove the extension. */ - cptr = strrchr (name, '.'); + cptr = strrchr (CONST_CAST (char *, lbasename (name)), '.'); if (cptr) *cptr = 0; @@ -715,77 +1174,161 @@ return; } +/* A is a string and B is a pointer to name_map_t. Compare for file + name orderability. */ + +static int +name_search (const void *a_, const void *b_) +{ + const char *a = (const char *)a_; + const name_map_t *b = (const name_map_t *)b_; + +#if HAVE_DOS_BASED_FILE_SYSTEM + return strcasecmp (a, b->name); +#else + return strcmp (a, b->name); +#endif +} + +/* A and B are a pointer to name_map_t. Compare for file name + orderability. */ + +static int +name_sort (const void *a_, const void *b_) +{ + const name_map_t *a = (const name_map_t *)a_; + return name_search (a->name, b_); +} + /* Find or create a source file structure for FILE_NAME. Copies FILE_NAME on creation */ -static source_t * +static unsigned find_source (const char *file_name) { - source_t *src; + name_map_t *name_map; + char *canon; + unsigned idx; struct stat status; if (!file_name) file_name = "<unknown>"; + name_map = (name_map_t *)bsearch + (file_name, names, n_names, sizeof (*names), name_search); + if (name_map) + { + idx = name_map->src; + goto check_date; + } - for (src = sources; src; src = src->next) - if (!strcmp (file_name, src->name)) - break; + if (n_names + 2 > a_names) + { + /* Extend the name map array -- we'll be inserting one or two + entries. */ + a_names *= 2; + name_map = XNEWVEC (name_map_t, a_names); + memcpy (name_map, names, n_names * sizeof (*names)); + free (names); + names = name_map; + } - if (!src) + /* Not found, try the canonical name. */ + canon = canonicalize_name (file_name); + name_map = (name_map_t *) bsearch (canon, names, n_names, sizeof (*names), + name_search); + if (!name_map) { - src = XCNEW (source_t); - src->name = xstrdup (file_name); + /* Not found with canonical name, create a new source. */ + source_t *src; + + if (n_sources == a_sources) + { + a_sources *= 2; + src = XNEWVEC (source_t, a_sources); + memcpy (src, sources, n_sources * sizeof (*sources)); + free (sources); + sources = src; + } + + idx = n_sources; + + name_map = &names[n_names++]; + name_map->name = canon; + name_map->src = idx; + + src = &sources[n_sources++]; + memset (src, 0, sizeof (*src)); + src->name = canon; src->coverage.name = src->name; - src->index = source_index++; - src->next = sources; - sources = src; - - if (!stat (file_name, &status)) + if (source_length +#if HAVE_DOS_BASED_FILE_SYSTEM + /* You lose if separators don't match exactly in the + prefix. */ + && !strncasecmp (source_prefix, src->coverage.name, source_length) +#else + && !strncmp (source_prefix, src->coverage.name, source_length) +#endif + && IS_DIR_SEPARATOR (src->coverage.name[source_length])) + src->coverage.name += source_length + 1; + if (!stat (src->name, &status)) src->file_time = status.st_mtime; } + else + idx = name_map->src; - if (src->file_time > bbg_file_time) + if (name_search (file_name, name_map)) + { + /* Append the non-canonical name. */ + name_map = &names[n_names++]; + name_map->name = xstrdup (file_name); + name_map->src = idx; + } + + /* Resort the name map. */ + qsort (names, n_names, sizeof (*names), name_sort); + + check_date: + if (sources[idx].file_time > bbg_file_time) { static int info_emitted; - fnotice (stderr, "%s:source file is newer than graph file '%s'\n", - src->name, bbg_file_name); + fnotice (stderr, "%s:source file is newer than notes file '%s'\n", + file_name, bbg_file_name); if (!info_emitted) { fnotice (stderr, - "(the message is only displayed one per source file)\n"); + "(the message is displayed only once per source file)\n"); info_emitted = 1; } - src->file_time = 0; + sources[idx].file_time = 0; } - return src; + return idx; } -/* Read the graph file. Return nonzero on fatal error. */ +/* Read the notes file. Return list of functions read -- in reverse order. */ -static int +static function_t * read_graph_file (void) { unsigned version; unsigned current_tag = 0; - struct function_info *fn = NULL; - function_t *old_functions_head = functions; - source_t *src = NULL; - unsigned ix; + function_t *fn = NULL; + function_t *fns = NULL; + function_t **fns_end = &fns; unsigned tag; if (!gcov_open (bbg_file_name, 1)) { - fnotice (stderr, "%s:cannot open graph file\n", bbg_file_name); - return 1; + fnotice (stderr, "%s:cannot open notes file\n", bbg_file_name); + return fns; } bbg_file_time = gcov_time (); if (!gcov_magic (gcov_read_unsigned (), GCOV_NOTE_MAGIC)) { - fnotice (stderr, "%s:not a gcov graph file\n", bbg_file_name); + fnotice (stderr, "%s:not a gcov notes file\n", bbg_file_name); gcov_close (); - return 1; + return fns; } version = gcov_read_unsigned (); @@ -809,77 +1352,67 @@ if (tag == GCOV_TAG_FUNCTION) { char *function_name; - unsigned ident, checksum, lineno; - source_t *src; - function_t *probe, *prev; + unsigned ident, lineno; + unsigned lineno_checksum, cfg_checksum; ident = gcov_read_unsigned (); - checksum = gcov_read_unsigned (); + lineno_checksum = gcov_read_unsigned (); + cfg_checksum = gcov_read_unsigned (); function_name = xstrdup (gcov_read_string ()); - src = find_source (gcov_read_string ()); + unsigned src_idx = find_source (gcov_read_string ()); lineno = gcov_read_unsigned (); - fn = XCNEW (function_t); + fn = new function_t; fn->name = function_name; + if (flag_demangled_names) + { + fn->demangled_name = cplus_demangle (fn->name, DMGL_PARAMS); + if (!fn->demangled_name) + fn->demangled_name = fn->name; + } fn->ident = ident; - fn->checksum = checksum; - fn->src = src; + fn->lineno_checksum = lineno_checksum; + fn->cfg_checksum = cfg_checksum; + fn->src = src_idx; fn->line = lineno; - fn->next = functions; - functions = fn; + fn->next_file_fn = NULL; + fn->next = NULL; + *fns_end = fn; + fns_end = &fn->next; current_tag = tag; - - if (lineno >= src->num_lines) - src->num_lines = lineno + 1; - /* Now insert it into the source file's list of - functions. Normally functions will be encountered in - ascending order, so a simple scan is quick. */ - for (probe = src->functions, prev = NULL; - probe && probe->line > lineno; - prev = probe, probe = probe->line_next) - continue; - fn->line_next = probe; - if (prev) - prev->line_next = fn; - else - src->functions = fn; } else if (fn && tag == GCOV_TAG_BLOCKS) { - if (fn->blocks) + if (!fn->blocks.empty ()) fnotice (stderr, "%s:already seen blocks for '%s'\n", bbg_file_name, fn->name); else - { - unsigned ix, num_blocks = GCOV_TAG_BLOCKS_NUM (length); - fn->num_blocks = num_blocks; - - fn->blocks = XCNEWVEC (block_t, fn->num_blocks); - for (ix = 0; ix != num_blocks; ix++) - fn->blocks[ix].flags = gcov_read_unsigned (); - } + fn->blocks.resize (gcov_read_unsigned ()); } else if (fn && tag == GCOV_TAG_ARCS) { unsigned src = gcov_read_unsigned (); + fn->blocks[src].id = src; unsigned num_dests = GCOV_TAG_ARCS_NUM (length); + block_t *src_blk = &fn->blocks[src]; + unsigned mark_catches = 0; + struct arc_info *arc; - if (src >= fn->num_blocks || fn->blocks[src].succ) + if (src >= fn->blocks.size () || fn->blocks[src].succ) goto corrupt; while (num_dests--) { - struct arc_info *arc; unsigned dest = gcov_read_unsigned (); unsigned flags = gcov_read_unsigned (); - if (dest >= fn->num_blocks) + if (dest >= fn->blocks.size ()) goto corrupt; arc = XCNEW (arc_t); arc->dst = &fn->blocks[dest]; - arc->src = &fn->blocks[src]; + arc->src = src_blk; arc->count = 0; arc->count_valid = 0; @@ -887,9 +1420,9 @@ arc->fake = !!(flags & GCOV_ARC_FAKE); arc->fall_through = !!(flags & GCOV_ARC_FALLTHROUGH); - arc->succ_next = fn->blocks[src].succ; - fn->blocks[src].succ = arc; - fn->blocks[src].num_succ++; + arc->succ_next = src_blk->succ; + src_blk->succ = arc; + src_blk->num_succ++; arc->pred_next = fn->blocks[dest].pred; fn->blocks[dest].pred = arc; @@ -903,12 +1436,12 @@ source block must be a call. */ fn->blocks[src].is_call_site = 1; arc->is_call_non_return = 1; + mark_catches = 1; } else { /* Non-local return from a callee of this - function. The destination block is a catch or - setjmp. */ + function. The destination block is a setjmp. */ arc->is_nonlocal_return = 1; fn->blocks[dest].is_nonlocal_return = 1; } @@ -917,45 +1450,45 @@ if (!arc->on_tree) fn->num_counts++; } + + if (mark_catches) + { + /* We have a fake exit from this block. The other + non-fall through exits must be to catch handlers. + Mark them as catch arcs. */ + + for (arc = src_blk->succ; arc; arc = arc->succ_next) + if (!arc->fake && !arc->fall_through) + { + arc->is_throw = 1; + fn->has_catch = 1; + } + } } else if (fn && tag == GCOV_TAG_LINES) { unsigned blockno = gcov_read_unsigned (); - unsigned *line_nos = XCNEWVEC (unsigned, length - 1); + block_t *block = &fn->blocks[blockno]; - if (blockno >= fn->num_blocks || fn->blocks[blockno].u.line.encoding) + if (blockno >= fn->blocks.size ()) goto corrupt; - for (ix = 0; ; ) + while (true) { unsigned lineno = gcov_read_unsigned (); if (lineno) - { - if (!ix) - { - line_nos[ix++] = 0; - line_nos[ix++] = src->index; - } - line_nos[ix++] = lineno; - if (lineno >= src->num_lines) - src->num_lines = lineno + 1; - } + block->locations.back ().lines.push_back (lineno); else { const char *file_name = gcov_read_string (); if (!file_name) break; - src = find_source (file_name); - - line_nos[ix++] = 0; - line_nos[ix++] = src->index; + block->locations.push_back (block_location_info + (find_source (file_name))); } } - - fn->blocks[blockno].u.line.encoding = line_nos; - fn->blocks[blockno].u.line.num = ix; } else if (current_tag && !GCOV_TAG_IS_SUBTAG (current_tag, tag)) { @@ -967,72 +1500,22 @@ { corrupt:; fnotice (stderr, "%s:corrupted\n", bbg_file_name); - gcov_close (); - return 1; + break; } } gcov_close (); - /* We built everything backwards, so nreverse them all. */ - - /* Reverse sources. Not strictly necessary, but we'll then process - them in the 'expected' order. */ - { - source_t *src, *src_p, *src_n; - - for (src_p = NULL, src = sources; src; src_p = src, src = src_n) - { - src_n = src->next; - src->next = src_p; - } - sources = src_p; - } - - /* Reverse functions. */ - { - function_t *fn, *fn_p, *fn_n; - - for (fn_p = old_functions_head, fn = functions; - fn != old_functions_head; - fn_p = fn, fn = fn_n) - { - unsigned ix; + if (!fns) + fnotice (stderr, "%s:no functions found\n", bbg_file_name); - fn_n = fn->next; - fn->next = fn_p; - - /* Reverse the arcs. */ - for (ix = fn->num_blocks; ix--;) - { - arc_t *arc, *arc_p, *arc_n; - - for (arc_p = NULL, arc = fn->blocks[ix].succ; arc; - arc_p = arc, arc = arc_n) - { - arc_n = arc->succ_next; - arc->succ_next = arc_p; - } - fn->blocks[ix].succ = arc_p; - - for (arc_p = NULL, arc = fn->blocks[ix].pred; arc; - arc_p = arc, arc = arc_n) - { - arc_n = arc->pred_next; - arc->pred_next = arc_p; - } - fn->blocks[ix].pred = arc_p; - } - } - functions = fn_p; - } - return 0; + return fns; } /* Reads profiles from the count file and attach to each function. Return nonzero if fatal error. */ static int -read_count_file (void) +read_count_file (function_t *fns) { unsigned ix; unsigned version; @@ -1068,7 +1551,7 @@ tag = gcov_read_unsigned (); if (tag != bbg_stamp) { - fnotice (stderr, "%s:stamp mismatch with graph file\n", da_file_name); + fnotice (stderr, "%s:stamp mismatch with notes file\n", da_file_name); goto cleanup; } @@ -1077,39 +1560,44 @@ unsigned length = gcov_read_unsigned (); unsigned long base = gcov_position (); - if (tag == GCOV_TAG_OBJECT_SUMMARY) - gcov_read_summary (&object_summary); - else if (tag == GCOV_TAG_PROGRAM_SUMMARY) - program_count++; - else if (tag == GCOV_TAG_FUNCTION) + if (tag == GCOV_TAG_PROGRAM_SUMMARY) { - { - unsigned ident = gcov_read_unsigned (); - struct function_info *fn_n = functions; + struct gcov_summary summary; + gcov_read_summary (&summary); + object_runs += summary.ctrs[GCOV_COUNTER_ARCS].runs; + program_count++; + } + else if (tag == GCOV_TAG_FUNCTION && !length) + ; /* placeholder */ + else if (tag == GCOV_TAG_FUNCTION && length == GCOV_TAG_FUNCTION_LENGTH) + { + unsigned ident; + struct function_info *fn_n; - /* Try to find the function in the list. - To speed up the search, first start from the last function - found. */ - for (fn = fn ? fn->next : NULL; ; fn = fn->next) - { - if (fn) - ; - else if ((fn = fn_n)) - fn_n = NULL; - else - { - fnotice (stderr, "%s:unknown function '%u'\n", - da_file_name, ident); - break; - } - if (fn->ident == ident) + /* Try to find the function in the list. To speed up the + search, first start from the last function found. */ + ident = gcov_read_unsigned (); + fn_n = fns; + for (fn = fn ? fn->next : NULL; ; fn = fn->next) + { + if (fn) + ; + else if ((fn = fn_n)) + fn_n = NULL; + else + { + fnotice (stderr, "%s:unknown function '%u'\n", + da_file_name, ident); break; - } - } + } + if (fn->ident == ident) + break; + } if (!fn) ; - else if (gcov_read_unsigned () != fn->checksum) + else if (gcov_read_unsigned () != fn->lineno_checksum + || gcov_read_unsigned () != fn->cfg_checksum) { mismatch:; fnotice (stderr, "%s:profile mismatch for '%s'\n", @@ -1131,7 +1619,10 @@ gcov_sync (base, length); if ((error = gcov_is_error ())) { - fnotice (stderr, error < 0 ? "%s:overflowed\n" : "%s:corrupted\n", + fnotice (stderr, + error < 0 + ? N_("%s:overflowed\n") + : N_("%s:corrupted\n"), da_file_name); goto cleanup; } @@ -1154,32 +1645,55 @@ block_t *valid_blocks = NULL; /* valid, but unpropagated blocks. */ block_t *invalid_blocks = NULL; /* invalid, but inferable blocks. */ - if (fn->num_blocks < 2) + /* The arcs were built in reverse order. Fix that now. */ + for (ix = fn->blocks.size (); ix--;) + { + arc_t *arc_p, *arc_n; + + for (arc_p = NULL, arc = fn->blocks[ix].succ; arc; + arc_p = arc, arc = arc_n) + { + arc_n = arc->succ_next; + arc->succ_next = arc_p; + } + fn->blocks[ix].succ = arc_p; + + for (arc_p = NULL, arc = fn->blocks[ix].pred; arc; + arc_p = arc, arc = arc_n) + { + arc_n = arc->pred_next; + arc->pred_next = arc_p; + } + fn->blocks[ix].pred = arc_p; + } + + if (fn->blocks.size () < 2) fnotice (stderr, "%s:'%s' lacks entry and/or exit blocks\n", bbg_file_name, fn->name); else { - if (fn->blocks[0].num_pred) + if (fn->blocks[ENTRY_BLOCK].num_pred) fnotice (stderr, "%s:'%s' has arcs to entry block\n", bbg_file_name, fn->name); else /* We can't deduce the entry block counts from the lack of predecessors. */ - fn->blocks[0].num_pred = ~(unsigned)0; + fn->blocks[ENTRY_BLOCK].num_pred = ~(unsigned)0; - if (fn->blocks[fn->num_blocks - 1].num_succ) + if (fn->blocks[EXIT_BLOCK].num_succ) fnotice (stderr, "%s:'%s' has arcs from exit block\n", bbg_file_name, fn->name); else /* Likewise, we can't deduce exit block counts from the lack of its successors. */ - fn->blocks[fn->num_blocks - 1].num_succ = ~(unsigned)0; + fn->blocks[EXIT_BLOCK].num_succ = ~(unsigned)0; } /* Propagate the measured counts, this must be done in the same order as the code in profile.c */ - for (ix = 0, blk = fn->blocks; ix != fn->num_blocks; ix++, blk++) + for (unsigned i = 0; i < fn->blocks.size (); i++) { + blk = &fn->blocks[i]; block_t const *prev_dst = NULL; int out_of_order = 0; int non_fake_succ = 0; @@ -1373,8 +1887,8 @@ /* If the graph has been correctly solved, every block will have a valid count. */ - for (ix = 0; ix < fn->num_blocks; ix++) - if (!fn->blocks[ix].count_valid) + for (unsigned i = 0; ix < fn->blocks.size (); i++) + if (!fn->blocks[i].count_valid) { fnotice (stderr, "%s:graph is unsolvable for '%s'\n", bbg_file_name, fn->name); @@ -1382,6 +1896,34 @@ } } +/* Mark all the blocks only reachable via an incoming catch. */ + +static void +find_exception_blocks (function_t *fn) +{ + unsigned ix; + block_t **queue = XALLOCAVEC (block_t *, fn->blocks.size ()); + + /* First mark all blocks as exceptional. */ + for (ix = fn->blocks.size (); ix--;) + fn->blocks[ix].exceptional = 1; + + /* Now mark all the blocks reachable via non-fake edges */ + queue[0] = &fn->blocks[0]; + queue[0]->exceptional = 0; + for (ix = 1; ix;) + { + block_t *block = queue[--ix]; + const arc_t *arc; + + for (arc = block->succ; arc; arc = arc->succ_next) + if (!arc->fake && !arc->is_throw && arc->dst->exceptional) + { + arc->dst->exceptional = 0; + queue[ix++] = arc->dst; + } + } +} /* Increment totals in COVERAGE according to arc ARC. */ @@ -1405,7 +1947,7 @@ } } -/* Format a HOST_WIDE_INT as either a percent ratio, or absolute +/* Format a GCOV_TYPE integer as either a percent ratio, or absolute count. If dp >= 0, format TOP/BOTTOM * 100 to DP decimal places. If DP is zero, no decimal point is printed. Only print 100% when TOP==BOTTOM and only print 0% when TOP=0. If dp < 0, then simply @@ -1416,6 +1958,13 @@ { static char buffer[20]; + /* Handle invalid values that would result in a misleading value. */ + if (bottom != 0 && top > bottom && dp >= 0) + { + sprintf (buffer, "NAN %%"); + return buffer; + } + if (dp >= 0) { float ratio = bottom ? (float)top / bottom : 0; @@ -1445,25 +1994,30 @@ } } else - sprintf (buffer, HOST_WIDEST_INT_PRINT_DEC, (HOST_WIDEST_INT)top); + sprintf (buffer, "%" PRId64, (int64_t)top); return buffer; } +/* Summary of execution */ -/* Output summary info for a function. */ +static void +executed_summary (unsigned lines, unsigned executed) +{ + if (lines) + fnotice (stdout, "Lines executed:%s of %d\n", + format_gcov (executed, lines, 2), lines); + else + fnotice (stdout, "No executable lines\n"); +} + +/* Output summary info for a function or file. */ static void function_summary (const coverage_t *coverage, const char *title) { fnotice (stdout, "%s '%s'\n", title, coverage->name); - - if (coverage->lines) - fnotice (stdout, "Lines executed:%s of %d\n", - format_gcov (coverage->lines_executed, coverage->lines, 2), - coverage->lines); - else - fnotice (stdout, "No executable lines\n"); + executed_summary (coverage->lines, coverage->lines_executed); if (flag_branches) { @@ -1489,88 +2043,207 @@ } } -/* Generate an output file name. LONG_OUTPUT_NAMES and PRESERVE_PATHS - affect name generation. With preserve_paths we create a filename - from all path components of the source file, replacing '/' with - '#', without it we simply take the basename component. With +/* Canonicalize the filename NAME by canonicalizing directory + separators, eliding . components and resolving .. components + appropriately. Always returns a unique string. */ + +static char * +canonicalize_name (const char *name) +{ + /* The canonical name cannot be longer than the incoming name. */ + char *result = XNEWVEC (char, strlen (name) + 1); + const char *base = name, *probe; + char *ptr = result; + char *dd_base; + int slash = 0; + +#if HAVE_DOS_BASED_FILE_SYSTEM + if (base[0] && base[1] == ':') + { + result[0] = base[0]; + result[1] = ':'; + base += 2; + ptr += 2; + } +#endif + for (dd_base = ptr; *base; base = probe) + { + size_t len; + + for (probe = base; *probe; probe++) + if (IS_DIR_SEPARATOR (*probe)) + break; + + len = probe - base; + if (len == 1 && base[0] == '.') + /* Elide a '.' directory */ + ; + else if (len == 2 && base[0] == '.' && base[1] == '.') + { + /* '..', we can only elide it and the previous directory, if + we're not a symlink. */ + struct stat ATTRIBUTE_UNUSED buf; + + *ptr = 0; + if (dd_base == ptr +#if defined (S_ISLNK) + /* S_ISLNK is not POSIX.1-1996. */ + || stat (result, &buf) || S_ISLNK (buf.st_mode) +#endif + ) + { + /* Cannot elide, or unreadable or a symlink. */ + dd_base = ptr + 2 + slash; + goto regular; + } + while (ptr != dd_base && *ptr != '/') + ptr--; + slash = ptr != result; + } + else + { + regular: + /* Regular pathname component. */ + if (slash) + *ptr++ = '/'; + memcpy (ptr, base, len); + ptr += len; + slash = 1; + } + + for (; IS_DIR_SEPARATOR (*probe); probe++) + continue; + } + *ptr = 0; + + return result; +} + +/* Print hex representation of 16 bytes from SUM and write it to BUFFER. */ + +static void +md5sum_to_hex (const char *sum, char *buffer) +{ + for (unsigned i = 0; i < 16; i++) + sprintf (buffer + (2 * i), "%02x", (unsigned char)sum[i]); +} + +/* Generate an output file name. INPUT_NAME is the canonicalized main + input file and SRC_NAME is the canonicalized file name. + LONG_OUTPUT_NAMES and PRESERVE_PATHS affect name generation. With long_output_names we prepend the processed name of the input file to each output name (except when the current source file is the input file, so you don't get a double concatenation). The two - components are separated by '##'. Also '.' filename components are - removed and '..' components are renamed to '^'. */ + components are separated by '##'. With preserve_paths we create a + filename from all path components of the source file, replacing '/' + with '#', and .. with '^', without it we simply take the basename + component. (Remember, the canonicalized name will already have + elided '.' components and converted \\ separators.) */ static char * make_gcov_file_name (const char *input_name, const char *src_name) { - const char *cptr; - char *name; + char *ptr; + char *result; if (flag_long_names && input_name && strcmp (src_name, input_name)) { - name = XNEWVEC (char, strlen (src_name) + strlen (input_name) + 10); - name[0] = 0; /* Generate the input filename part. */ - cptr = flag_preserve_paths ? NULL : lbasename (input_name); - strcat (name, cptr ? cptr : input_name); - strcat (name, "##"); + result = XNEWVEC (char, strlen (input_name) + strlen (src_name) + 10); + + ptr = result; + ptr = mangle_name (input_name, ptr); + ptr[0] = ptr[1] = '#'; + ptr += 2; } else { - name = XNEWVEC (char, strlen (src_name) + 10); - name[0] = 0; + result = XNEWVEC (char, strlen (src_name) + 10); + ptr = result; } + ptr = mangle_name (src_name, ptr); + strcpy (ptr, ".gcov"); + + /* When hashing filenames, we shorten them by only using the filename + component and appending a hash of the full (mangled) pathname. */ + if (flag_hash_filenames) + { + md5_ctx ctx; + char md5sum[16]; + char md5sum_hex[33]; + + md5_init_ctx (&ctx); + md5_process_bytes (src_name, strlen (src_name), &ctx); + md5_finish_ctx (&ctx, md5sum); + md5sum_to_hex (md5sum, md5sum_hex); + free (result); + + result = XNEWVEC (char, strlen (src_name) + 50); + ptr = result; + ptr = mangle_name (src_name, ptr); + ptr[0] = ptr[1] = '#'; + ptr += 2; + memcpy (ptr, md5sum_hex, 32); + ptr += 32; + strcpy (ptr, ".gcov"); + } + + return result; +} + +static char * +mangle_name (char const *base, char *ptr) +{ + size_t len; + /* Generate the source filename part. */ - - cptr = flag_preserve_paths ? NULL : lbasename (src_name); - strcat (name, cptr ? cptr : src_name); - - if (flag_preserve_paths) + if (!flag_preserve_paths) { - /* Convert '/' and '\' to '#', remove '/./', convert '/../' to '/^/', + base = lbasename (base); + len = strlen (base); + memcpy (ptr, base, len); + ptr += len; + } + else + { + /* Convert '/' to '#', convert '..' to '^', convert ':' to '~' on DOS based file system. */ - char *pnew = name, *pold = name; + const char *probe; - /* First check for leading drive separator. */ - - while (*pold != '\0') +#if HAVE_DOS_BASED_FILE_SYSTEM + if (base[0] && base[1] == ':') { - if (*pold == '/' || *pold == '\\') - { - *pnew++ = '#'; - pold++; - } -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - else if (*pold == ':') + ptr[0] = base[0]; + ptr[1] = '~'; + ptr += 2; + base += 2; + } +#endif + for (; *base; base = probe) + { + size_t len; + + for (probe = base; *probe; probe++) + if (*probe == '/') + break; + len = probe - base; + if (len == 2 && base[0] == '.' && base[1] == '.') + *ptr++ = '^'; + else { - *pnew++ = '~'; - pold++; + memcpy (ptr, base, len); + ptr += len; } -#endif - else if ((*pold == '/' && strstr (pold, "/./") == pold) - || (*pold == '\\' && strstr (pold, "\\.\\") == pold)) - pold += 3; - else if (*pold == '/' && strstr (pold, "/../") == pold) + if (*probe) { - strcpy (pnew, "/^/"); - pnew += 3; - pold += 4; + *ptr++ = '#'; + probe++; } - else if (*pold == '\\' && strstr (pold, "\\..\\") == pold) - { - strcpy (pnew, "\\^\\"); - pnew += 3; - pold += 4; - } - else - *pnew++ = *pold++; } - - *pnew = '\0'; } - strcat (name, ".gcov"); - return name; + return ptr; } /* Scan through the bb_data for each line in the block, increment @@ -1580,71 +2253,62 @@ static void add_line_counts (coverage_t *coverage, function_t *fn) { - unsigned ix; - line_t *line = NULL; /* This is propagated from one iteration to the - next. */ - + bool has_any_line = false; /* Scan each basic block. */ - for (ix = 0; ix != fn->num_blocks; ix++) + for (unsigned ix = 0; ix != fn->blocks.size (); ix++) { + line_t *line = NULL; block_t *block = &fn->blocks[ix]; - unsigned *encoding; - const source_t *src = NULL; - unsigned jx; - - if (block->count && ix && ix + 1 != fn->num_blocks) + if (block->count && ix && ix + 1 != fn->blocks.size ()) fn->blocks_executed++; - for (jx = 0, encoding = block->u.line.encoding; - jx != block->u.line.num; jx++, encoding++) - if (!*encoding) - { - unsigned src_n = *++encoding; - - for (src = sources; src->index != src_n; src = src->next) - continue; - jx++; - } - else - { - line = &src->lines[*encoding]; + for (unsigned i = 0; i < block->locations.size (); i++) + { + const source_t *src = &sources[block->locations[i].source_file_idx]; - if (coverage) - { - if (!line->exists) - coverage->lines++; - if (!line->count && block->count) - coverage->lines_executed++; - } - line->exists = 1; - line->count += block->count; - } - free (block->u.line.encoding); - block->u.cycle.arc = NULL; - block->u.cycle.ident = ~0U; + vector<unsigned> &lines = block->locations[i].lines; + for (unsigned j = 0; j < lines.size (); j++) + { + line = &src->lines[lines[j]]; + if (coverage) + { + if (!line->exists) + coverage->lines++; + if (!line->count && block->count) + coverage->lines_executed++; + } + line->exists = 1; + if (!block->exceptional) + line->unexceptional = 1; + line->count += block->count; + } + } + block->cycle.arc = NULL; + block->cycle.ident = ~0U; + has_any_line = true; - if (!ix || ix + 1 == fn->num_blocks) + if (!ix || ix + 1 == fn->blocks.size ()) /* Entry or exit block */; - else if (flag_all_blocks) - { - line_t *block_line = line ? line : &fn->src->lines[fn->line]; - - block->chain = block_line->u.blocks; - block_line->u.blocks = block; - } - else if (flag_branches) + else if (line != NULL) { - arc_t *arc; + block->chain = line->blocks; + line->blocks = block; - for (arc = block->succ; arc; arc = arc->succ_next) + if (flag_branches) { - arc->line_next = line->u.branches; - line->u.branches = arc; - if (coverage && !arc->is_unconditional) - add_branch_counts (coverage, arc); + arc_t *arc; + + for (arc = block->succ; arc; arc = arc->succ_next) + { + arc->line_next = line->branches; + line->branches = arc; + if (coverage && !arc->is_unconditional) + add_branch_counts (coverage, arc); + } } } } - if (!line) + + if (!has_any_line) fnotice (stderr, "%s:no lines for '%s'\n", bbg_file_name, fn->name); } @@ -1658,32 +2322,16 @@ unsigned ix; /* Reverse the function order. */ - for (fn = src->functions, fn_p = NULL; fn; - fn_p = fn, fn = fn_n) + for (fn = src->functions, fn_p = NULL; fn; fn_p = fn, fn = fn_n) { - fn_n = fn->line_next; - fn->line_next = fn_p; + fn_n = fn->next_file_fn; + fn->next_file_fn = fn_p; } src->functions = fn_p; for (ix = src->num_lines, line = src->lines; ix--; line++) { - if (!flag_all_blocks) - { - arc_t *arc, *arc_p, *arc_n; - - /* Total and reverse the branch information. */ - for (arc = line->u.branches, arc_p = NULL; arc; - arc_p = arc, arc = arc_n) - { - arc_n = arc->line_next; - arc->line_next = arc_p; - - add_branch_counts (&src->coverage, arc); - } - line->u.branches = arc_p; - } - else if (line->u.blocks) + if (line->blocks) { /* The user expects the line count to be the number of times a line has been executed. Simply summing the block count @@ -1695,128 +2343,37 @@ gcov_type count = 0; /* Reverse the block information. */ - for (block = line->u.blocks, block_p = NULL; block; + for (block = line->blocks, block_p = NULL; block; block_p = block, block = block_n) { block_n = block->chain; block->chain = block_p; - block->u.cycle.ident = ix; + block->cycle.ident = ix; } - line->u.blocks = block_p; + line->blocks = block_p; /* Sum the entry arcs. */ - for (block = line->u.blocks; block; block = block->chain) + for (block = line->blocks; block; block = block->chain) { arc_t *arc; for (arc = block->pred; arc; arc = arc->pred_next) - { - if (arc->src->u.cycle.ident != ix) - count += arc->count; - if (flag_branches) - add_branch_counts (&src->coverage, arc); - } + if (flag_branches) + add_branch_counts (&src->coverage, arc); + } - /* Initialize the cs_count. */ - for (arc = block->succ; arc; arc = arc->succ_next) + /* Cycle detection. */ + for (block = line->blocks; block; block = block->chain) + { + for (arc_t *arc = block->pred; arc; arc = arc->pred_next) + if (!line->has_block (arc->src)) + count += arc->count; + for (arc_t *arc = block->succ; arc; arc = arc->succ_next) arc->cs_count = arc->count; } - /* Find the loops. This uses the algorithm described in - Tiernan 'An Efficient Search Algorithm to Find the - Elementary Circuits of a Graph', CACM Dec 1970. We hold - the P array by having each block point to the arc that - connects to the previous block. The H array is implicitly - held because of the arc ordering, and the block's - previous arc pointer. - - Although the algorithm is O(N^3) for highly connected - graphs, at worst we'll have O(N^2), as most blocks have - only one or two exits. Most graphs will be small. - - For each loop we find, locate the arc with the smallest - transition count, and add that to the cumulative - count. Decrease flow over the cycle and remove the arc - from consideration. */ - for (block = line->u.blocks; block; block = block->chain) - { - block_t *head = block; - arc_t *arc; - - next_vertex:; - arc = head->succ; - current_vertex:; - while (arc) - { - block_t *dst = arc->dst; - if (/* Already used that arc. */ - arc->cycle - /* Not to same graph, or before first vertex. */ - || dst->u.cycle.ident != ix - /* Already in path. */ - || dst->u.cycle.arc) - { - arc = arc->succ_next; - continue; - } - - if (dst == block) - { - /* Found a closing arc. */ - gcov_type cycle_count = arc->cs_count; - arc_t *cycle_arc = arc; - arc_t *probe_arc; - - /* Locate the smallest arc count of the loop. */ - for (dst = head; (probe_arc = dst->u.cycle.arc); - dst = probe_arc->src) - if (cycle_count > probe_arc->cs_count) - { - cycle_count = probe_arc->cs_count; - cycle_arc = probe_arc; - } - - count += cycle_count; - cycle_arc->cycle = 1; - - /* Remove the flow from the cycle. */ - arc->cs_count -= cycle_count; - for (dst = head; (probe_arc = dst->u.cycle.arc); - dst = probe_arc->src) - probe_arc->cs_count -= cycle_count; - - /* Unwind to the cyclic arc. */ - while (head != cycle_arc->src) - { - arc = head->u.cycle.arc; - head->u.cycle.arc = NULL; - head = arc->src; - } - /* Move on. */ - arc = arc->succ_next; - continue; - } - - /* Add new block to chain. */ - dst->u.cycle.arc = arc; - head = dst; - goto next_vertex; - } - /* We could not add another vertex to the path. Remove - the last vertex from the list. */ - arc = head->u.cycle.arc; - if (arc) - { - /* It was not the first vertex. Move onto next arc. */ - head->u.cycle.arc = NULL; - head = arc->src; - arc = arc->succ_next; - goto current_vertex; - } - /* Mark this block as unusable. */ - block->u.cycle.ident = ~0U; - } - + /* Now, add the count of loops entirely on this line. */ + count += get_cycles_count (*line); line->count = count; } @@ -1835,7 +2392,6 @@ static int output_branch_count (FILE *gcov_file, int ix, const arc_t *arc) { - if (arc->is_call_non_return) { if (arc->src->count) @@ -1850,11 +2406,17 @@ else if (!arc->is_unconditional) { if (arc->src->count) - fnotice (gcov_file, "branch %2d taken %s%s\n", ix, + fnotice (gcov_file, "branch %2d taken %s%s", ix, format_gcov (arc->count, arc->src->count, -flag_counts), - arc->fall_through ? " (fallthrough)" : ""); + arc->fall_through ? " (fallthrough)" + : arc->is_throw ? " (throw)" : ""); else - fnotice (gcov_file, "branch %2d never executed\n", ix); + fnotice (gcov_file, "branch %2d never executed", ix); + + if (flag_verbose) + fnotice (gcov_file, " (BB %d)", arc->dst->id); + + fnotice (gcov_file, "\n"); } else if (flag_unconditional && !arc->dst->is_call_return) { @@ -1867,7 +2429,43 @@ else return 0; return 1; +} +static const char * +read_line (FILE *file) +{ + static char *string; + static size_t string_len; + size_t pos = 0; + char *ptr; + + if (!string_len) + { + string_len = 200; + string = XNEWVEC (char, string_len); + } + + while ((ptr = fgets (string + pos, string_len - pos, file))) + { + size_t len = strlen (string + pos); + + if (len && string[pos + len - 1] == '\n') + { + string[pos + len - 1] = 0; + return string; + } + pos += len; + /* If the file contains NUL characters or an incomplete + last line, which can happen more than once in one run, + we have to avoid doubling the STRING_LEN unnecessarily. */ + if (pos > string_len / 2) + { + string_len *= 2; + string = XRESIZEVEC (char, string, string_len); + } + } + + return pos ? string : NULL; } /* Read in the source file one line at a time, and output that line to @@ -1880,25 +2478,23 @@ FILE *source_file; unsigned line_num; /* current line number. */ const line_t *line; /* current line info ptr. */ - char string[STRING_SIZE]; /* line buffer. */ - char const *retval = ""; /* status of source file reading. */ + const char *retval = ""; /* status of source file reading. */ function_t *fn = NULL; - fprintf (gcov_file, "%9s:%5d:Source:%s\n", "-", 0, src->name); + fprintf (gcov_file, "%9s:%5d:Source:%s\n", "-", 0, src->coverage.name); if (!multiple_files) { fprintf (gcov_file, "%9s:%5d:Graph:%s\n", "-", 0, bbg_file_name); fprintf (gcov_file, "%9s:%5d:Data:%s\n", "-", 0, no_data_file ? "-" : da_file_name); - fprintf (gcov_file, "%9s:%5d:Runs:%u\n", "-", 0, - object_summary.ctrs[GCOV_COUNTER_ARCS].runs); + fprintf (gcov_file, "%9s:%5d:Runs:%u\n", "-", 0, object_runs); } fprintf (gcov_file, "%9s:%5d:Programs:%u\n", "-", 0, program_count); source_file = fopen (src->name, "r"); if (!source_file) { - fnotice (stderr, "%s:cannot open source file\n", src->name); + fnotice (stderr, "Cannot open source file %s\n", src->name); retval = NULL; } else if (src->file_time == 0) @@ -1910,49 +2506,42 @@ for (line_num = 1, line = &src->lines[line_num]; line_num < src->num_lines; line_num++, line++) { - for (; fn && fn->line == line_num; fn = fn->line_next) + for (; fn && fn->line == line_num; fn = fn->next_file_fn) { - arc_t *arc = fn->blocks[fn->num_blocks - 1].pred; - gcov_type return_count = fn->blocks[fn->num_blocks - 1].count; + arc_t *arc = fn->blocks[EXIT_BLOCK].pred; + gcov_type return_count = fn->blocks[EXIT_BLOCK].count; + gcov_type called_count = fn->blocks[ENTRY_BLOCK].count; for (; arc; arc = arc->pred_next) if (arc->fake) return_count -= arc->count; - fprintf (gcov_file, "function %s", fn->name); + fprintf (gcov_file, "function %s", flag_demangled_names ? + fn->demangled_name : fn->name); fprintf (gcov_file, " called %s", - format_gcov (fn->blocks[0].count, 0, -1)); + format_gcov (called_count, 0, -1)); fprintf (gcov_file, " returned %s", - format_gcov (return_count, fn->blocks[0].count, 0)); + format_gcov (return_count, called_count, 0)); fprintf (gcov_file, " blocks executed %s", - format_gcov (fn->blocks_executed, fn->num_blocks - 2, 0)); + format_gcov (fn->blocks_executed, fn->blocks.size () - 2, + 0)); fprintf (gcov_file, "\n"); } + if (retval) + retval = read_line (source_file); + /* For lines which don't exist in the .bb file, print '-' before the source line. For lines which exist but were never - executed, print '#####' before the source line. Otherwise, - print the execution count before the source line. There are - 16 spaces of indentation added before the source line so that - tabs won't be messed up. */ - fprintf (gcov_file, "%9s:%5u:", - !line->exists ? "-" : !line->count ? "#####" - : format_gcov (line->count, 0, -1), line_num); - - if (retval) - { - /* Copy source line. */ - do - { - retval = fgets (string, STRING_SIZE, source_file); - if (!retval) - break; - fputs (retval, gcov_file); - } - while (!retval[0] || retval[strlen (retval) - 1] != '\n'); - } - if (!retval) - fputs ("/*EOF*/\n", gcov_file); + executed, print '#####' or '=====' before the source line. + Otherwise, print the execution count before the source line. + There are 16 spaces of indentation added before the source + line so that tabs won't be messed up. */ + fprintf (gcov_file, "%9s:%5u:%s\n", + !line->exists ? "-" : line->count + ? format_gcov (line->count, 0, -1) + : line->unexceptional ? "#####" : "=====", line_num, + retval ? retval : "/*EOF*/"); if (flag_all_blocks) { @@ -1960,14 +2549,20 @@ arc_t *arc; int ix, jx; - for (ix = jx = 0, block = line->u.blocks; block; + for (ix = jx = 0, block = line->blocks; block; block = block->chain) { if (!block->is_call_return) - fprintf (gcov_file, "%9s:%5u-block %2d\n", - !line->exists ? "-" : !block->count ? "$$$$$" - : format_gcov (block->count, 0, -1), - line_num, ix++); + { + fprintf (gcov_file, "%9s:%5u-block %2d", + !line->exists ? "-" : block->count + ? format_gcov (block->count, 0, -1) + : block->exceptional ? "%%%%%" : "$$$$$", + line_num, ix++); + if (flag_verbose) + fprintf (gcov_file, " (BB %u)", block->id); + fprintf (gcov_file, "\n"); + } if (flag_branches) for (arc = block->succ; arc; arc = arc->succ_next) jx += output_branch_count (gcov_file, jx, arc); @@ -1978,7 +2573,7 @@ int ix; arc_t *arc; - for (ix = 0, arc = line->u.branches; arc; arc = arc->line_next) + for (ix = 0, arc = line->branches; arc; arc = arc->line_next) ix += output_branch_count (gcov_file, ix, arc); } } @@ -1987,18 +2582,8 @@ last line of code. */ if (retval) { - for (; (retval = fgets (string, STRING_SIZE, source_file)); line_num++) - { - fprintf (gcov_file, "%9s:%5u:%s", "-", line_num, retval); - - while (!retval[0] || retval[strlen (retval) - 1] != '\n') - { - retval = fgets (string, STRING_SIZE, source_file); - if (!retval) - break; - fputs (retval, gcov_file); - } - } + for (; (retval = read_line (source_file)); line_num++) + fprintf (gcov_file, "%9s:%5u:%s\n", "-", line_num, retval); } if (source_file)