PR middle-end/43300

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

diff --git a/gcc/print-rtl.c b/gcc/print-rtl.c
index 88de967..52709da 100644 (file)
--- a/gcc/print-rtl.c
+++ b/gcc/print-rtl.c
@@ -1,12 +1,13 @@
-/* Print RTL for GNU C Compiler.
-   Copyright (C) 1987, 1988, 1992, 1997, 1998, 1999, 2000
+/* Print RTL for GCC.
+   Copyright (C) 1987, 1988, 1992, 1997, 1998, 1999, 2000, 2002, 2003,
+   2004, 2005, 2007, 2008, 2009

    Free Software Foundation, Inc.
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
    Free Software Foundation, Inc.
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

-Software Foundation; either version 2, or (at your option) any later
+Software Foundation; either version 3, or (at your option) any later

 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY


@@ -15,39 +16,33 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
-
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */

 
 

+/* This file is compiled twice: once for the generator programs,
+   once for the compiler.  */
+#ifdef GENERATOR_FILE
+#include "bconfig.h"
+#else

 #include "config.h"
 #include "config.h"

+#endif
+

 #include "system.h"
 #include "system.h"

+#include "coretypes.h"
+#include "tm.h"

 #include "rtl.h"
 
 #include "rtl.h"
 

-/* We don't want the tree code checking code for the access to the
-   DECL_NAME to be included in the gen* programs.  */
-#undef ENABLE_TREE_CHECKING
+/* These headers all define things which are not available in
+   generator programs.  */
+#ifndef GENERATOR_FILE

 #include "tree.h"
 #include "real.h"
 #include "flags.h"
 #include "hard-reg-set.h"
 #include "basic-block.h"
 #include "tree.h"
 #include "real.h"
 #include "flags.h"
 #include "hard-reg-set.h"
 #include "basic-block.h"

-
-/* How to print out a register name.
-   We don't use PRINT_REG because some definitions of PRINT_REG
-   don't work here.  */
-#ifndef DEBUG_PRINT_REG
-#define DEBUG_PRINT_REG(RTX, CODE, FILE) \
-  fprintf ((FILE), "%d %s", REGNO (RTX), reg_names[REGNO (RTX)])
-#endif
-
-/* Array containing all of the register names */
-
-#ifdef DEBUG_REGISTER_NAMES
-static const char * const debug_reg_names[] = DEBUG_REGISTER_NAMES;
-#define reg_names debug_reg_names
-#else
-const char * reg_names[] = REGISTER_NAMES;
+#include "diagnostic.h"
+#include "cselib.h"
+#include "tree-pass.h"

 #endif
 
 static FILE *outfile;
 #endif
 
 static FILE *outfile;


@@ -56,61 +51,47 @@ static int sawclose = 0;
 
 static int indent;
 
 
 static int indent;
 

-static void print_rtx          PARAMS ((rtx));
+static void print_rtx (const_rtx);

 
 /* String printed at beginning of each RTL when it is dumped.
    This string is set to ASM_COMMENT_START when the RTL is dumped in
    the assembly output file.  */
 const char *print_rtx_head = "";
 
 
 /* String printed at beginning of each RTL when it is dumped.
    This string is set to ASM_COMMENT_START when the RTL is dumped in
    the assembly output file.  */
 const char *print_rtx_head = "";
 

-/* Nonzero means suppress output of instruction numbers and line number
-   notes in debugging dumps.
+/* Nonzero means suppress output of instruction numbers
+   in debugging dumps.

    This must be defined here so that programs like gencodes can be linked.  */
 int flag_dump_unnumbered = 0;
 
    This must be defined here so that programs like gencodes can be linked.  */
 int flag_dump_unnumbered = 0;
 

+/* Nonzero means suppress output of instruction numbers for previous
+   and next insns in debugging dumps.
+   This must be defined here so that programs like gencodes can be linked.  */
+int flag_dump_unnumbered_links = 0;
+

 /* Nonzero means use simplified format without flags, modes, etc.  */
 int flag_simple = 0;
 
 /* Nonzero if we are dumping graphical description.  */
 int dump_for_graph;
 
 /* Nonzero means use simplified format without flags, modes, etc.  */
 int flag_simple = 0;
 
 /* Nonzero if we are dumping graphical description.  */
 int dump_for_graph;
 

-/* Nonzero to dump all call_placeholder alternatives.  */
-static int debug_call_placeholder_verbose;
-
+#ifndef GENERATOR_FILE

 void
 void

