2011-11-04 Robert Dewar <dewar@adacore.com>

[pf3gnuchains/gcc-fork.git] / gcc / gcov-io.h

diff --git a/gcc/gcov-io.h b/gcc/gcov-io.h
index f4fe279..4f5013e 100644 (file)
--- a/gcc/gcov-io.h
+++ b/gcc/gcov-io.h
@@ -61,7 +61,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
    file. It need not be an absolute time stamp, merely a ticker that
    increments fast enough and cycles slow enough to distinguish
    different compile/run/compile cycles.
-   
+
    Although the ident and version are formally 32 bit numbers, they
    are derived from 4 character ASCII strings.  The version number
    consists of the single character major version number, a two
@@ -103,7 +103,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
        note: unit function-graph*
        unit: header int32:checksum string:source
        function-graph: announce_function basic_blocks {arcs | lines}*
-       announce_function: header int32:ident int32:checksum
+       announce_function: header int32:ident
+               int32:lineno_checksum int32:cfg_checksum
                string:name string:source int32:lineno
        basic_block: header int32:flags*
        arcs: header int32:block_no arc*
@@ -132,7 +133,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
         data: {unit function-data* summary:object summary:program*}*
        unit: header int32:checksum
         function-data: announce_function arc_counts
-       announce_function: header int32:ident int32:checksum
+       announce_function: header int32:ident
+               int32:lineno_checksum int32:cfg_checksum
        arc_counts: header int64:count*
        summary: int32:checksum {count-summary}GCOV_COUNTERS
        count-summary:  int32:num int32:runs int64:sum
@@ -294,7 +296,7 @@ typedef HOST_WIDEST_INT gcov_type;
    file marker -- it is not required to be present.  */
 
 #define GCOV_TAG_FUNCTION       ((gcov_unsigned_t)0x01000000)
-#define GCOV_TAG_FUNCTION_LENGTH (2)
+#define GCOV_TAG_FUNCTION_LENGTH (3)
 #define GCOV_TAG_BLOCKS                 ((gcov_unsigned_t)0x01410000)
 #define GCOV_TAG_BLOCKS_LENGTH(NUM) (NUM)
 #define GCOV_TAG_BLOCKS_NUM(LENGTH) (LENGTH)
@@ -338,11 +340,11 @@ typedef HOST_WIDEST_INT gcov_type;
 /* Number of counters used for value profiling.  */
 #define GCOV_N_VALUE_COUNTERS \
   (GCOV_LAST_VALUE_COUNTER - GCOV_FIRST_VALUE_COUNTER + 1)
-  
+
   /* A list of human readable names of the counters */
 #define GCOV_COUNTER_NAMES     {"arcs", "interval", "pow2", "single", \
                                 "delta","indirect_call", "average", "ior"}
-  
+
   /* Names of merge functions for counters.  */
 #define GCOV_MERGE_FUNCTIONS   {"__gcov_merge_add",    \
                                 "__gcov_merge_add",    \
@@ -352,7 +354,7 @@ typedef HOST_WIDEST_INT gcov_type;
                                 "__gcov_merge_single", \
                                 "__gcov_merge_add",    \
                                 "__gcov_merge_ior"}
-  
+
 /* Convert a counter index to a tag.  */
 #define GCOV_TAG_FOR_COUNTER(COUNT)                            \
        (GCOV_TAG_COUNTER_BASE + ((gcov_unsigned_t)(COUNT) << 17))
@@ -412,10 +414,12 @@ struct gcov_summary
    idiom. The number of counters is determined from the counter_mask
    in gcov_info.  We hold an array of function info, so have to
    explicitly calculate the correct array stride.  */
+
 struct gcov_fn_info
 {
   gcov_unsigned_t ident;       /* unique ident of function */
-  gcov_unsigned_t checksum;    /* function checksum */
+  gcov_unsigned_t lineno_checksum;     /* function lineo_checksum */
+  gcov_unsigned_t cfg_checksum;        /* function cfg checksum */
   unsigned n_ctrs[0];          /* instrumented counters */
 };
 
@@ -438,7 +442,7 @@ struct gcov_info
 
   gcov_unsigned_t stamp;       /* uniquifying time stamp */
   const char *filename;                /* output file name */
-  
+
   unsigned n_functions;                /* number of functions */
   const struct gcov_fn_info *functions; /* table of functions */
 
@@ -469,7 +473,7 @@ extern void __gcov_merge_delta (gcov_type *, unsigned) ATTRIBUTE_HIDDEN;
 extern void __gcov_merge_ior (gcov_type *, unsigned) ATTRIBUTE_HIDDEN;
 
 /* The profiler functions.  */
-extern void __gcov_interval_profiler (gcov_type *, gcov_type, int, unsigned); 
+extern void __gcov_interval_profiler (gcov_type *, gcov_type, int, unsigned);
 extern void __gcov_pow2_profiler (gcov_type *, gcov_type);
 extern void __gcov_one_value_profiler (gcov_type *, gcov_type);
 extern void __gcov_indirect_call_profiler (gcov_type *, gcov_type, void *, void *);