GCC 4.2.0 release.

1 files changed, 64 insertions, 19 deletions

diff --git a/contrib/gcc/value-prof.h b/contrib/gcc/value-prof.h
index afbeb91..7695c03 100644
--- a/contrib/gcc/value-prof.h
+++ b/contrib/gcc/value-prof.h
@@ -1,5 +1,5 @@
 /* Definitions for transformations based on profile information for values.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -15,8 +15,11 @@ 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.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
+
+#ifndef GCC_VALUE_PROF_H
+#define GCC_VALUE_PROF_H
 
 /* Supported histogram types.  */
 enum hist_type
@@ -35,30 +38,72 @@ enum hist_type
   ((enum hist_type) ((COUNTER) - GCOV_FIRST_VALUE_COUNTER))
 
 /* The value to measure.  */
-struct histogram_value
+struct histogram_value_t
 {
-  rtx value;		/* The value to profile.  */
-  enum machine_mode mode; /* And its mode.  */
-  rtx seq;		/* Insns required to count the profiled value.  */
-  rtx insn;		/* Insn before that to measure.  */
-  enum hist_type type;	/* Type of information to measure.  */
-  unsigned n_counters;	/* Number of required counters.  */
+  struct
+    {
+      tree value;		/* The value to profile.  */
+      tree stmt;		/* Insn containing the value.  */
+      gcov_type *counters;		        /* Pointer to first counter.  */
+      struct histogram_value_t *next;		/* Linked list pointer.  */
+    } hvalue;
+  enum hist_type type;			/* Type of information to measure.  */
+  unsigned n_counters;			/* Number of required counters.  */
   union
     {
       struct
 	{
 	  int int_start;	/* First value in interval.  */
-	  int steps;		/* Number of values in it.  */
-	  int may_be_less;	/* May the value be below?  */
-	  int may_be_more;	/* Or above.  */
+	  unsigned int steps;	/* Number of values in it.  */
 	} intvl;	/* Interval histogram data.  */
-      struct
-	{
-	  int may_be_other;	/* If the value may be non-positive or not 2^k.  */
-	} pow2;		/* Power of 2 histogram data.  */
     } hdata;		/* Profiled information specific data.  */
 };
 
-extern void find_values_to_profile (unsigned *, struct histogram_value **);
-extern void free_profiled_values (unsigned, struct histogram_value *);
+typedef struct histogram_value_t *histogram_value;
+
+DEF_VEC_P(histogram_value);
+DEF_VEC_ALLOC_P(histogram_value,heap);
+
+typedef VEC(histogram_value,heap) *histogram_values;
+
+/* Hooks registration.  */
+extern void tree_register_value_prof_hooks (void);
+
+/* IR-independent entry points.  */
+extern void find_values_to_profile (histogram_values *);
 extern bool value_profile_transformations (void);
+
+/* External declarations for edge-based profiling.  */
+struct profile_hooks {
+
+  /* Insert code to initialize edge profiler.  */
+  void (*init_edge_profiler) (void);
+
+  /* Insert code to increment an edge count.  */
+  void (*gen_edge_profiler) (int, edge);
+
+  /* Insert code to increment the interval histogram counter.  */
+  void (*gen_interval_profiler) (histogram_value, unsigned, unsigned);
+
+  /* Insert code to increment the power of two histogram counter.  */
+  void (*gen_pow2_profiler) (histogram_value, unsigned, unsigned);
+
+  /* Insert code to find the most common value.  */
+  void (*gen_one_value_profiler) (histogram_value, unsigned, unsigned);
+
+  /* Insert code to find the most common value of a difference between two
+     evaluations of an expression.  */
+  void (*gen_const_delta_profiler) (histogram_value, unsigned, unsigned);
+};
+
+/* In profile.c.  */
+extern void init_branch_prob (void);
+extern void branch_prob (void);
+extern void end_branch_prob (void);
+extern void tree_register_profile_hooks (void);
+
+/* In tree-profile.c.  */
+extern struct profile_hooks tree_profile_hooks;
+
+#endif	/* GCC_VALUE_PROF_H */
+