rtl.h (debug_bb_n_slim, [...]): Remove prototypes.

	* rtl.h (debug_bb_n_slim, debug_bb_slim, debug_insn_slim): Remove
	prototypes.
	(debug_rtl_slim): Rename to dump_rtl_slim.
	(print_value_slim): Rename to dump_value_slim.
	* ira.c (ira_update_equiv_info_by_shuffle_insn): Update
	print_value_slim user.
	* lra.c (lra_process_new_insns): Use dump_insn_slim to dump single
	insns.  Use dump_rtl_slim for insn chains.
	* lra-constraints.c (get_reload_reg): Update print_value_slim user.
	(process_addr_reg): Likewise.
	(equiv_address_substitution): Likewise.
	(inherit_reload_reg): Likewise.  Use dump_insn_slim to dump single
	insns.
	(check_and_process_move): Likewise.
	(lra_constraints): Likewise.
	(split_reg): Likewise.
	(update_ebb_live_info): Likewise.
	(remove_inheritance_pseudos): Likewise.
	* sched-vis.c: Don't include sched-int.h.
	Remove #ifdef INSN_SCHEDULING tests.
	(print_value_slim): Rename to dump_value_slim.  Simplify a few
	cases using GET_RTX_NAME.
	(print_pattern): Do not handle UNSPEC and UNSPECV here, explain why.
	(print_insn): Reorganize code to be independent of INSN_SCHEDULING.
	Always print CALL_INSN patterns.  Harmonize INSN_UID dumping template.
	Handle NOTE_INSN_CALL_ARG_LOCATION.
	(dump_rtl_slim): Copied from debug_rtl_slim.
	(debug_rtl_slim): Wrapper around dump_rtl_slim to stderr.
	* haifa-sched.c (schedule_insn): Update print_insn user.

From-SVN: r193873

1 files changed, 16 insertions, 21 deletions

diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
index d90ac02..635bb47 100644
--- a/gcc/lra-constraints.c
+++ b/gcc/lra-constraints.c
@@ -425,7 +425,7 @@ get_reload_reg (enum op_type type, enum machine_mode mode, rtx original,
 	if (lra_dump_file != NULL)
 	  {
 	    fprintf (lra_dump_file, "	 Reuse r%d for reload ", regno);
-	    print_value_slim (lra_dump_file, original, 1);
+	    dump_value_slim (lra_dump_file, original, 1);
 	  }
 	if (new_class != lra_get_allocno_class (regno))
 	  change_class (regno, new_class, ", change", false);
@@ -994,7 +994,7 @@ check_and_process_move (bool *change_p, bool *sec_mem_p)
       if (lra_dump_file != NULL)
 	{
 	  fprintf (lra_dump_file, "Deleting move %u\n", INSN_UID (curr_insn));
-	  debug_rtl_slim (lra_dump_file, curr_insn, curr_insn, -1, 0);
+	  dump_insn_slim (lra_dump_file, curr_insn);
 	}
       lra_set_insn_deleted (curr_insn);
       return true;
@@ -1088,7 +1088,7 @@ process_addr_reg (rtx *loc, rtx *before, rtx *after, enum reg_class cl)
 	      fprintf (lra_dump_file,
 		       "Changing pseudo %d in address of insn %u on equiv ",
 		       REGNO (reg), INSN_UID (curr_insn));
-	      print_value_slim (lra_dump_file, *loc, 1);
+	      dump_value_slim (lra_dump_file, *loc, 1);
 	      fprintf (lra_dump_file, "\n");
 	    }
 	  *loc = copy_rtx (*loc);
@@ -2215,7 +2215,7 @@ equiv_address_substitution (struct address_info *ad)
     {
       fprintf (lra_dump_file, "Changing address in insn %d ",
 	       INSN_UID (curr_insn));
-      print_value_slim (lra_dump_file, *ad->outer, 1);
+      dump_value_slim (lra_dump_file, *ad->outer, 1);
     }
   if (base_reg != new_base_reg)
     {
@@ -2272,7 +2272,7 @@ equiv_address_substitution (struct address_info *ad)
       else
 	{
 	  fprintf (lra_dump_file, " on equiv ");
-	  print_value_slim (lra_dump_file, *ad->outer, 1);
+	  dump_value_slim (lra_dump_file, *ad->outer, 1);
 	  fprintf (lra_dump_file, "\n");
 	}
     }
@@ -2676,7 +2676,7 @@ curr_insn_transform (void)
 	      fprintf (lra_dump_file,
 		       "Changing pseudo %d in operand %i of insn %u on equiv ",
 		       REGNO (old), i, INSN_UID (curr_insn));
-	      print_value_slim (lra_dump_file, subst, 1);
+	      dump_value_slim (lra_dump_file, subst, 1);
 	      fprintf (lra_dump_file, "\n");
 	    }
 	  op_change_p = change_p = true;
@@ -3467,8 +3467,7 @@ lra_constraints (bool first_p)
 			       "      Removing equiv init insn %i (freq=%d)\n",
 			       INSN_UID (curr_insn),
 			       BLOCK_FOR_INSN (curr_insn)->frequency);
