2010-04-09 Richard Guenther <rguenther@suse.de>

[pf3gnuchains/gcc-fork.git] / gcc / genemit.c

diff --git a/gcc/genemit.c b/gcc/genemit.c
index a367f46..9df559b 100644 (file)
--- a/gcc/genemit.c
+++ b/gcc/genemit.c
@@ -1,12 +1,12 @@
 /* Generate code from machine description to emit insns as rtl.
    Copyright (C) 1987, 1988, 1991, 1994, 1995, 1997, 1998, 1999, 2000, 2001,
-   2003, 2004, 2005 Free Software Foundation, Inc.
+   2003, 2004, 2005, 2007, 2008, 2009, 2010 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
@@ -15,9 +15,8 @@ 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
-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
 
 
 #include "bconfig.h"
@@ -258,6 +257,7 @@ gen_exp (rtx x, enum rtx_code subroutine_type, char *used)
       return;
 
     case CONST_DOUBLE:
+    case CONST_FIXED:
       /* These shouldn't be written in MD files.  Instead, the appropriate
         routines in varasm.c should be called.  */
       gcc_unreachable ();
@@ -357,17 +357,17 @@ gen_insn (rtx insn, int lineno)
 
              for (j = i + 1; j < XVECLEN (insn, 1); j++)
                {
-                 rtx old = XEXP (XVECEXP (p->pattern, 1, j), 0);
-                 rtx new = XEXP (XVECEXP (insn, 1, j), 0);
+                 rtx old_rtx = XEXP (XVECEXP (p->pattern, 1, j), 0);
+                 rtx new_rtx = XEXP (XVECEXP (insn, 1, j), 0);
 
-                 /* OLD and NEW are the same if both are to be a SCRATCH
+                 /* OLD and NEW_INSN are the same if both are to be a SCRATCH
                     of the same mode,
                     or if both are registers of the same mode and number.  */
-                 if (! (GET_MODE (old) == GET_MODE (new)
-                        && ((GET_CODE (old) == MATCH_SCRATCH
-                             && GET_CODE (new) == MATCH_SCRATCH)
-                            || (REG_P (old) && REG_P (new)
-                                && REGNO (old) == REGNO (new)))))
+                 if (! (GET_MODE (old_rtx) == GET_MODE (new_rtx)
+                        && ((GET_CODE (old_rtx) == MATCH_SCRATCH
+                             && GET_CODE (new_rtx) == MATCH_SCRATCH)
+                            || (REG_P (old_rtx) && REG_P (new_rtx)
+                                && REGNO (old_rtx) == REGNO (new_rtx)))))
                    break;
                }
 
@@ -520,12 +520,13 @@ gen_expand (rtx expand)
         (unless we aren't going to use them at all).  */
       if (XVEC (expand, 1) != 0)
        {
-         for (i = 0; i < operands; i++)
-           printf ("    operand%d = operands[%d];\n", i, i);
-         for (; i <= max_dup_opno; i++)
-           printf ("    operand%d = operands[%d];\n", i, i);
-         for (; i <= max_scratch_opno; i++)
-           printf ("    operand%d = operands[%d];\n", i, i);
+         for (i = 0;
+              i < MAX (operands, MAX (max_scratch_opno, max_dup_opno) + 1);
+              i++)
+           {
+             printf ("    operand%d = operands[%d];\n", i, i);
+             printf ("    (void) operand%d;\n", i);
+           }
        }
       printf ("  }\n");
     }
@@ -621,7 +622,7 @@ gen_split (rtx split)
   else
     {
       printf ("extern rtx gen_split_%d (rtx, rtx *);\n", insn_code_number);
-      printf ("rtx\ngen_split_%d (rtx curr_insn ATTRIBUTE_UNUSED, rtx *operands%s)\n", 
+      printf ("rtx\ngen_split_%d (rtx curr_insn ATTRIBUTE_UNUSED, rtx *operands%s)\n",
              insn_code_number, unused);
     }
   printf ("{\n");
@@ -647,7 +648,10 @@ gen_split (rtx split)
 
   /* Output code to copy the arguments back out of `operands'  */
   for (i = 0; i < operands; i++)
-    printf ("  operand%d = operands[%d];\n", i, i);
+    {
+      printf ("  operand%d = operands[%d];\n", i, i);
+      printf ("  (void) operand%d;\n", i);
+    }
 
   /* Output code to construct the rtl for the instruction bodies.
      Use emit_insn to add them to the sequence being accumulated.
@@ -782,9 +786,7 @@ output_peephole2_scratches (rtx split)
 {
   int i;
   int insn_nr = 0;
-
-  printf ("  HARD_REG_SET _regs_allocated;\n");
-  printf ("  CLEAR_HARD_REG_SET (_regs_allocated);\n");
+  bool first = true;
 
   for (i = 0; i < XVECLEN (split, 0); i++)
     {
@@ -803,6 +805,13 @@ output_peephole2_scratches (rtx split)
            else if (GET_CODE (XVECEXP (split, 0, j)) != MATCH_SCRATCH)
              cur_insn_nr++;
 
+         if (first)
+           {
+             printf ("  HARD_REG_SET _regs_allocated;\n");
+             printf ("  CLEAR_HARD_REG_SET (_regs_allocated);\n");
+             first = false;
+           }
+
          printf ("  if ((operands[%d] = peep2_find_free_register (%d, %d, \"%s\", %smode, &_regs_allocated)) == NULL_RTX)\n\
     return NULL;\n",
                  XINT (elt, 0),
@@ -844,7 +853,6 @@ from the machine description file `md'.  */\n\n");
   printf ("#include \"function.h\"\n");
   printf ("#include \"expr.h\"\n");
   printf ("#include \"optabs.h\"\n");
-  printf ("#include \"real.h\"\n");
   printf ("#include \"dfp.h\"\n");
   printf ("#include \"flags.h\"\n");
   printf ("#include \"output.h\"\n");
@@ -854,9 +862,11 @@ from the machine description file `md'.  */\n\n");
   printf ("#include \"resource.h\"\n");
   printf ("#include \"reload.h\"\n");
   printf ("#include \"toplev.h\"\n");
+  printf ("#include \"regs.h\"\n");
   printf ("#include \"tm-constrs.h\"\n");
-  printf ("#include \"ggc.h\"\n\n");
-  printf ("#include \"basic-block.h\"\n\n");
+  printf ("#include \"ggc.h\"\n");
+  printf ("#include \"basic-block.h\"\n");
+  printf ("#include \"integrate.h\"\n\n");
   printf ("#define FAIL return (end_sequence (), _val)\n");
   printf ("#define DONE return (_val = get_insns (), end_sequence (), _val)\n\n");