-print_mem_expr (outfile, expr)
-     FILE *outfile;
-     tree expr;
+print_mem_expr (FILE *outfile, const_tree expr)

 {
 {

-  if (TREE_CODE (expr) == COMPONENT_REF)
-    {
-      if (TREE_OPERAND (expr, 0))
-       print_mem_expr (outfile, TREE_OPERAND (expr, 0));
-      else
-       fputs (" <variable>", outfile);
-      if (DECL_NAME (TREE_OPERAND (expr, 1)))
-       fprintf (outfile, ".%s",
-                IDENTIFIER_POINTER (DECL_NAME (TREE_OPERAND (expr, 1))));
-    }
-  else if (DECL_NAME (expr))
-    fprintf (outfile, " %s", IDENTIFIER_POINTER (DECL_NAME (expr)));
-  else if (TREE_CODE (expr) == RESULT_DECL)
-    fputs (" <result>", outfile);
-  else
-    fputs (" <anonymous>", outfile);
+  fputc (' ', outfile);
+  print_generic_expr (outfile, CONST_CAST_TREE (expr), dump_flags);

 }
 }

+#endif

 
 /* Print IN_RTX onto OUTFILE.  This is the recursive part of printing.  */
 
 static void
 
 /* Print IN_RTX onto OUTFILE.  This is the recursive part of printing.  */
 
 static void

