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

gcc/ChangeLog

+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

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 = "";
 	  }
 

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);