* Makefile.in (LIBGCOV): Add _gcov_interval_profiler,

	_gcov_pow2_profiler and _gcov_one_value_profiler.
	(tree-profile.o): Add GGC_H and gt-tree-profile.h dependency.
	(GTFILES): Add $(srcdir)/tree-profile.c.
	* gcov-io.h (__gcov_interval_profiler, __gcov_pow2_profiler,
	__gcov_one_value_profiler): Declare.
	* gimplify.c (force_gimple_operand): Check whether the statements
	should be produced in ssa form.
	(force_gimple_operand_bsi): New function.
	* libgcov.c (__gcov_interval_profiler, __gcov_pow2_profiler,
	__gcov_one_value_profiler): New functions.
	* rtl-profile.c (rtl_gen_pow2_profiler): Only measure whether
	the profiled value is a power of two or not.
	* tree-cfg.c (tree_block_ends_with_condjump_p): Handle empty blocks.
	* tree-flow.h (in_ssa_p): Declare.
	(force_gimple_operand_bsi): Declare.
	* tree-into-ssa.c (in_ssa_p): New variable.
	(rewrite_into_ssa): Set in_ssa_p.
	* tree-outof-ssa.c (rewrite_out_of_ssa): Set in_ssa_p.
	* tree-profile.c: Include ggc.h and gt-tree-profile.h.
	(gcov_type_node, tree_interval_profiler_fn, tree_pow2_profiler_fn,
	tree_one_value_profiler_fn): New variables.
	(tree_init_edge_profiler): Initialize the profiler function decls.
	(tree_gen_edge_profiler): Use global gcov_type_node.
	(prepare_instrumented_value): New function.
	(tree_gen_interval_profiler, tree_gen_interval_profiler,
	tree_gen_one_value_profiler): Call the library functions instead of
	creating instrumentation code.
	* tree.c (build_fn_decl): New function.
	* tree.h (build_fn_decl): Declare.
	* value-prof.c (rtl_divmod_values_to_profile,
	rtl_find_values_to_profile, rtl_mod_pow2_value_transform,
	tree_mod_pow2_value_transform, tree_find_values_to_profile):
	Do not handle may_be_other and precise values of exponents at pow2
	profiler.
	(tree_mod_subtract_transform): Reflect that value field of
	histogram has changed meaning.
	(tree_divmod_values_to_profile): Record the values correctly.
	(tree_values_to_profile): Update comment.
	* value-prof.h (struct histogram_value_t): Remove pow2 data.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@98555 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 96 insertions, 448 deletions

diff --git a/gcc/tree-profile.c b/gcc/tree-profile.c
index 94fbffbeef1..2c91fc3859f 100644
--- a/gcc/tree-profile.c
+++ b/gcc/tree-profile.c
@@ -44,7 +44,12 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "tree-pass.h"
 #include "timevar.h"
 #include "value-prof.h"
+#include "ggc.h"
 
+static GTY(()) tree gcov_type_node;
+static GTY(()) tree tree_interval_profiler_fn;
+static GTY(()) tree tree_pow2_profiler_fn;
+static GTY(()) tree tree_one_value_profiler_fn;
 
 
 /* Do initialization work for the edge profiler.  */
