CbC/CbC_gcc: gcc/sel-sched-dump.c comparison

comparison gcc/sel-sched-dump.c @ 67:f6334be47118

update gcc from gcc-4.6-20100522 to gcc-4.6-20110318

author	nobuyasu <dimolto@cr.ie.u-ryukyu.ac.jp>
date	Tue, 22 Mar 2011 17:18:12 +0900
parents	b7f97abdc517
children	04ced10e8804

comparison

equal deleted inserted replaced

-:65488c3d617d
+:f6334be47118
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "toplev.h"
+#include "diagnostic-core.h"
 #include "rtl.h"
 #include "tm_p.h"
 #include "hard-reg-set.h"
 #include "regs.h"
 #include "function.h"
 dump_insn_rtx_1 (insn, dump_insn_rtx_flags);
 }
 /* Dump INSN to stderr.  */
-void
+DEBUG_FUNCTION void
 debug_insn_rtx (rtx insn)
 {
 switch_dump (stderr);
 dump_insn_rtx_1 (insn, debug_insn_rtx_flags);
 sel_print ("\n");
 {
 dump_vinsn_1 (vi, dump_vinsn_flags);
 }
 /* Dump vinsn VI to stderr.  */
-void
+DEBUG_FUNCTION void
 debug_vinsn (vinsn_t vi)
 {
 switch_dump (stderr);
 dump_vinsn_1 (vi, debug_vinsn_flags);
 sel_print ("\n");
 {
 dump_expr_1 (expr, dump_expr_flags);
 }
 /* Dump expression EXPR to stderr.  */
-void
+DEBUG_FUNCTION void
 debug_expr (expr_t expr)
 {
 switch_dump (stderr);
 dump_expr_1 (expr, debug_expr_flags);
 sel_print ("\n");
 {
 dump_insn_1 (i, DUMP_INSN_EXPR | DUMP_INSN_SCHED_CYCLE);
 }
 /* Dump INSN to stderr.  */
-void
+DEBUG_FUNCTION void
 debug_insn (insn_t insn)
 {
 switch_dump (stderr);
 dump_insn_1 (insn, debug_insn_flags);
 sel_print ("\n");
 dump_insn_vector (rtx_vec_t succs)
 {
 int i;
 rtx succ;
-for (i = 0; VEC_iterate (rtx, succs, i, succ); i++)
+FOR_EACH_VEC_ELT (rtx, succs, i, succ)
 if (succ)
 dump_insn (succ);
 else
 sel_print ("NULL ");
 }
 }
 while (p);
 }
 /* Replace characters in BUF that have special meaning in .dot file.  */
-void
+static void
 sel_prepare_string_for_dot_label (char *buf)
 {
 static char specials_from[7][2] = { "<", ">", "{", "|", "}", "\"",
 "\n" };
 static char specials_to[7][3] = { "\\<", "\\>", "\\{", "\\|", "\\}",
 "\\\"", "\\l" };
 unsigned i;
 for (i = 0; i < 7; i++)
 replace_str_in_buf (buf, specials_from[i], specials_to[i]);
+}
+/* This function acts like printf but dumps to the sched_dump file.  */
+void
+sel_print (const char *fmt, ...)
+{
+va_list ap;
+va_start (ap, fmt);
+if (sched_dump_to_dot_p)
+{
+char *message;
+if (vasprintf (&message, fmt, ap) >= 0 && message != NULL)
+	{
+	  message = (char *) xrealloc (message, 2 * strlen (message) + 1);
+	  sel_prepare_string_for_dot_label (message);
+	  fprintf (sched_dump, "%s", message);
+	  free (message);
+	}
+}
+else
+vfprintf (sched_dump, fmt, ap);
+va_end (ap);
 }
 /* Dump INSN with FLAGS.  */
 static void
 sel_dump_cfg_insn (insn_t insn, int flags)
 sel_dump_cfg_fileno = t2;
 sel_dump_cfg_p = t1;
 }
 /* Dumps av_set AV to stderr.  */
-void
+DEBUG_FUNCTION void
 debug_av_set (av_set_t av)
 {
 switch_dump (stderr);
 dump_av_set (av);
 sel_print ("\n");
 restore_dump ();
 }
 /* Dump LV to stderr.  */
-void
+DEBUG_FUNCTION void
 debug_lv_set (regset lv)
 {
 switch_dump (stderr);
 dump_lv_set (lv);
 sel_print ("\n");
 restore_dump ();
 }
 /* Dump an instruction list P to stderr.  */
-void
+DEBUG_FUNCTION void
 debug_ilist (ilist_t p)
 {
 switch_dump (stderr);
 dump_ilist (p);
 sel_print ("\n");
 restore_dump ();
 }
 /* Dump a boundary list BNDS to stderr.  */
-void
+DEBUG_FUNCTION void
 debug_blist (blist_t bnds)
 {
 switch_dump (stderr);
 dump_blist (bnds);
 sel_print ("\n");
 restore_dump ();
 }
 /* Dump an insn vector SUCCS.  */
-void
+DEBUG_FUNCTION void
 debug_insn_vector (rtx_vec_t succs)
 {
 switch_dump (stderr);
 dump_insn_vector (succs);
 sel_print ("\n");
 restore_dump ();
 }
 /* Dump a hard reg set SET to stderr.  */
-void
+DEBUG_FUNCTION void
 debug_hard_reg_set (HARD_REG_SET set)
 {
 switch_dump (stderr);
 dump_hard_reg_set ("", set);
 sel_print ("\n");
 {
 sel_debug_cfg_1 (sel_debug_cfg_flags);
 }
 /* Print a current cselib value for X's address to stderr.  */
-rtx
+DEBUG_FUNCTION rtx
 debug_mem_addr_value (rtx x)
 {
 rtx t, addr;
 enum machine_mode address_mode;
 gcc_assert (MEM_P (x));
 address_mode = targetm.addr_space.address_mode (MEM_ADDR_SPACE (x));
 t = shallow_copy_rtx (x);
-if (cselib_lookup (XEXP (t, 0), address_mode, 0))
+if (cselib_lookup (XEXP (t, 0), address_mode, 0, GET_MODE (t)))
-XEXP (t, 0) = cselib_subst_to_values (XEXP (t, 0));
+XEXP (t, 0) = cselib_subst_to_values (XEXP (t, 0), GET_MODE (t));
 t = canon_rtx (t);
 addr = get_addr (XEXP (t, 0));
 debug_rtx (t);
 debug_rtx (addr);

Mercurial > hg > CbC > CbC_gcc

comparison gcc/sel-sched-dump.c @ 67:f6334be47118