PR debug/43479

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

diff --git a/gcc/gcov-io.h b/gcc/gcov-io.h
index 2b49dcf..ffc62ca 100644 (file)
--- a/gcc/gcov-io.h
+++ b/gcc/gcov-io.h
@@ -1,6 +1,6 @@
 /* File format for coverage information
    Copyright (C) 1996, 1997, 1998, 2000, 2002,
 /* File format for coverage information
    Copyright (C) 1996, 1997, 1998, 2000, 2002,

-   2003, 2004 Free Software Foundation, Inc.
+   2003, 2004, 2005, 2008, 2009 Free Software Foundation, Inc.

    Contributed by Bob Manson <manson@cygnus.com>.
    Completely remangled by Nathan Sidwell <nathan@codesourcery.com>.
 
    Contributed by Bob Manson <manson@cygnus.com>.
    Completely remangled by Nathan Sidwell <nathan@codesourcery.com>.
 


@@ -8,7 +8,7 @@ This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

-Software Foundation; either version 2, or (at your option) any later
+Software Foundation; either version 3, or (at your option) any later

 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY


@@ -16,17 +16,15 @@ WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 

-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.
+
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+<http://www.gnu.org/licenses/>.  */

 
 

-/* As a special exception, if you link this library with other files,
-   some of which are compiled with GCC, to produce an executable,
-   this library does not by itself cause the resulting executable
-   to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.  */

 
 /* Coverage information is held in two files.  A notes file, which is
    generated by the compiler, and a data file, which is generated by
 
 /* Coverage information is held in two files.  A notes file, which is
    generated by the compiler, and a data file, which is generated by


@@ -63,7 +61,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
    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.
    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
    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


@@ -195,7 +193,7 @@ typedef signed gcov_type __attribute__ ((mode (QI)));
 #endif
 
 
 #endif
 
 

-#if defined (TARGET_HAS_F_SETLKW)
+#if defined (TARGET_POSIX_IO)

 #define GCOV_LOCKED 1
 #else
 #define GCOV_LOCKED 0
 #define GCOV_LOCKED 1
 #else
 #define GCOV_LOCKED 0


@@ -225,11 +223,15 @@ typedef HOST_WIDEST_INT gcov_type;
 
 #endif /* !IN_LIBGCOV */
 
 
 #endif /* !IN_LIBGCOV */
 

-/* In gcov we want function linkage to be static. In libgcov we need
-   these functions to be extern, so prefix them with __gcov.  In the
-   compiler we want it extern, so that they can be accessed from
-   elsewhere.  */
+/* In gcov we want function linkage to be static.  In the compiler we want
+   it extern, so that they can be accessed from elsewhere.  In libgcov we
+   need these functions to be extern, so prefix them with __gcov.  In
+   libgcov they must also be hidden so that the instance in the executable
+   is not also used in a DSO.  */

 #if IN_LIBGCOV
 #if IN_LIBGCOV

+
+#include "tconfig.h"
+

 #define gcov_var __gcov_var
 #define gcov_open __gcov_open
 #define gcov_close __gcov_close
 #define gcov_var __gcov_var
 #define gcov_open __gcov_open
 #define gcov_close __gcov_close


@@ -249,6 +251,16 @@ typedef HOST_WIDEST_INT gcov_type;
 #pragma GCC poison gcov_write_string gcov_write_tag gcov_write_length
 #pragma GCC poison gcov_read_string gcov_sync gcov_time gcov_magic
 
 #pragma GCC poison gcov_write_string gcov_write_tag gcov_write_length
 #pragma GCC poison gcov_read_string gcov_sync gcov_time gcov_magic
 

+#ifdef HAVE_GAS_HIDDEN
+#define ATTRIBUTE_HIDDEN  __attribute__ ((__visibility__ ("hidden")))
+#else
+#define ATTRIBUTE_HIDDEN
+#endif
+
+#else
+
+#define ATTRIBUTE_HIDDEN
+

 #endif
 
 #ifndef GCOV_LINKAGE
 #endif
 
 #ifndef GCOV_LINKAGE


@@ -313,24 +325,34 @@ typedef HOST_WIDEST_INT gcov_type;
 #define GCOV_COUNTER_V_SINGLE  3  /* The most common value of expression.  */
 #define GCOV_COUNTER_V_DELTA   4  /* The most common difference between
                                      consecutive values of expression.  */
 #define GCOV_COUNTER_V_SINGLE  3  /* The most common value of expression.  */
 #define GCOV_COUNTER_V_DELTA   4  /* The most common difference between
                                      consecutive values of expression.  */