@@ -52,6 +57,43 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 static void
 tree_init_edge_profiler (void)
 {
+  tree interval_profiler_fn_type;
+  tree pow2_profiler_fn_type;
+  tree one_value_profiler_fn_type;
+  tree gcov_type_ptr;
+
+  if (!gcov_type_node)
+    {
+      gcov_type_node = get_gcov_type ();
+      gcov_type_ptr = build_pointer_type (gcov_type_node);
+
+      /* void (*) (gcov_type *, gcov_type, int, unsigned)  */
+      interval_profiler_fn_type
+	      = build_function_type_list (void_type_node,
+					  gcov_type_ptr, gcov_type_node,
+					  integer_type_node,
+					  unsigned_type_node, NULL_TREE);
+      tree_interval_profiler_fn
+	      = build_fn_decl ("__gcov_interval_profiler",
+				     interval_profiler_fn_type);
+
+      /* void (*) (gcov_type *, gcov_type)  */
+      pow2_profiler_fn_type
+	      = build_function_type_list (void_type_node,
+					  gcov_type_ptr, gcov_type_node,
+					  NULL_TREE);
+      tree_pow2_profiler_fn = build_fn_decl ("__gcov_pow2_profiler",
+						   pow2_profiler_fn_type);
+
+      /* void (*) (gcov_type *, gcov_type)  */
+      one_value_profiler_fn_type
+	      = build_function_type_list (void_type_node,
+					  gcov_type_ptr, gcov_type_node,
+					  NULL_TREE);
+      tree_one_value_profiler_fn
+	      = build_fn_decl ("__gcov_one_value_profiler",
+				     one_value_profiler_fn_type);
+    }
 }
 
 /* Output instructions as GIMPLE trees to increment the edge 
@@ -61,7 +103,6 @@ tree_init_edge_profiler (void)
 static void
 tree_gen_edge_profiler (int edgeno, edge e)
 {
-  tree gcov_type_node = get_gcov_type ();
   tree tmp1 = create_tmp_var (gcov_type_node, "PROF");
   tree tmp2 = create_tmp_var (gcov_type_node, "PROF");
   tree ref = tree_coverage_counter_ref (GCOV_COUNTER_ARCS, edgeno);
@@ -75,6 +116,18 @@ tree_gen_edge_profiler (int edgeno, edge e)
   bsi_insert_on_edge (e, stmt3);
 }
 
+/* Emits code to get VALUE to instrument at BSI, and returns the
+   variable containing the value.  */
+
+static tree
+prepare_instrumented_value (block_stmt_iterator *bsi,
+			    histogram_value value)
+{
+  tree val = value->hvalue.tree.value;
+  return force_gimple_operand_bsi (bsi, fold_convert (gcov_type_node, val),
+				   true, NULL_TREE);
+}
+
 /* Output instructions as GIMPLE trees to increment the interval histogram 
    counter.  VALUE is the expression whose value is profiled.  TAG is the 
    tag of the section for counters, BASE is offset of the counter position.  */
