Fix for PR debug/43325

[pf3gnuchains/gcc-fork.git] / gcc / print-rtl.c

diff --git a/gcc/print-rtl.c b/gcc/print-rtl.c
index fa02699..b02143a 100644 (file)
--- a/gcc/print-rtl.c
+++ b/gcc/print-rtl.c
@@ -1,6 +1,6 @@
 /* Print RTL for GCC.
    Copyright (C) 1987, 1988, 1992, 1997, 1998, 1999, 2000, 2002, 2003,
-   2004, 2005, 2007, 2008, 2009
+   2004, 2005, 2007, 2008, 2009, 2010
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -41,6 +41,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "hard-reg-set.h"
 #include "basic-block.h"
 #include "diagnostic.h"
+#include "cselib.h"
+#include "tree-pass.h"
 #endif
 
 static FILE *outfile;
@@ -77,7 +79,7 @@ void
 print_mem_expr (FILE *outfile, const_tree expr)
 {
   fputc (' ', outfile);
-  print_generic_expr (outfile, CONST_CAST_TREE (expr), 0);
+  print_generic_expr (outfile, CONST_CAST_TREE (expr), dump_flags);
 }
 #endif
 
@@ -108,7 +110,8 @@ print_rtx (const_rtx in_rtx)
     }
   else if (GET_CODE (in_rtx) > NUM_RTX_CODE)
     {
-       fprintf (outfile, "(??? bad code %d\n)", GET_CODE (in_rtx));
+       fprintf (outfile, "(??? bad code %d\n%s%*s)", GET_CODE (in_rtx),
+               print_rtx_head, indent * 2, "");
        sawclose = 1;
        return;
     }
@@ -165,6 +168,23 @@ print_rtx (const_rtx in_rtx)
          /* For other rtl, print the mode if it's not VOID.  */
          else if (GET_MODE (in_rtx) != VOIDmode)
            fprintf (outfile, ":%s", GET_MODE_NAME (GET_MODE (in_rtx)));
+
+#ifndef GENERATOR_FILE
+         if (GET_CODE (in_rtx) == VAR_LOCATION)
+           {
+             if (TREE_CODE (PAT_VAR_LOCATION_DECL (in_rtx)) == STRING_CST)
+               fputs (" <debug string placeholder>", outfile);
+             else
+               print_mem_expr (outfile, PAT_VAR_LOCATION_DECL (in_rtx));
+             fputc (' ', outfile);
+             print_rtx (PAT_VAR_LOCATION_LOC (in_rtx));
+             if (PAT_VAR_LOCATION_STATUS (in_rtx)
+                 == VAR_INIT_STATUS_UNINITIALIZED)
+               fprintf (outfile, " [uninit]");
+             sawclose = 1;
+             i = GET_RTX_LENGTH (VAR_LOCATION);
+           }
+#endif
        }
     }
 
@@ -222,7 +242,7 @@ print_rtx (const_rtx in_rtx)
          {
            tree decl = SYMBOL_REF_DECL (in_rtx);
            if (decl)
-             print_node_brief (outfile, "", decl, 0);
+             print_node_brief (outfile, "", decl, dump_flags);
          }
 #endif
        else if (i == 4 && NOTE_P (in_rtx))
@@ -275,17 +295,11 @@ print_rtx (const_rtx in_rtx)
 #endif
                  break;
                }
-               
+
              case NOTE_INSN_VAR_LOCATION:
 #ifndef GENERATOR_FILE
-               fprintf (outfile, " (");
-               print_mem_expr (outfile, NOTE_VAR_LOCATION_DECL (in_rtx));
-               fprintf (outfile, " ");
-               print_rtx (NOTE_VAR_LOCATION_LOC (in_rtx));
-               if (NOTE_VAR_LOCATION_STATUS (in_rtx) == 
-                                                VAR_INIT_STATUS_UNINITIALIZED)
-                 fprintf (outfile, " [uninit]");
-               fprintf (outfile, ")");
+               fputc (' ', outfile);
+               print_rtx (NOTE_VAR_LOCATION (in_rtx));
 #endif
                break;
 