-#define GCOV_LAST_VALUE_COUNTER 4  /* The last of counters used for value
+
+#define GCOV_COUNTER_V_INDIR   5  /* The most common indirect address */
+#define GCOV_COUNTER_AVERAGE   6  /* Compute average value passed to the
+                                     counter.  */
+#define GCOV_COUNTER_IOR       7  /* IOR of the all values passed to
+                                     counter.  */
+#define GCOV_LAST_VALUE_COUNTER 7  /* The last of counters used for value

                                      profiling.  */
                                      profiling.  */

-#define GCOV_COUNTERS          5
+#define GCOV_COUNTERS          8

 
 /* Number of counters used for value profiling.  */
 #define GCOV_N_VALUE_COUNTERS \
   (GCOV_LAST_VALUE_COUNTER - GCOV_FIRST_VALUE_COUNTER + 1)
 
 /* 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 */
   /* A list of human readable names of the counters */

-#define GCOV_COUNTER_NAMES     {"arcs", "interval", "pow2", "single", "delta"}
-  
+#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",    \
                                 "__gcov_merge_add",    \
                                 "__gcov_merge_single", \
   /* Names of merge functions for counters.  */
 #define GCOV_MERGE_FUNCTIONS   {"__gcov_merge_add",    \
                                 "__gcov_merge_add",    \
                                 "__gcov_merge_add",    \
                                 "__gcov_merge_single", \

-                                "__gcov_merge_delta"}
-  
+                                "__gcov_merge_delta",  \
+                                "__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))
 /* Convert a counter index to a tag.  */
 #define GCOV_TAG_FOR_COUNTER(COUNT)                            \
        (GCOV_TAG_COUNTER_BASE + ((gcov_unsigned_t)(COUNT) << 17))


@@ -416,7 +438,7 @@ struct gcov_info
 
   gcov_unsigned_t stamp;       /* uniquifying time stamp */
   const char *filename;                /* output file name */
 
   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 */
 
   unsigned n_functions;                /* number of functions */
   const struct gcov_fn_info *functions; /* table of functions */
 


@@ -428,35 +450,42 @@ struct gcov_info
 };
 
 /* Register a new object file module.  */
 };
 
 /* Register a new object file module.  */

-extern void __gcov_init (struct gcov_info *);
+extern void __gcov_init (struct gcov_info *) ATTRIBUTE_HIDDEN;

 
 /* Called before fork, to avoid double counting.  */
 
 /* Called before fork, to avoid double counting.  */

-extern void __gcov_flush (void);
+extern void __gcov_flush (void) ATTRIBUTE_HIDDEN;

 
 /* The merge function that just sums the counters.  */
 
 /* The merge function that just sums the counters.  */

-extern void __gcov_merge_add (gcov_type *, unsigned);
+extern void __gcov_merge_add (gcov_type *, unsigned) ATTRIBUTE_HIDDEN;

 
 /* The merge function to choose the most common value.  */
 
 /* The merge function to choose the most common value.  */

-extern void __gcov_merge_single (gcov_type *, unsigned);
+extern void __gcov_merge_single (gcov_type *, unsigned) ATTRIBUTE_HIDDEN;

 
 /* The merge function to choose the most common difference between
    consecutive values.  */
 
 /* The merge function to choose the most common difference between
    consecutive values.  */

-extern void __gcov_merge_delta (gcov_type *, unsigned);
+extern void __gcov_merge_delta (gcov_type *, unsigned) ATTRIBUTE_HIDDEN;
+
+/* The merge function that just ors the counters together.  */
+extern void __gcov_merge_ior (gcov_type *, unsigned) ATTRIBUTE_HIDDEN;

 
 /* The profiler functions.  */
 
 /* 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_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 *);
+extern void __gcov_average_profiler (gcov_type *, gcov_type);
+extern void __gcov_ior_profiler (gcov_type *, gcov_type);

 
 #ifndef inhibit_libc
 /* The wrappers around some library functions..  */
 
 #ifndef inhibit_libc
 /* The wrappers around some library functions..  */

-extern pid_t __gcov_fork (void);
-extern int __gcov_execl (const char *, const char *, ...);
-extern int __gcov_execlp (const char *, const char *, ...);
-extern int __gcov_execle (const char *,  const char *, ...);
-extern int __gcov_execv (const char *, char *const []);
-extern int __gcov_execvp (const char *, char *const []);
-extern int __gcov_execve (const char *, char  *const [], char *const []);
+extern pid_t __gcov_fork (void) ATTRIBUTE_HIDDEN;
+extern int __gcov_execl (const char *, char *, ...) ATTRIBUTE_HIDDEN;
+extern int __gcov_execlp (const char *, char *, ...) ATTRIBUTE_HIDDEN;
+extern int __gcov_execle (const char *, char *, ...) ATTRIBUTE_HIDDEN;
+extern int __gcov_execv (const char *, char *const []) ATTRIBUTE_HIDDEN;
+extern int __gcov_execvp (const char *, char *const []) ATTRIBUTE_HIDDEN;
+extern int __gcov_execve (const char *, char  *const [], char *const [])
+  ATTRIBUTE_HIDDEN;

 #endif
 
 #endif /* IN_LIBGCOV */
 #endif
 
 #endif /* IN_LIBGCOV */