@@ -82,163 +135,24 @@ tree_gen_edge_profiler (int edgeno, edge e)
 static void
 tree_gen_interval_profiler (histogram_value value, unsigned tag, unsigned base)
 {
-  tree op, op1, op2, op1copy, op2copy;
-  tree tmp1, tmp2, tmp3, val, index;
-  tree label_decl2, label_decl3, label_decl4, label_decl5, label_decl6;
-  edge e12, e23, e34, e45, e56;
-  tree label2, label3, label4, label5, label6;
-  tree stmt1, stmt2, stmt3, stmt4;
-  /* Initializations are to prevent bogus uninitialized warnings. */
-  tree bb1end = NULL_TREE, bb2end = NULL_TREE, bb3end = NULL_TREE;
-  tree bb4end = NULL_TREE, bb5end = NULL_TREE;
-  tree ref = tree_coverage_counter_ref (tag, base), ref2;
-  basic_block bb2, bb3, bb4, bb5, bb6;
   tree stmt = value->hvalue.tree.stmt;
   block_stmt_iterator bsi = bsi_for_stmt (stmt);
-  basic_block bb = bb_for_stmt (stmt);
-  tree gcov_type_node = get_gcov_type ();
-  tree optype;
-
-  op = stmt;
-  if (TREE_CODE (stmt) == RETURN_EXPR
-      && TREE_OPERAND (stmt, 0)
-      && TREE_CODE (TREE_OPERAND (stmt, 0)) == MODIFY_EXPR)
-    op = TREE_OPERAND (stmt, 0);
-  /* op == MODIFY_EXPR */
-  op = TREE_OPERAND (op, 1);
-  /* op == TRUNC_DIV or TRUNC_MOD */
-  op1 = TREE_OPERAND (op, 0);
-  op2 = TREE_OPERAND (op, 1);
-  optype = TREE_TYPE (op);
-
-  /* Blocks:
-     Original = 1 
-     For 2nd compare = 2
-     Normal case, neither more nor less = 3
-     More = 4
-     Less = 5
-     End = 6  */
-  label_decl2 = create_artificial_label ();
-  label_decl3 = create_artificial_label ();
-  label_decl4 = create_artificial_label ();
-  label_decl5 = create_artificial_label ();
-  label_decl6 = create_artificial_label ();
-
-  /* Do not evaluate op1 or op2 more than once.  Probably
-     volatile loads are the only things that could cause
-     a problem, but this is harmless in any case.  */
-  op1copy = create_tmp_var (optype, "PROF");
-  op2copy = create_tmp_var (optype, "PROF");
-  stmt1 = build2 (MODIFY_EXPR, optype, op1copy, op1);
-  stmt2 = build2 (MODIFY_EXPR, optype, op2copy, op2);
-  TREE_OPERAND (op, 0) = op1copy;
-  TREE_OPERAND (op, 1) = op2copy;
-
-  val = create_tmp_var (optype, "PROF");
-  stmt3 = build2 (MODIFY_EXPR, optype, val,
-		  build2 (TRUNC_DIV_EXPR, optype, op1copy, op2copy));
-  stmt4 = build2 (MODIFY_EXPR, optype, val,
-		  build2 (MINUS_EXPR, optype, val,
-				build_int_cst (optype, value->hdata.intvl.int_start)));
-  bsi_insert_before (&bsi, stmt1, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt2, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt3, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt4, BSI_SAME_STMT);
-
-  index = create_tmp_var (gcov_type_node, "PROF");
-
-  /* Check for too big.  */
-  stmt1 = build3 (COND_EXPR, void_type_node,
-	    build2 (GE_EXPR, boolean_type_node, val,
-			build_int_cst (optype, value->hdata.intvl.steps)),
-	    build1 (GOTO_EXPR, void_type_node, label_decl4),
-	    build1 (GOTO_EXPR, void_type_node, label_decl2));
-  bsi_insert_before (&bsi, stmt1, BSI_SAME_STMT);
-  bb1end = stmt1;
-
-  /* Check for too small.  */
-  label2 = build1 (LABEL_EXPR, void_type_node, label_decl2);
-  bsi_insert_before (&bsi, label2, BSI_SAME_STMT);
-  stmt1 = build3 (COND_EXPR, void_type_node,
-	    build2 (LT_EXPR, boolean_type_node, val, integer_zero_node),
-	    build1 (GOTO_EXPR, void_type_node, label_decl5),
-	    build1 (GOTO_EXPR, void_type_node, label_decl3));
-  bsi_insert_before (&bsi, stmt1, BSI_SAME_STMT);
-  bb2end = stmt1;
-
-  /* Normal case, within range. */
-  label3 = build1 (LABEL_EXPR, void_type_node, label_decl3);
-  bsi_insert_before (&bsi, label3, BSI_SAME_STMT);
-  stmt1 = build2 (MODIFY_EXPR, gcov_type_node, index,
-		  build1 (NOP_EXPR, gcov_type_node, val));
-  bsi_insert_before (&bsi, stmt1, BSI_SAME_STMT);
-  bb3end = stmt1;
-
-  /* Too big */
-  label4 = build1 (LABEL_EXPR, void_type_node, label_decl4);
-  stmt1 = build2 (MODIFY_EXPR, gcov_type_node, index,
-		  build_int_cst (gcov_type_node, value->hdata.intvl.steps));
-  bsi_insert_before (&bsi, label4, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt1, BSI_SAME_STMT);
-  bb4end = stmt1;
-
-  /* Too small */
-  label5 = build1 (LABEL_EXPR, void_type_node, label_decl5);
-  stmt1 = build2 (MODIFY_EXPR, gcov_type_node, index,
-		  build_int_cst (gcov_type_node,
-				 value->hdata.intvl.steps + 1));
-  bsi_insert_before (&bsi, label5, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt1, BSI_SAME_STMT);
-  bb5end = stmt1;
-
-  /* Increment appropriate counter. */
-  label6 = build1 (LABEL_EXPR, void_type_node, label_decl6);
-  bsi_insert_before (&bsi, label6, BSI_SAME_STMT);
-
-  tmp1 = create_tmp_var (gcov_type_node, "PROF");
-  tmp2 = create_tmp_var (gcov_type_node, "PROF");
-  tmp3 = create_tmp_var (gcov_type_node, "PROF");
-  stmt1 = build2 (MODIFY_EXPR, gcov_type_node, tmp1,
-		  build2 (PLUS_EXPR, gcov_type_node, index,
-			  TREE_OPERAND (ref, 1)));
-  TREE_OPERAND (ref, 1) = tmp1;
-  /* Make a copy to avoid sharing complaints. */
-  ref2 = build4 (ARRAY_REF, TREE_TYPE (ref), TREE_OPERAND (ref, 0), 
-		TREE_OPERAND (ref, 1), TREE_OPERAND (ref, 2), 
-		TREE_OPERAND (ref, 3));
-
-  stmt2 = build2 (MODIFY_EXPR, gcov_type_node, tmp2, ref);
-  stmt3 = build2 (MODIFY_EXPR, gcov_type_node, tmp3,
-		  build2 (PLUS_EXPR, gcov_type_node, tmp2, integer_one_node));
-  stmt4 = build2 (MODIFY_EXPR, gcov_type_node, ref2, tmp3);
-  bsi_insert_before (&bsi, stmt1, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt2, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt3, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt4, BSI_SAME_STMT);
-
-  /* Now fix up the CFG. */
-  /* 1->2,4; 2->3,5; 3->6; 4->6; 5->6 */
-  e12 = split_block (bb, bb1end);
-  bb2 = e12->dest;
-  e23 = split_block (bb2, bb2end);
-  bb3 = e23->dest;
-  e34 = split_block (bb3, bb3end);
-  bb4 = e34->dest;
-  e45 = split_block (bb4, bb4end);
-  bb5 = e45->dest;
-  e56 = split_block (bb5, bb5end);
-  bb6 = e56->dest;
-
-  e12->flags &= ~EDGE_FALLTHRU;
-  e12->flags |= EDGE_FALSE_VALUE;
-  make_edge (bb, bb4, EDGE_TRUE_VALUE);
-  e23->flags &= ~EDGE_FALLTHRU;
-  e23->flags |= EDGE_FALSE_VALUE;
-  make_edge (bb2, bb5, EDGE_TRUE_VALUE);
-  remove_edge (e34);
-  make_edge (bb3, bb6, EDGE_FALLTHRU);
-  remove_edge (e45);
-  make_edge (bb4, bb6, EDGE_FALLTHRU);
+  tree ref = tree_coverage_counter_ref (tag, base), ref_ptr;
+  tree args, call, val;
+  tree start = build_int_cst_type (integer_type_node, value->hdata.intvl.int_start);
+  tree steps = build_int_cst_type (unsigned_type_node, value->hdata.intvl.steps);
+  
+  ref_ptr = force_gimple_operand_bsi (&bsi,
+				      build_addr (ref),
+				      true, NULL_TREE);
+  val = prepare_instrumented_value (&bsi, value);
+  args = tree_cons (NULL_TREE, ref_ptr,
+		    tree_cons (NULL_TREE, val,
+			       tree_cons (NULL_TREE, start,
+					  tree_cons (NULL_TREE, steps,
+						     NULL_TREE))));
+  call = build_function_call_expr (tree_interval_profiler_fn, args);
+  bsi_insert_before (&bsi, call, BSI_SAME_STMT);
 }
 
 /* Output instructions as GIMPLE trees to increment the power of two histogram 
@@ -248,162 +162,20 @@ tree_gen_interval_profiler (histogram_value value, unsigned tag, unsigned base)
 static void
 tree_gen_pow2_profiler (histogram_value value, unsigned tag, unsigned base)
 {
-  tree op;
-  tree tmp1, tmp2, tmp3;
-  tree index, denom;
-  tree label_decl1 = create_artificial_label ();
-  tree label_decl2 = create_artificial_label ();
-  tree label_decl3 = create_artificial_label ();
-  tree label1, label2, label3;
-  tree stmt1, stmt2, stmt3, stmt4;
-  tree bb1end, bb2end, bb3end;
-  tree ref = tree_coverage_counter_ref (tag, base), ref2;
-  basic_block bb2, bb3, bb4;
   tree stmt = value->hvalue.tree.stmt;
   block_stmt_iterator bsi = bsi_for_stmt (stmt);
-  basic_block bb = bb_for_stmt (stmt);
-  tree gcov_type_node = get_gcov_type ();
-  tree optype, optypesigned, optypeunsigned;
-
-  op = stmt;
-  if (TREE_CODE (stmt) == RETURN_EXPR
-      && TREE_OPERAND (stmt, 0)
-      && TREE_CODE (TREE_OPERAND (stmt, 0)) == MODIFY_EXPR)
-    op = TREE_OPERAND (stmt, 0);
-  /* op == MODIFY_EXPR */
-  op = TREE_OPERAND (op, 1);
-  /* op == TRUNC_DIV or TRUNC_MOD */
-  op = TREE_OPERAND (op, 1);
-  /* op == denominator */
-  optype = TREE_TYPE (op);
-  if (TYPE_UNSIGNED (optype))
-    {
-      /* Right shift must be unsigned. */
-      optypeunsigned = optype;
-      optypesigned = build_distinct_type_copy (optype);
-      TYPE_UNSIGNED (optypesigned) = false;
-    }
-  else
-    {
-      /* Compare to zero must be signed. */
-      optypesigned = optype;
-      optypeunsigned = build_distinct_type_copy (optype);
-      TYPE_UNSIGNED (optypeunsigned) = true;
-    }
-
-  /* Set up variables and check if denominator is negative when considered
-     as signed.  */
-  index = create_tmp_var (gcov_type_node, "PROF");
-  denom = create_tmp_var (optype, "PROF");
-  stmt1 = build2 (MODIFY_EXPR, gcov_type_node, index, integer_zero_node);
-  stmt2 = build2 (MODIFY_EXPR, optype, denom, op);
-  if (optypesigned == optype)
-    {
-      tmp1 = denom;
-      stmt3 = NULL_TREE;
-    }
-  else
-    {
-      tmp1 = create_tmp_var (optypesigned, "PROF");
-      stmt3 = build2 (MODIFY_EXPR, optypesigned, tmp1,
-			    build1 (NOP_EXPR, optypesigned, denom));
-    }
-  stmt4 = build3 (COND_EXPR, void_type_node,
-		build2 (LE_EXPR, boolean_type_node, tmp1, integer_zero_node),
-		build1 (GOTO_EXPR, void_type_node, label_decl3),
-		build1 (GOTO_EXPR, void_type_node, label_decl1));
-  bsi_insert_before (&bsi, stmt1, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt2, BSI_SAME_STMT);
-  if (stmt3)
-    bsi_insert_before (&bsi, stmt3, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt4, BSI_SAME_STMT);
-  bb1end = stmt4;
-
-  /* Nonnegative.  Check if denominator is power of 2. */
-  label1 = build1 (LABEL_EXPR, void_type_node, label_decl1);
-  tmp1 = create_tmp_var (optype, "PROF");
-  tmp2 = create_tmp_var (optype, "PROF");
-  stmt1 = build2 (MODIFY_EXPR, optype, tmp1,
-		    build2 (PLUS_EXPR, optype, denom, integer_minus_one_node));
-  stmt2 = build2 (MODIFY_EXPR, optype, tmp2,
-		    build2 (BIT_AND_EXPR, optype, tmp1, denom));
-  stmt3 = build3 (COND_EXPR, void_type_node, 
-		build2 (NE_EXPR, boolean_type_node, tmp2, integer_zero_node),
-		build1 (GOTO_EXPR, void_type_node, label_decl3),
-		build1 (GOTO_EXPR, void_type_node, label_decl2));
-  bsi_insert_before (&bsi, label1, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt1, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt2, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt3, BSI_SAME_STMT);
-  bb2end = stmt3;
-
-  /* Loop.  Increment index, shift denominator, repeat if denominator nonzero. */
-  label2 = build1 (LABEL_EXPR, void_type_node, label_decl2);
-  stmt1 = build2 (MODIFY_EXPR, gcov_type_node, index,
-		  build2 (PLUS_EXPR, gcov_type_node, index, integer_one_node));
-  if (optypeunsigned == optype)
-    {
-      tmp1 = denom;
-      stmt2 = NULL_TREE;
-    }
-  else
-    {
-      tmp1 = create_tmp_var (optypeunsigned, "PROF");
-      stmt2 = build2 (MODIFY_EXPR, optypeunsigned, tmp1,
-			build1 (NOP_EXPR, optypeunsigned, denom));
-    }
-  stmt3 = build2 (MODIFY_EXPR, optype, denom,
-		    build2 (RSHIFT_EXPR, optype, tmp1, integer_one_node));
-  stmt4 = build3 (COND_EXPR, void_type_node, 
-		build2 (NE_EXPR, boolean_type_node, denom, integer_zero_node),
-		build1 (GOTO_EXPR, void_type_node, label_decl2),
-		build1 (GOTO_EXPR, void_type_node, label_decl3));
-  bsi_insert_before (&bsi, label2, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt1, BSI_SAME_STMT);
-  if (stmt2)
-    bsi_insert_before (&bsi, stmt2, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt3, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt4, BSI_SAME_STMT);
-  bb3end = stmt4;
-
-  /* Increment the appropriate counter.  */
-  label3 = build1 (LABEL_EXPR, void_type_node, label_decl3);
-  tmp1 = create_tmp_var (gcov_type_node, "PROF");
-  tmp2 = create_tmp_var (gcov_type_node, "PROF");
-  tmp3 = create_tmp_var (gcov_type_node, "PROF");
-  stmt1 = build2 (MODIFY_EXPR, gcov_type_node, tmp1,
-		  build2 (PLUS_EXPR, gcov_type_node,
-			  index, TREE_OPERAND (ref, 1)));
-  TREE_OPERAND (ref, 1) = tmp1;
-  /* Make a copy to avoid sharing complaints. */
-  ref2 = build4 (ARRAY_REF, TREE_TYPE (ref), TREE_OPERAND (ref, 0), 
-		TREE_OPERAND (ref, 1), TREE_OPERAND (ref, 2), TREE_OPERAND (ref, 3));
-  stmt2 = build2 (MODIFY_EXPR, gcov_type_node, tmp2, ref);
-  stmt3 = build2 (MODIFY_EXPR, gcov_type_node, tmp3,
-		  build2 (PLUS_EXPR, gcov_type_node, tmp2, integer_one_node));
-  stmt4 = build2 (MODIFY_EXPR, gcov_type_node, ref2, tmp3);
-  bsi_insert_before (&bsi, label3, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt1, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt2, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt3, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt4, BSI_SAME_STMT);
-
-  /* Now fix up the CFG. */
-  bb2 = (split_block (bb, bb1end))->dest;
-  bb3 = (split_block (bb2, bb2end))->dest;
-  bb4 = (split_block (bb3, bb3end))->dest;
-
-  EDGE_SUCC (bb, 0)->flags &= ~EDGE_FALLTHRU;
-  EDGE_SUCC (bb, 0)->flags |= EDGE_FALSE_VALUE;
-  make_edge (bb, bb4, EDGE_TRUE_VALUE);
-
-  EDGE_SUCC (bb2, 0)->flags &= ~EDGE_FALLTHRU;
-  EDGE_SUCC (bb2, 0)->flags |= EDGE_FALSE_VALUE;
-  make_edge (bb2, bb4, EDGE_TRUE_VALUE);
-
-  EDGE_SUCC (bb3, 0)->flags &= ~EDGE_FALLTHRU;
-  EDGE_SUCC (bb3, 0)->flags |= EDGE_FALSE_VALUE;
-  make_edge (bb3, bb3, EDGE_TRUE_VALUE);
+  tree ref = tree_coverage_counter_ref (tag, base), ref_ptr;
+  tree args, call, val;
+  
+  ref_ptr = force_gimple_operand_bsi (&bsi,
+				      build_addr (ref),
+				      true, NULL_TREE);
+  val = prepare_instrumented_value (&bsi, value);
+  args = tree_cons (NULL_TREE, ref_ptr,
+		    tree_cons (NULL_TREE, val,
+			       NULL_TREE));
+  call = build_function_call_expr (tree_pow2_profiler_fn, args);
+  bsi_insert_before (&bsi, call, BSI_SAME_STMT);
 }
 
 /* Output instructions as GIMPLE trees for code to find the most common value.
@@ -413,146 +185,20 @@ tree_gen_pow2_profiler (histogram_value value, unsigned tag, unsigned base)
 static void
 tree_gen_one_value_profiler (histogram_value value, unsigned tag, unsigned base)
 {
-  tree op;
-  tree tmp1, tmp2, tmp3;
-  tree label_decl1 = create_artificial_label ();
-  tree label_decl2 = create_artificial_label ();
-  tree label_decl3 = create_artificial_label ();
-  tree label_decl4 = create_artificial_label ();
-  tree label_decl5 = create_artificial_label ();
-  tree label1, label2, label3, label4, label5;
-  tree stmt1, stmt2, stmt3, stmt4;
-  tree bb1end, bb2end, bb3end, bb4end, bb5end;
-  tree ref1 = tree_coverage_counter_ref (tag, base);
-  tree ref2 = tree_coverage_counter_ref (tag, base + 1);
-  tree ref3 = tree_coverage_counter_ref (tag, base + 2);
-  basic_block bb2, bb3, bb4, bb5, bb6;
   tree stmt = value->hvalue.tree.stmt;
   block_stmt_iterator bsi = bsi_for_stmt (stmt);
-  basic_block bb = bb_for_stmt (stmt);
-  tree gcov_type_node = get_gcov_type ();
-  tree optype;
-
-  op = stmt;
-  if (TREE_CODE (stmt) == RETURN_EXPR
-      && TREE_OPERAND (stmt, 0)
-      && TREE_CODE (TREE_OPERAND (stmt, 0)) == MODIFY_EXPR)
-    op = TREE_OPERAND (stmt, 0);
-  /* op == MODIFY_EXPR */
-  op = TREE_OPERAND (op, 1);
-  /* op == TRUNC_DIV or TRUNC_MOD */
-  op = TREE_OPERAND (op, 1);
-  /* op == denominator */
-  optype = TREE_TYPE (op);
-
-  /* Check if the stored value matches. */
-  tmp1 = create_tmp_var (gcov_type_node, "PROF");
-  tmp2 = create_tmp_var (optype, "PROF");
-  tmp3 = create_tmp_var (optype, "PROF");
-  stmt1 = build2 (MODIFY_EXPR, gcov_type_node, tmp1, ref1);
-  stmt2 = build2 (MODIFY_EXPR, optype, tmp2, 
-		    build1 (NOP_EXPR, optype, tmp1));
-  stmt3 = build2 (MODIFY_EXPR, optype, tmp3, op);
-  stmt4 = build3 (COND_EXPR, void_type_node, 
-		build2 (EQ_EXPR, boolean_type_node, tmp2, tmp3),
-		build1 (GOTO_EXPR, void_type_node, label_decl4),
-		build1 (GOTO_EXPR, void_type_node, label_decl1));
-  bsi_insert_before (&bsi, stmt1, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt2, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt3, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt4, BSI_SAME_STMT);
-  bb1end = stmt4;
-
-  /* Does not match; check whether the counter is zero. */
-  label1 = build1 (LABEL_EXPR, void_type_node, label_decl1);
-  tmp1 = create_tmp_var (gcov_type_node, "PROF");
-  stmt1 = build2 (MODIFY_EXPR, gcov_type_node, tmp1, ref2);
-  stmt2 = build3 (COND_EXPR, void_type_node, 
-		build2 (EQ_EXPR, boolean_type_node, tmp1, integer_zero_node),
-		build1 (GOTO_EXPR, void_type_node, label_decl3), 
-		build1 (GOTO_EXPR, void_type_node, label_decl2));
-  bsi_insert_before (&bsi, label1, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt1, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt2, BSI_SAME_STMT);
-  bb2end = stmt2;
-
-  /* Counter is not zero yet, decrement. */
-  label2 = build1 (LABEL_EXPR, void_type_node, label_decl2);
-  tmp1 = create_tmp_var (gcov_type_node, "PROF");
-  tmp2 = create_tmp_var (gcov_type_node, "PROF");
-  stmt1 = build2 (MODIFY_EXPR, gcov_type_node, tmp1, ref2);
-  stmt2 = build2 (MODIFY_EXPR, gcov_type_node, tmp2,
-		  build (MINUS_EXPR, gcov_type_node, tmp1, integer_one_node));
-  stmt3 = build2 (MODIFY_EXPR, gcov_type_node, ref2, tmp2);
-  bsi_insert_before (&bsi, label2, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt1, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt2, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt3, BSI_SAME_STMT);
-  bb3end = stmt3;
-
-  /* Counter was zero, store new value. */
-  label3 = build1 (LABEL_EXPR, void_type_node, label_decl3);
-  tmp1 = create_tmp_var (optype, "PROF");
-  tmp2 = create_tmp_var (gcov_type_node, "PROF");
-  stmt1 = build2 (MODIFY_EXPR, optype, tmp1, op);
-  stmt2 = build2 (MODIFY_EXPR, gcov_type_node, tmp2,
-		  build1 (NOP_EXPR, gcov_type_node, tmp1));
-  stmt3 = build2 (MODIFY_EXPR, gcov_type_node, ref1, tmp2);
-  bsi_insert_before (&bsi, label3, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt1, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt2, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt3, BSI_SAME_STMT);
-  bb4end = stmt3;
-  /* (fall through) */
-
-  /* Increment counter.  */
-  label4 = build1 (LABEL_EXPR, void_type_node, label_decl4);
-  tmp1 = create_tmp_var (gcov_type_node, "PROF");
-  tmp2 = create_tmp_var (gcov_type_node, "PROF");
-  stmt1 = build2 (MODIFY_EXPR, gcov_type_node, tmp1, ref2);
-  stmt2 = build2 (MODIFY_EXPR, gcov_type_node, tmp2,
-		  build (PLUS_EXPR, gcov_type_node, tmp1, integer_one_node));
-  stmt3 = build2 (MODIFY_EXPR, gcov_type_node, ref2, tmp2);
-  bsi_insert_before (&bsi, label4, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt1, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt2, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt3, BSI_SAME_STMT);
-  bb5end = stmt3;
-
-  /* Increment the counter of all executions; this seems redundant given
-     that we have counts for edges in cfg, but it may happen that some
-     optimization will change the counts for the block (either because
-     it is unable to update them correctly, or because it will duplicate
-     the block or its part).  */
-  label5 = build1 (LABEL_EXPR, void_type_node, label_decl5);
-  tmp1 = create_tmp_var (gcov_type_node, "PROF");
-  tmp2 = create_tmp_var (gcov_type_node, "PROF");
-  stmt1 = build2 (MODIFY_EXPR, gcov_type_node, tmp1, ref3);
-  stmt2 = build2 (MODIFY_EXPR, gcov_type_node, tmp2,
-		  build (PLUS_EXPR, gcov_type_node, tmp1, integer_one_node));
-  stmt3 = build2 (MODIFY_EXPR, gcov_type_node, ref3, tmp2);
-  bsi_insert_before (&bsi, label5, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt1, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt2, BSI_SAME_STMT);
-  bsi_insert_before (&bsi, stmt3, BSI_SAME_STMT);
-
-  /* Now fix up the CFG. */
-  bb2 = (split_block (bb, bb1end))->dest;
-  bb3 = (split_block (bb2, bb2end))->dest;
-  bb4 = (split_block (bb3, bb3end))->dest;
-  bb5 = (split_block (bb4, bb4end))->dest;
-  bb6 = (split_block (bb5, bb5end))->dest;
-
-  EDGE_SUCC (bb, 0)->flags &= ~EDGE_FALLTHRU;
-  EDGE_SUCC (bb, 0)->flags |= EDGE_FALSE_VALUE;
-  make_edge (bb, bb5, EDGE_TRUE_VALUE);
-
-  EDGE_SUCC (bb2, 0)->flags &= ~EDGE_FALLTHRU;
-  EDGE_SUCC (bb2, 0)->flags |= EDGE_FALSE_VALUE;
-  make_edge (bb2, bb4, EDGE_TRUE_VALUE);
-
-  remove_edge (EDGE_SUCC (bb3, 0));
-  make_edge (bb3, bb6, EDGE_FALLTHRU);
+  tree ref = tree_coverage_counter_ref (tag, base), ref_ptr;
+  tree args, call, val;
+  
+  ref_ptr = force_gimple_operand_bsi (&bsi,
+				      build_addr (ref),
+				      true, NULL_TREE);
+  val = prepare_instrumented_value (&bsi, value);
+  args = tree_cons (NULL_TREE, ref_ptr,
+		    tree_cons (NULL_TREE, val,
+			       NULL_TREE));
+  call = build_function_call_expr (tree_one_value_profiler_fn, args);
+  bsi_insert_before (&bsi, call, BSI_SAME_STMT);
 }
 
 /* Output instructions as GIMPLE trees for code to find the most common value 
@@ -637,3 +283,5 @@ struct profile_hooks tree_profile_hooks =
   tree_gen_const_delta_profiler,/* gen_const_delta_profiler */
   tree_profile_dump_file	/* profile_dump_file */
 };
+
+#include "gt-tree-profile.h"