@@ -293,9 +307,27 @@ print_rtx (const_rtx in_rtx)
                break;
              }
          }
-       else if (i == 9 && JUMP_P (in_rtx) && XEXP (in_rtx, i) != NULL)
+       else if (i == 8 && JUMP_P (in_rtx) && JUMP_LABEL (in_rtx) != NULL)
          /* Output the JUMP_LABEL reference.  */
-         fprintf (outfile, "\n -> %d", INSN_UID (XEXP (in_rtx, i)));
+         fprintf (outfile, "\n%s%*s -> %d", print_rtx_head, indent * 2, "",
+                  INSN_UID (JUMP_LABEL (in_rtx)));
+       else if (i == 0 && GET_CODE (in_rtx) == VALUE)
+         {
+#ifndef GENERATOR_FILE
+           cselib_val *val = CSELIB_VAL_PTR (in_rtx);
+
+           fprintf (outfile, " %u:%u", val->uid, val->hash);
+           dump_addr (outfile, " @", in_rtx);
+           dump_addr (outfile, "/", (void*)val);
+#endif
+         }
+       else if (i == 0 && GET_CODE (in_rtx) == DEBUG_EXPR)
+         {
+#ifndef GENERATOR_FILE
+           fprintf (outfile, " D#%i",
+                    DEBUG_TEMP_UID (DEBUG_EXPR_TREE_DECL (in_rtx)));
+#endif
+         }
        break;
 
       case 'e':
@@ -356,6 +388,22 @@ print_rtx (const_rtx in_rtx)
              fprintf(outfile, " %s:%i", insn_file (in_rtx), insn_line (in_rtx));
 #endif
          }
+       else if (i == 6 && GET_CODE (in_rtx) == ASM_OPERANDS)
+         {
+#ifndef GENERATOR_FILE
+           fprintf (outfile, " %s:%i",
+                    locator_file (ASM_OPERANDS_SOURCE_LOCATION (in_rtx)),
+                    locator_line (ASM_OPERANDS_SOURCE_LOCATION (in_rtx)));
+#endif
+         }
+       else if (i == 1 && GET_CODE (in_rtx) == ASM_INPUT)
+         {
+#ifndef GENERATOR_FILE
+           fprintf (outfile, " %s:%i",
+                    locator_file (ASM_INPUT_SOURCE_LOCATION (in_rtx)),
+                    locator_line (ASM_INPUT_SOURCE_LOCATION (in_rtx)));
+#endif
+         }
        else if (i == 6 && NOTE_P (in_rtx))
          {
            /* This field is only used for NOTE_INSN_DELETED_LABEL, and
@@ -500,8 +548,11 @@ print_rtx (const_rtx in_rtx)
     {
 #ifndef GENERATOR_FILE
     case MEM:
-      fprintf (outfile, " [" HOST_WIDE_INT_PRINT_DEC,
-              (HOST_WIDE_INT) MEM_ALIAS_SET (in_rtx));
+      if (__builtin_expect (final_insns_dump_p, false))
+       fprintf (outfile, " [");
+      else
+       fprintf (outfile, " [" HOST_WIDE_INT_PRINT_DEC,
+                (HOST_WIDE_INT) MEM_ALIAS_SET (in_rtx));
 
       if (MEM_EXPR (in_rtx))
        print_mem_expr (outfile, MEM_EXPR (in_rtx));
@@ -517,6 +568,9 @@ print_rtx (const_rtx in_rtx)
       if (MEM_ALIGN (in_rtx) != 1)
        fprintf (outfile, " A%u", MEM_ALIGN (in_rtx));
 
+      if (!ADDR_SPACE_GENERIC_P (MEM_ADDR_SPACE (in_rtx)))
+       fprintf (outfile, " AS%u", MEM_ADDR_SPACE (in_rtx));
+
       fputc (']', outfile);
       break;