@@ -488,7 +517,7 @@ GCOV_LINKAGE struct gcov_var
   size_t alloc;
   gcov_unsigned_t *buffer;
 #endif
   size_t alloc;
   gcov_unsigned_t *buffer;
 #endif

-} gcov_var;
+} gcov_var ATTRIBUTE_HIDDEN;

 
 /* Functions for reading and writing gcov files. In libgcov you can
    open the file for reading then writing. Elsewhere you can open the
 
 /* Functions for reading and writing gcov files. In libgcov you can
    open the file for reading then writing. Elsewhere you can open the


@@ -500,29 +529,31 @@ GCOV_LINKAGE struct gcov_var
    functions for writing.  Your file may become corrupted if you break
    these invariants.  */
 #if IN_LIBGCOV
    functions for writing.  Your file may become corrupted if you break
    these invariants.  */
 #if IN_LIBGCOV

-GCOV_LINKAGE int gcov_open (const char */*name*/);
+GCOV_LINKAGE int gcov_open (const char */*name*/) ATTRIBUTE_HIDDEN;

 #else
 GCOV_LINKAGE int gcov_open (const char */*name*/, int /*direction*/);
 GCOV_LINKAGE int gcov_magic (gcov_unsigned_t, gcov_unsigned_t);
 #endif
 #else
 GCOV_LINKAGE int gcov_open (const char */*name*/, int /*direction*/);
 GCOV_LINKAGE int gcov_magic (gcov_unsigned_t, gcov_unsigned_t);
 #endif

-GCOV_LINKAGE int gcov_close (void);
+GCOV_LINKAGE int gcov_close (void) ATTRIBUTE_HIDDEN;

 
 /* Available everywhere.  */
 static gcov_position_t gcov_position (void);
 static int gcov_is_error (void);
 
 
 /* Available everywhere.  */
 static gcov_position_t gcov_position (void);
 static int gcov_is_error (void);
 

-GCOV_LINKAGE gcov_unsigned_t gcov_read_unsigned (void);
-GCOV_LINKAGE gcov_type gcov_read_counter (void);
-GCOV_LINKAGE void gcov_read_summary (struct gcov_summary *);
+GCOV_LINKAGE gcov_unsigned_t gcov_read_unsigned (void) ATTRIBUTE_HIDDEN;
+GCOV_LINKAGE gcov_type gcov_read_counter (void) ATTRIBUTE_HIDDEN;
+GCOV_LINKAGE void gcov_read_summary (struct gcov_summary *) ATTRIBUTE_HIDDEN;

 
 #if IN_LIBGCOV
 /* Available only in libgcov */
 
 #if IN_LIBGCOV
 /* Available only in libgcov */

-GCOV_LINKAGE void gcov_write_counter (gcov_type);
-GCOV_LINKAGE void gcov_write_tag_length (gcov_unsigned_t, gcov_unsigned_t);
+GCOV_LINKAGE void gcov_write_counter (gcov_type) ATTRIBUTE_HIDDEN;
+GCOV_LINKAGE void gcov_write_tag_length (gcov_unsigned_t, gcov_unsigned_t)
+    ATTRIBUTE_HIDDEN;

 GCOV_LINKAGE void gcov_write_summary (gcov_unsigned_t /*tag*/,
 GCOV_LINKAGE void gcov_write_summary (gcov_unsigned_t /*tag*/,

-                                     const struct gcov_summary *);
+                                     const struct gcov_summary *)
+    ATTRIBUTE_HIDDEN;

 static void gcov_rewrite (void);
 static void gcov_rewrite (void);

-GCOV_LINKAGE void gcov_seek (gcov_position_t /*position*/);
+GCOV_LINKAGE void gcov_seek (gcov_position_t /*position*/) ATTRIBUTE_HIDDEN;

 #else
 /* Available outside libgcov */
 GCOV_LINKAGE const char *gcov_read_string (void);
 #else
 /* Available outside libgcov */
 GCOV_LINKAGE const char *gcov_read_string (void);


@@ -532,7 +563,7 @@ GCOV_LINKAGE void gcov_sync (gcov_position_t /*base*/,
 
 #if !IN_GCOV
 /* Available outside gcov */
 
 #if !IN_GCOV
 /* Available outside gcov */

-GCOV_LINKAGE void gcov_write_unsigned (gcov_unsigned_t);
+GCOV_LINKAGE void gcov_write_unsigned (gcov_unsigned_t) ATTRIBUTE_HIDDEN;

 #endif
 
 #if !IN_GCOV && !IN_LIBGCOV
 #endif
 
 #if !IN_GCOV && !IN_LIBGCOV