sched-vis.c (dump_insn_slim): Print print_rtx_head at the start of each new line.

	* sched-vis.c (dump_insn_slim): Print print_rtx_head at the
	start of each new line.
	* final.c (final_scan_insn): If the final dump is requested as
	slim RTL, dump slim RTL to the assembly file also.

From-SVN: r190006

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e923388a811476f0ad006406109ce92682dd4942..879137aa802a209b427db3c8af5e1bfded446a5d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2012-07-31  Steven Bosscher  <steven@gcc.gnu.org>
+
+       * sched-vis.c (dump_insn_slim): Print print_rtx_head at the
+       start of each new line.
+       * final.c (final_scan_insn): If the final dump is requested as
+       slim RTL, dump slim RTL to the assembly file also.
+
 2012-07-31  Andrey Belevantsev  <abel@ispras.ru>
 
        PR target/53975

diff --git a/gcc/final.c b/gcc/final.c
index 095d608cdc3987c641c5e2a4227b27dbbb7d1b2f..cdae01173886cd3126e164d7eb17ecc122474270 100644 (file)
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -2747,11 +2747,16 @@ final_scan_insn (rtx insn, FILE *file, int optimize_p ATTRIBUTE_UNUSED,
        insn_code_number = recog_memoized (insn);
        cleanup_subreg_operands (insn);
 
-       /* Dump the insn in the assembly for debugging.  */
+       /* Dump the insn in the assembly for debugging (-dAP).
+          If the final dump is requested as slim RTL, dump slim
+          RTL to the assembly file also.  */
        if (flag_dump_rtl_in_asm)
          {
            print_rtx_head = ASM_COMMENT_START;
-           print_rtl_single (asm_out_file, insn);
+           if (! (dump_flags & TDF_SLIM))
+             print_rtl_single (asm_out_file, insn);
+           else
+             dump_insn_slim (asm_out_file, insn);
            print_rtx_head = "";
          }
 

diff --git a/gcc/sched-vis.c b/gcc/sched-vis.c
index d5a8747169a4526319c3e8d3d5ec7fc5703955eb..7a07b3f95f93a3387c715c98f07e322df6261932 100644 (file)
--- a/gcc/sched-vis.c
+++ b/gcc/sched-vis.c
@@ -767,11 +767,13 @@ dump_insn_slim (FILE *f, const_rtx x)
   rtx note;
 
   print_insn (t, x, 1);
+  fputs (print_rtx_head, f);
   fputs (t, f);
   putc ('\n', f);
   if (INSN_P (x) && REG_NOTES (x))
     for (note = REG_NOTES (x); note; note = XEXP (note, 1))
       {
+       fputs (print_rtx_head, f);
         print_value (t, XEXP (note, 0), 1);
        fprintf (f, "      %s: %s\n",
                 GET_REG_NOTE_NAME (REG_NOTE_KIND (note)), t);