-print_rtx (in_rtx)
-     rtx in_rtx;
+print_rtx (const_rtx in_rtx)

 {
   int i = 0;
   int j;
   const char *format_ptr;
   int is_insn;
 {
   int i = 0;
   int j;
   const char *format_ptr;
   int is_insn;

-  rtx tem;

 
   if (sawclose)
     {
 
   if (sawclose)
     {


@@ -129,7 +110,8 @@ print_rtx (in_rtx)
     }
   else if (GET_CODE (in_rtx) > NUM_RTX_CODE)
     {
     }
   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;
     }
        sawclose = 1;
        return;
     }


@@ -139,8 +121,8 @@ print_rtx (in_rtx)
   /* When printing in VCG format we write INSNs, NOTE, LABEL, and BARRIER
      in separate nodes and therefore have to handle them special here.  */
   if (dump_for_graph
   /* When printing in VCG format we write INSNs, NOTE, LABEL, and BARRIER
      in separate nodes and therefore have to handle them special here.  */
   if (dump_for_graph

-      && (is_insn || GET_CODE (in_rtx) == NOTE
-         || GET_CODE (in_rtx) == CODE_LABEL || GET_CODE (in_rtx) == BARRIER))
+      && (is_insn || NOTE_P (in_rtx)
+         || LABEL_P (in_rtx) || BARRIER_P (in_rtx)))

     {
       i = 3;
       indent = 0;
     {
       i = 3;
       indent = 0;


@@ -148,7 +130,7 @@ print_rtx (in_rtx)
   else
     {
       /* Print name of expression code.  */
   else
     {
       /* Print name of expression code.  */

-      if (flag_simple && GET_CODE (in_rtx) == CONST_INT)
+      if (flag_simple && CONST_INT_P (in_rtx))

        fputc ('(', outfile);
       else
        fprintf (outfile, "(%s", GET_RTX_NAME (GET_CODE (in_rtx)));
        fputc ('(', outfile);
       else
        fprintf (outfile, "(%s", GET_RTX_NAME (GET_CODE (in_rtx)));


@@ -164,9 +146,6 @@ print_rtx (in_rtx)
          if (RTX_FLAG (in_rtx, unchanging))
            fputs ("/u", outfile);
 
          if (RTX_FLAG (in_rtx, unchanging))
            fputs ("/u", outfile);
 

-         if (RTX_FLAG (in_rtx, integrated))
-           fputs ("/i", outfile);
-

          if (RTX_FLAG (in_rtx, frame_related))
            fputs ("/f", outfile);
 
          if (RTX_FLAG (in_rtx, frame_related))
            fputs ("/f", outfile);
 


@@ -176,19 +155,44 @@ print_rtx (in_rtx)
          if (RTX_FLAG (in_rtx, call))
            fputs ("/c", outfile);
 
          if (RTX_FLAG (in_rtx, call))
            fputs ("/c", outfile);
 

-         if (GET_MODE (in_rtx) != VOIDmode)
+         if (RTX_FLAG (in_rtx, return_val))
+           fputs ("/i", outfile);
+
+         /* Print REG_NOTE names for EXPR_LIST and INSN_LIST.  */
+         if ((GET_CODE (in_rtx) == EXPR_LIST
+              || GET_CODE (in_rtx) == INSN_LIST)
+             && (int)GET_MODE (in_rtx) < REG_NOTE_MAX)
+           fprintf (outfile, ":%s",
+                    GET_REG_NOTE_NAME (GET_MODE (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)

            {
            {

-             /* Print REG_NOTE names for EXPR_LIST and INSN_LIST.  */
-             if (GET_CODE (in_rtx) == EXPR_LIST
-                 || GET_CODE (in_rtx) == INSN_LIST)
-               fprintf (outfile, ":%s",
-                        GET_REG_NOTE_NAME (GET_MODE (in_rtx)));
+             if (TREE_CODE (PAT_VAR_LOCATION_DECL (in_rtx)) == STRING_CST)
+               fputs (" <debug string placeholder>", outfile);

              else
              else

-               fprintf (outfile, ":%s", GET_MODE_NAME (GET_MODE (in_rtx)));
+               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

        }
     }
 
        }
     }
 

+#ifndef GENERATOR_FILE
+  if (GET_CODE (in_rtx) == CONST_DOUBLE && FLOAT_MODE_P (GET_MODE (in_rtx)))
+    i = 5;
+#endif
+

   /* Get the format string and skip the first elements if we have handled
      them already.  */
   format_ptr = GET_RTX_FORMAT (GET_CODE (in_rtx)) + i;
   /* Get the format string and skip the first elements if we have handled
      them already.  */
   format_ptr = GET_RTX_FORMAT (GET_CODE (in_rtx)) + i;


@@ -222,15 +226,28 @@ print_rtx (in_rtx)
           An exception is the third field of a NOTE, where it indicates
           that the field has several different valid contents.  */
       case '0':
           An exception is the third field of a NOTE, where it indicates
           that the field has several different valid contents.  */
       case '0':

-       if (i == 1 && GET_CODE (in_rtx) == REG)
+       if (i == 1 && REG_P (in_rtx))

          {
            if (REGNO (in_rtx) != ORIGINAL_REGNO (in_rtx))
              fprintf (outfile, " [%d]", ORIGINAL_REGNO (in_rtx));
          {
            if (REGNO (in_rtx) != ORIGINAL_REGNO (in_rtx))
              fprintf (outfile, " [%d]", ORIGINAL_REGNO (in_rtx));

-           break;

          }
          }

-       if (i == 3 && GET_CODE (in_rtx) == NOTE)
+#ifndef GENERATOR_FILE
+       else if (i == 1 && GET_CODE (in_rtx) == SYMBOL_REF)

          {
          {

-           switch (NOTE_LINE_NUMBER (in_rtx))
+           int flags = SYMBOL_REF_FLAGS (in_rtx);
+           if (flags)
+             fprintf (outfile, " [flags 0x%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, dump_flags);
+         }
+#endif
+       else if (i == 4 && NOTE_P (in_rtx))
+         {
+           switch (NOTE_KIND (in_rtx))

              {
              case NOTE_INSN_EH_REGION_BEG:
              case NOTE_INSN_EH_REGION_END:
              {
              case NOTE_INSN_EH_REGION_BEG:
              case NOTE_INSN_EH_REGION_END:


@@ -243,66 +260,74 @@ print_rtx (in_rtx)
 
              case NOTE_INSN_BLOCK_BEG:
              case NOTE_INSN_BLOCK_END:
 
              case NOTE_INSN_BLOCK_BEG:
              case NOTE_INSN_BLOCK_END:

-               fprintf (outfile, " ");
-               if (flag_dump_unnumbered)
-                 fprintf (outfile, "#");
-               else
-                 fprintf (outfile, HOST_PTR_PRINTF,
-                          (char *) NOTE_BLOCK (in_rtx));
+#ifndef GENERATOR_FILE
+               dump_addr (outfile, " ", NOTE_BLOCK (in_rtx));
+#endif

                sawclose = 1;
                break;
 
              case NOTE_INSN_BASIC_BLOCK:
                {
                sawclose = 1;
                break;
 
              case NOTE_INSN_BASIC_BLOCK:
                {

+#ifndef GENERATOR_FILE

                  basic_block bb = NOTE_BASIC_BLOCK (in_rtx);
                  if (bb != 0)
                    fprintf (outfile, " [bb %d]", bb->index);
                  basic_block bb = NOTE_BASIC_BLOCK (in_rtx);
                  if (bb != 0)
                    fprintf (outfile, " [bb %d]", bb->index);

+#endif

                  break;
                }
 
                  break;
                }
 

-             case NOTE_INSN_EXPECTED_VALUE:
-               indent += 2;
-               if (!sawclose)
-                 fprintf (outfile, " ");
-               print_rtx (NOTE_EXPECTED_VALUE (in_rtx));
-               indent -= 2;
-               break;
-

              case NOTE_INSN_DELETED_LABEL:
              case NOTE_INSN_DELETED_LABEL:

-               if (NOTE_SOURCE_FILE (in_rtx))
-                 fprintf (outfile, " (\"%s\")", NOTE_SOURCE_FILE (in_rtx));
-               else
-                 fprintf (outfile, " \"\"");
-               break;
-
-             case NOTE_INSN_PREDICTION:
-               if (NOTE_PREDICTION (in_rtx))
-                 fprintf (outfile, " [ %d %d ] ",
-                          (int)NOTE_PREDICTION_ALG (in_rtx),
-                          (int) NOTE_PREDICTION_FLAGS (in_rtx));
-               else
-                 fprintf (outfile, " [ ERROR ]");
+               {
+                 const char *label = NOTE_DELETED_LABEL_NAME (in_rtx);
+                 if (label)
+                   fprintf (outfile, " (\"%s\")", label);
+                 else
+                   fprintf (outfile, " \"\"");
+               }

                break;
 
                break;
 

-             default:
+             case NOTE_INSN_SWITCH_TEXT_SECTIONS:

                {
                {

-                 const char * const str = X0STR (in_rtx, i);
-
-                 if (NOTE_LINE_NUMBER (in_rtx) < 0)
-                   ;
-                 else if (str == 0)
-                   fputs (dump_for_graph ? " \\\"\\\"" : " \"\"", outfile);
-                 else
-                   {
-                     if (dump_for_graph)
-                       fprintf (outfile, " (\\\"%s\\\")", str);
-                     else
-                       fprintf (outfile, " (\"%s\")", str);
-                   }
+#ifndef GENERATOR_FILE
+                 basic_block bb = NOTE_BASIC_BLOCK (in_rtx);
+                 if (bb != 0)
+                   fprintf (outfile, " [bb %d]", bb->index);
+#endif

                  break;
                }
                  break;
                }

+
+             case NOTE_INSN_VAR_LOCATION:
+#ifndef GENERATOR_FILE
+               fputc (' ', outfile);
+               print_rtx (NOTE_VAR_LOCATION (in_rtx));
+#endif
+               break;
+
+             default:
+               break;

              }
          }
              }
          }

+       else if (i == 8 && JUMP_P (in_rtx) && JUMP_LABEL (in_rtx) != NULL)
+         /* Output the JUMP_LABEL reference.  */
+         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':
        break;
 
       case 'e':


@@ -348,19 +373,42 @@ print_rtx (in_rtx)
          fprintf (outfile, " ");
        fprintf (outfile, HOST_WIDE_INT_PRINT_DEC, XWINT (in_rtx, i));
        if (! flag_simple)
          fprintf (outfile, " ");
        fprintf (outfile, HOST_WIDE_INT_PRINT_DEC, XWINT (in_rtx, i));
        if (! flag_simple)

-         {
-           fprintf (outfile, " [");
-           fprintf (outfile, HOST_WIDE_INT_PRINT_HEX, XWINT (in_rtx, i));
-           fprintf (outfile, "]");
-         }
+         fprintf (outfile, " [" HOST_WIDE_INT_PRINT_HEX "]",
+                  (unsigned HOST_WIDE_INT) XWINT (in_rtx, i));

        break;
 
       case 'i':
        break;
 
       case 'i':

-       if (i == 5 && GET_CODE (in_rtx) == NOTE)
+       if (i == 4 && INSN_P (in_rtx))
+         {
+#ifndef GENERATOR_FILE
+           /*  Pretty-print insn locators.  Ignore scoping as it is mostly
+               redundant with line number information and do not print anything
+               when there is no location information available.  */
+           if (INSN_LOCATOR (in_rtx) && insn_file (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
               other times often contains garbage from INSN->NOTE death.  */
          {
            /* This field is only used for NOTE_INSN_DELETED_LABEL, and
               other times often contains garbage from INSN->NOTE death.  */

-           if (NOTE_LINE_NUMBER (in_rtx) == NOTE_INSN_DELETED_LABEL)
+           if (NOTE_KIND (in_rtx) == NOTE_INSN_DELETED_LABEL)

              fprintf (outfile, " %d",  XINT (in_rtx, i));
          }
        else
              fprintf (outfile, " %d",  XINT (in_rtx, i));
          }
        else


@@ -368,12 +416,11 @@ print_rtx (in_rtx)
            int value = XINT (in_rtx, i);
            const char *name;
 
            int value = XINT (in_rtx, i);
            const char *name;
 

-           if (GET_CODE (in_rtx) == REG && value < FIRST_PSEUDO_REGISTER)
-             {
-               fputc (' ', outfile);
-               DEBUG_PRINT_REG (in_rtx, 0, outfile);
-             }
-           else if (GET_CODE (in_rtx) == REG
+#ifndef GENERATOR_FILE
+           if (REG_P (in_rtx) && value < FIRST_PSEUDO_REGISTER)
+             fprintf (outfile, " %d %s", REGNO (in_rtx),
+                      reg_names[REGNO (in_rtx)]);
+           else if (REG_P (in_rtx)

                     && value <= LAST_VIRTUAL_REGISTER)
              {
                if (value == VIRTUAL_INCOMING_ARGS_REGNUM)
                     && value <= LAST_VIRTUAL_REGISTER)
              {
                if (value == VIRTUAL_INCOMING_ARGS_REGNUM)


@@ -390,12 +437,30 @@ print_rtx (in_rtx)
                  fprintf (outfile, " %d virtual-reg-%d", value,
                           value-FIRST_VIRTUAL_REGISTER);
              }
                  fprintf (outfile, " %d virtual-reg-%d", value,
                           value-FIRST_VIRTUAL_REGISTER);
              }

-           else if (flag_dump_unnumbered
-                    && (is_insn || GET_CODE (in_rtx) == NOTE))
+           else
+#endif
+             if (flag_dump_unnumbered
+                    && (is_insn || NOTE_P (in_rtx)))

              fputc ('#', outfile);
            else
              fprintf (outfile, " %d", value);
 
              fputc ('#', outfile);
            else
              fprintf (outfile, " %d", value);
 

+#ifndef GENERATOR_FILE
+           if (REG_P (in_rtx) && REG_ATTRS (in_rtx))
+             {
+               fputs (" [", outfile);
+               if (ORIGINAL_REGNO (in_rtx) != REGNO (in_rtx))
+                 fprintf (outfile, "orig:%i", ORIGINAL_REGNO (in_rtx));
+               if (REG_EXPR (in_rtx))
+                 print_mem_expr (outfile, REG_EXPR (in_rtx));
+
+               if (REG_OFFSET (in_rtx))
+                 fprintf (outfile, "+" HOST_WIDE_INT_PRINT_DEC,
+                          REG_OFFSET (in_rtx));
+               fputs (" ]", outfile);
+             }
+#endif
+

            if (is_insn && &INSN_CODE (in_rtx) == &XINT (in_rtx, i)
                && XINT (in_rtx, i) >= 0
                && (name = get_insn_name (XINT (in_rtx, i))) != NULL)
            if (is_insn && &INSN_CODE (in_rtx) == &XINT (in_rtx, i)
                && XINT (in_rtx, i) >= 0
                && (name = get_insn_name (XINT (in_rtx, i))) != NULL)


@@ -407,11 +472,7 @@ print_rtx (in_rtx)
       /* Print NOTE_INSN names rather than integer codes.  */
 
       case 'n':
       /* Print NOTE_INSN names rather than integer codes.  */
 
       case 'n':

-       if (XINT (in_rtx, i) >= (int) NOTE_INSN_BIAS
-           && XINT (in_rtx, i) < (int) NOTE_INSN_MAX)
-         fprintf (outfile, " %s", GET_NOTE_INSN_NAME (XINT (in_rtx, i)));
-       else
-         fprintf (outfile, " %d", XINT (in_rtx, i));
+       fprintf (outfile, " %s", GET_NOTE_INSN_NAME (XINT (in_rtx, i)));

        sawclose = 0;
        break;
 
        sawclose = 0;
        break;
 


@@ -424,7 +485,7 @@ print_rtx (in_rtx)
            if (GET_CODE (in_rtx) == LABEL_REF)
              {
                if (subc == NOTE
            if (GET_CODE (in_rtx) == LABEL_REF)
              {
                if (subc == NOTE

-                   && NOTE_LINE_NUMBER (sub) == NOTE_INSN_DELETED_LABEL)
+                   && NOTE_KIND (sub) == NOTE_INSN_DELETED_LABEL)

                  {
                    if (flag_dump_unnumbered)
                      fprintf (outfile, " [# deleted]");
                  {
                    if (flag_dump_unnumbered)
                      fprintf (outfile, " [# deleted]");


@@ -438,7 +499,10 @@ print_rtx (in_rtx)
                  goto do_e;
              }
 
                  goto do_e;
              }
 

-           if (flag_dump_unnumbered)
+           if (flag_dump_unnumbered
+               || (flag_dump_unnumbered_links && (i == 1 || i == 2)
+                   && (INSN_P (in_rtx) || NOTE_P (in_rtx)
+                       || LABEL_P (in_rtx) || BARRIER_P (in_rtx))))

              fputs (" #", outfile);
            else
              fprintf (outfile, " %d", INSN_UID (sub));
              fputs (" #", outfile);
            else
              fprintf (outfile, " %d", INSN_UID (sub));


@@ -449,16 +513,19 @@ print_rtx (in_rtx)
        break;
 
       case 'b':
        break;
 
       case 'b':

+#ifndef GENERATOR_FILE

        if (XBITMAP (in_rtx, i) == NULL)
          fputs (" {null}", outfile);
        else
          bitmap_print (outfile, XBITMAP (in_rtx, i), " {", "}");
        if (XBITMAP (in_rtx, i) == NULL)
          fputs (" {null}", outfile);
        else
          bitmap_print (outfile, XBITMAP (in_rtx, i), " {", "}");

+#endif

        sawclose = 0;
        break;
 
       case 't':
        sawclose = 0;
        break;
 
       case 't':

-       putc (' ', outfile);
-       fprintf (outfile, HOST_PTR_PRINTF, (char *) XTREE (in_rtx, i));
+#ifndef GENERATOR_FILE
+       dump_addr (outfile, " ", XTREE (in_rtx, i));
+#endif

        break;
 
       case '*':
        break;
 
       case '*':


@@ -467,58 +534,54 @@ print_rtx (in_rtx)
        break;
 
       case 'B':
        break;
 
       case 'B':

+#ifndef GENERATOR_FILE

        if (XBBDEF (in_rtx, i))
          fprintf (outfile, " %i", XBBDEF (in_rtx, i)->index);
        if (XBBDEF (in_rtx, i))
          fprintf (outfile, " %i", XBBDEF (in_rtx, i)->index);

+#endif

        break;
 
       default:
        break;
 
       default:

-       fprintf (stderr,
-                "switch format wrong in rtl.print_rtx(). format was: %c.\n",
-                format_ptr[-1]);
-       abort ();
+       gcc_unreachable ();

       }
 
   switch (GET_CODE (in_rtx))
     {
       }
 
   switch (GET_CODE (in_rtx))
     {

+#ifndef GENERATOR_FILE

     case MEM:
     case MEM:

-      fputs (" [", outfile);
-      fprintf (outfile, HOST_WIDE_INT_PRINT_DEC, MEM_ALIAS_SET (in_rtx));
+      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));
 
       if (MEM_OFFSET (in_rtx))
 
       if (MEM_EXPR (in_rtx))
        print_mem_expr (outfile, MEM_EXPR (in_rtx));
 
       if (MEM_OFFSET (in_rtx))

-       {
-         fputc ('+', outfile);
-         fprintf (outfile, HOST_WIDE_INT_PRINT_DEC,
-                  INTVAL (MEM_OFFSET (in_rtx)));
-       }
+       fprintf (outfile, "+" HOST_WIDE_INT_PRINT_DEC,
+                INTVAL (MEM_OFFSET (in_rtx)));

 
       if (MEM_SIZE (in_rtx))
 
       if (MEM_SIZE (in_rtx))

-       {
-         fputs (" S", outfile);
-         fprintf (outfile, HOST_WIDE_INT_PRINT_DEC,
-                  INTVAL (MEM_SIZE (in_rtx)));
-       }
+       fprintf (outfile, " S" HOST_WIDE_INT_PRINT_DEC,
+                INTVAL (MEM_SIZE (in_rtx)));

 
       if (MEM_ALIGN (in_rtx) != 1)
        fprintf (outfile, " A%u", MEM_ALIGN (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;
 
       fputc (']', outfile);
       break;
 

-#if 0
-    /* It would be nice to do this, but it would require real.o to
-       be linked into the MD-generator programs.  Maybe we should
-       do that.  -zw 2002-03-03  */

     case CONST_DOUBLE:
       if (FLOAT_MODE_P (GET_MODE (in_rtx)))
        {
     case CONST_DOUBLE:
       if (FLOAT_MODE_P (GET_MODE (in_rtx)))
        {

-         REAL_VALUE_TYPE val;
-         char s[30];
+         char s[60];

 
 

-         REAL_VALUE_FROM_CONST_DOUBLE (val, in_rtx);
-         REAL_VALUE_TO_DECIMAL (val, "%.16g", s);
+         real_to_decimal (s, CONST_DOUBLE_REAL_VALUE (in_rtx),
+                          sizeof (s), 0, 1);
+         fprintf (outfile, " %s", s);
+
+         real_to_hexadecimal (s, CONST_DOUBLE_REAL_VALUE (in_rtx),
+                              sizeof (s), 0, 1);

          fprintf (outfile, " [%s]", s);
        }
       break;
          fprintf (outfile, " [%s]", s);
        }
       break;


@@ -526,52 +589,14 @@ print_rtx (in_rtx)
 
     case CODE_LABEL:
       fprintf (outfile, " [%d uses]", LABEL_NUSES (in_rtx));
 
     case CODE_LABEL:
       fprintf (outfile, " [%d uses]", LABEL_NUSES (in_rtx));

-      if (LABEL_ALTERNATE_NAME (in_rtx))
-       fprintf (outfile, " [alternate name: %s]",
-                LABEL_ALTERNATE_NAME (in_rtx));
-      break;
-
-    case CALL_PLACEHOLDER:
-      if (debug_call_placeholder_verbose)
+      switch (LABEL_KIND (in_rtx))

        {
        {

-         fputs (" (cond [\n  (const_string \"normal\") (sequence [", outfile);
-         for (tem = XEXP (in_rtx, 0); tem != 0; tem = NEXT_INSN (tem))
-           {
-             fputs ("\n    ", outfile);
-             print_inline_rtx (outfile, tem, 4);
-           }
-
-         tem = XEXP (in_rtx, 1);
-         if (tem)
-           fputs ("\n    ])\n  (const_string \"tail_call\") (sequence [",
-                  outfile);
-         for (; tem != 0; tem = NEXT_INSN (tem))
-           {
-             fputs ("\n    ", outfile);
-             print_inline_rtx (outfile, tem, 4);
-           }
-
-         tem = XEXP (in_rtx, 2);
-         if (tem)
-           fputs ("\n    ])\n  (const_string \"tail_recursion\") (sequence [",
-                  outfile);
-         for (; tem != 0; tem = NEXT_INSN (tem))
-           {
-             fputs ("\n    ", outfile);
-             print_inline_rtx (outfile, tem, 4);
-           }
-
-         fputs ("\n    ])\n  ])", outfile);
-         break;
+         case LABEL_NORMAL: break;
+         case LABEL_STATIC_ENTRY: fputs (" [entry]", outfile); break;
+         case LABEL_GLOBAL_ENTRY: fputs (" [global entry]", outfile); break;
+         case LABEL_WEAK_ENTRY: fputs (" [weak entry]", outfile); break;
+         default: gcc_unreachable ();

        }
        }

-
-      for (tem = XEXP (in_rtx, 0); tem != 0; tem = NEXT_INSN (tem))
-       if (GET_CODE (tem) == CALL_INSN)
-         {
-           fprintf (outfile, " ");
-           print_rtx (tem);
-           break;
-         }

       break;
 
     default:
       break;
 
     default:


@@ -579,8 +604,8 @@ print_rtx (in_rtx)
     }
 
   if (dump_for_graph
     }
 
   if (dump_for_graph

-      && (is_insn || GET_CODE (in_rtx) == NOTE
-         || GET_CODE (in_rtx) == CODE_LABEL || GET_CODE (in_rtx) == BARRIER))
+      && (is_insn || NOTE_P (in_rtx)
+         || LABEL_P (in_rtx) || BARRIER_P (in_rtx)))

     sawclose = 0;
   else
     {
     sawclose = 0;
   else
     {


@@ -593,10 +618,7 @@ print_rtx (in_rtx)
    characters.  */
 
 void
    characters.  */
 
 void

-print_inline_rtx (outf, x, ind)
-     FILE *outf;
-     rtx x;
-     int ind;
+print_inline_rtx (FILE *outf, const_rtx x, int ind)

 {
   int oldsaw = sawclose;
   int oldindent = indent;
 {
   int oldsaw = sawclose;
   int oldindent = indent;


@@ -612,8 +634,7 @@ print_inline_rtx (outf, x, ind)
 /* Call this function from the debugger to see what X looks like.  */
 
 void
 /* Call this function from the debugger to see what X looks like.  */
 
 void

-debug_rtx (x)
-     rtx x;
+debug_rtx (const_rtx x)

 {
   outfile = stderr;
   sawclose = 0;
 {
   outfile = stderr;
   sawclose = 0;


@@ -633,12 +654,10 @@ int debug_rtx_count = 0;  /* 0 is treated as equivalent to 1 */
    EG: -5 prints 2 rtx's on either side (in addition to the specified rtx).  */
 
 void
    EG: -5 prints 2 rtx's on either side (in addition to the specified rtx).  */
 
 void

-debug_rtx_list (x, n)
-     rtx x;
-     int n;
+debug_rtx_list (const_rtx x, int n)

 {
   int i,count;
 {
   int i,count;

-  rtx insn;
+  const_rtx insn;

 
   count = n == 0 ? 1 : n < 0 ? -n : n;
 
 
   count = n == 0 ? 1 : n < 0 ? -n : n;
 


@@ -662,8 +681,7 @@ debug_rtx_list (x, n)
 /* Call this function to print an rtx list from START to END inclusive.  */
 
 void
 /* Call this function to print an rtx list from START to END inclusive.  */
 
 void

-debug_rtx_range (start, end)
-     rtx start, end;
+debug_rtx_range (const_rtx start, const_rtx end)

 {
   while (1)
     {
 {
   while (1)
     {


@@ -679,10 +697,8 @@ debug_rtx_range (start, end)
    and then call debug_rtx_list to print it, using DEBUG_RTX_COUNT.
    The found insn is returned to enable further debugging analysis.  */
 
    and then call debug_rtx_list to print it, using DEBUG_RTX_COUNT.
    The found insn is returned to enable further debugging analysis.  */
 

-rtx
-debug_rtx_find (x, uid)
-     rtx x;
-     int uid;
+const_rtx
+debug_rtx_find (const_rtx x, int uid)

 {
   while (x != 0 && INSN_UID (x) != uid)
     x = NEXT_INSN (x);
 {
   while (x != 0 && INSN_UID (x) != uid)
     x = NEXT_INSN (x);


@@ -705,11 +721,9 @@ debug_rtx_find (x, uid)
    If RTX_FIRST is not an insn, then it alone is printed, with no newline.  */
 
 void
    If RTX_FIRST is not an insn, then it alone is printed, with no newline.  */
 
 void

-print_rtl (outf, rtx_first)
-     FILE *outf;
-     rtx rtx_first;
+print_rtl (FILE *outf, const_rtx rtx_first)

 {
 {

-  rtx tmp_rtx;
+  const_rtx tmp_rtx;

 
   outfile = outf;
   sawclose = 0;
 
   outfile = outf;
   sawclose = 0;


@@ -729,13 +743,11 @@ print_rtl (outf, rtx_first)
       case CODE_LABEL:
       case BARRIER:
        for (tmp_rtx = rtx_first; tmp_rtx != 0; tmp_rtx = NEXT_INSN (tmp_rtx))
       case CODE_LABEL:
       case BARRIER:
        for (tmp_rtx = rtx_first; tmp_rtx != 0; tmp_rtx = NEXT_INSN (tmp_rtx))

-         if (! flag_dump_unnumbered
-             || GET_CODE (tmp_rtx) != NOTE || NOTE_LINE_NUMBER (tmp_rtx) < 0)
-           {
-             fputs (print_rtx_head, outfile);
-             print_rtx (tmp_rtx);
-             fprintf (outfile, "\n");
-           }
+         {
+           fputs (print_rtx_head, outfile);
+           print_rtx (tmp_rtx);
+           fprintf (outfile, "\n");
+         }

        break;
 
       default:
        break;
 
       default:


@@ -748,21 +760,14 @@ print_rtl (outf, rtx_first)
 /* Return nonzero if we actually printed anything.  */
 
 int
 /* Return nonzero if we actually printed anything.  */
 
 int

-print_rtl_single (outf, x)
-     FILE *outf;
-     rtx x;
+print_rtl_single (FILE *outf, const_rtx x)

 {
   outfile = outf;
   sawclose = 0;
 {
   outfile = outf;
   sawclose = 0;

-  if (! flag_dump_unnumbered
-      || GET_CODE (x) != NOTE || NOTE_LINE_NUMBER (x) < 0)
-    {
-      fputs (print_rtx_head, outfile);
-      print_rtx (x);
-      putc ('\n', outf);
-      return 1;
-    }
-  return 0;
+  fputs (print_rtx_head, outfile);
+  print_rtx (x);
+  putc ('\n', outf);
+  return 1;

 }
 
 
 }
 
 


@@ -770,9 +775,7 @@ print_rtl_single (outf, x)
    if RTX is a CONST_INT then print in decimal format.  */
 
 void
    if RTX is a CONST_INT then print in decimal format.  */
 
 void

-print_simple_rtl (outf, x)
-     FILE *outf;
-     rtx x;
+print_simple_rtl (FILE *outf, const_rtx x)

 {
   flag_simple = 1;
   print_rtl (outf, x);
 {
   flag_simple = 1;
   print_rtl (outf, x);