-		      debug_rtl_slim (lra_dump_file,
-				      curr_insn, curr_insn, -1, 0);
+		      dump_insn_slim (lra_dump_file, curr_insn);
 		    }
 		  if (contains_reg_p (x, true, false))
 		    lra_risky_transformations_p = true;
@@ -3807,7 +3806,7 @@ inherit_reload_reg (bool def_p, int original_regno,
 		   "    Rejecting inheritance %d->%d "
 		   "as it results in 2 or more insns:\n",
 		   original_regno, REGNO (new_reg));
-	  debug_rtl_slim (lra_dump_file, new_insns, NULL_RTX, -1, 0);
+	  dump_rtl_slim (lra_dump_file, new_insns, NULL_RTX, -1, 0);
 	  fprintf (lra_dump_file,
 		   "	>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
 	}
@@ -3853,8 +3852,7 @@ inherit_reload_reg (bool def_p, int original_regno,
 		   "    Inheritance reuse change %d->%d (bb%d):\n",
 		   original_regno, REGNO (new_reg),
 		   BLOCK_FOR_INSN (usage_insn)->index);
-	  debug_rtl_slim (lra_dump_file, usage_insn, usage_insn,
-			  -1, 0);
+	  dump_insn_slim (lra_dump_file, usage_insn);
 	}
     }
   if (lra_dump_file != NULL)
@@ -4058,7 +4056,7 @@ split_reg (bool before_p, int original_regno, rtx insn, rtx next_usage_insns)
 	    (lra_dump_file,
 	     "	  Rejecting split %d->%d resulting in > 2 %s save insns:\n",
 	     original_regno, REGNO (new_reg), call_save_p ? "call" : "");
-	  debug_rtl_slim (lra_dump_file, save, NULL_RTX, -1, 0);
+	  dump_rtl_slim (lra_dump_file, save, NULL_RTX, -1, 0);
 	  fprintf (lra_dump_file,
 		   "	))))))))))))))))))))))))))))))))))))))))))))))))\n");
 	}
@@ -4074,7 +4072,7 @@ split_reg (bool before_p, int original_regno, rtx insn, rtx next_usage_insns)
 		   "	Rejecting split %d->%d "
 		   "resulting in > 2 %s restore insns:\n",
 		   original_regno, REGNO (new_reg), call_save_p ? "call" : "");
-	  debug_rtl_slim (lra_dump_file, restore, NULL_RTX, -1, 0);
+	  dump_rtl_slim (lra_dump_file, restore, NULL_RTX, -1, 0);
 	  fprintf (lra_dump_file,
 		   "	))))))))))))))))))))))))))))))))))))))))))))))))\n");
 	}
@@ -4101,8 +4099,7 @@ split_reg (bool before_p, int original_regno, rtx insn, rtx next_usage_insns)
 	{
 	  fprintf (lra_dump_file, "    Split reuse change %d->%d:\n",
 		   original_regno, REGNO (new_reg));
-	  debug_rtl_slim (lra_dump_file, usage_insn, usage_insn,
-			  -1, 0);
+	  dump_insn_slim (lra_dump_file, usage_insn);
 	}
     }
   lra_assert (NOTE_P (usage_insn) || NONDEBUG_INSN_P (usage_insn));
@@ -4245,7 +4242,7 @@ update_ebb_live_info (rtx head, rtx tail)
 	  if (lra_dump_file != NULL)
 	    {
 	      fprintf (lra_dump_file, "	    Removing dead insn:\n ");
-	      debug_rtl_slim (lra_dump_file, curr_insn, curr_insn, -1, 0);
+	      dump_insn_slim (lra_dump_file, curr_insn);
 	    }
 	  lra_set_insn_deleted (curr_insn);
 	}
@@ -4861,8 +4858,7 @@ remove_inheritance_pseudos (bitmap remove_pseudos)
 			       bitmap_bit_p (&lra_split_regs, sregno)
 			       || bitmap_bit_p (&lra_split_regs, dregno)
 			       ? "split" : "inheritance");
-		      debug_rtl_slim (lra_dump_file,
-				      curr_insn, curr_insn, -1, 0);
+		      dump_insn_slim (lra_dump_file, curr_insn);
 		    }
 		  lra_set_insn_deleted (curr_insn);
 		  done_p = true;
@@ -4914,8 +4910,7 @@ remove_inheritance_pseudos (bitmap remove_pseudos)
 		      if (lra_dump_file != NULL)
 			{
 			  fprintf (lra_dump_file, "    Change reload insn:\n");
-			  debug_rtl_slim (lra_dump_file,
-					  curr_insn, curr_insn, -1, 0);
+			  dump_insn_slim (lra_dump_file, curr_insn);
 			}
 		    }
 		}
@@ -4958,7 +4953,7 @@ remove_inheritance_pseudos (bitmap remove_pseudos)
 	      if (restored_regs_p && lra_dump_file != NULL)
 		{
 		  fprintf (lra_dump_file, "   Insn after restoring regs:\n");
-		  debug_rtl_slim (lra_dump_file, curr_insn, curr_insn, -1, 0);
+		  dump_insn_slim (lra_dump_file, curr_insn);
 		}
 	    }
 	}