fix bogus email for myself

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

diff --git a/gcc/print-rtl.c b/gcc/print-rtl.c
index ff73c4a..82a3500 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.
@@ -42,6 +42,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "basic-block.h"
 #include "diagnostic.h"
 #include "cselib.h"
+#include "tree-pass.h"
 #endif
 
 static FILE *outfile;
@@ -78,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
 
@@ -235,13 +236,13 @@ print_rtx (const_rtx in_rtx)
          {
            int flags = SYMBOL_REF_FLAGS (in_rtx);
            if (flags)
-             fprintf (outfile, " [flags 0x%x]", flags);
+             fprintf (outfile, " [flags %#x]", flags);
          }
        else if (i == 2 && GET_CODE (in_rtx) == SYMBOL_REF)
          {
            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))
@@ -315,7 +316,7 @@ print_rtx (const_rtx in_rtx)
 #ifndef GENERATOR_FILE
            cselib_val *val = CSELIB_VAL_PTR (in_rtx);
 
-           fprintf (outfile, " %i", val->value);
+           fprintf (outfile, " %u:%u", val->uid, val->hash);
            dump_addr (outfile, " @", in_rtx);
            dump_addr (outfile, "/", (void*)val);
 #endif
@@ -547,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));