2013-02-15 Vladimir Makarov <vmakarov@redhat.com>

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

diff --git a/gcc/genpeep.c b/gcc/genpeep.c
index ad4b5a1..81bd9df 100644 (file)
--- a/gcc/genpeep.c
+++ b/gcc/genpeep.c
@@ -1,12 +1,11 @@
 /* Generate code from machine description to perform peephole optimizations.
 /* Generate code from machine description to perform peephole optimizations.

-   Copyright (C) 1987, 1989, 1992, 1997, 1998,
-   1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1987-2013 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
 
 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,9 +14,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
 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"
 
 
 #include "bconfig.h"


@@ -48,18 +46,13 @@ static int max_opno;
 
 static int n_operands;
 
 
 static int n_operands;
 

-/* Peephole optimizations get insn codes just like insn patterns.
-   Count them so we know the code of the define_peephole we are handling.  */
-
-static int insn_code_number = 0;
-
-static void gen_peephole (rtx);
+static void gen_peephole (rtx, int);

 static void match_rtx (rtx, struct link *, int);
 static void print_path (struct link *);
 static void print_code (RTX_CODE);
 \f
 static void
 static void match_rtx (rtx, struct link *, int);
 static void print_path (struct link *);
 static void print_code (RTX_CODE);
 \f
 static void

-gen_peephole (rtx peep)
+gen_peephole (rtx peep, int insn_code_number)

 {
   int ninsns = XVECLEN (peep, 0);
   int i;
 {
   int ninsns = XVECLEN (peep, 0);
   int i;


@@ -232,10 +225,6 @@ match_rtx (rtx x, struct link *path, int fail_label)
        }
       return;
 
        }
       return;
 

-    case ADDRESS:
-      match_rtx (XEXP (x, 0), path, fail_label);
-      return;
-

     default:
       break;
     }
     default:
       break;
     }


@@ -359,7 +348,7 @@ main (int argc, char **argv)
 
   progname = "genpeep";
 
 
   progname = "genpeep";
 

-  if (init_md_reader_args (argc, argv) != SUCCESS_EXIT_CODE)
+  if (!init_rtx_reader_args (argc, argv))

     return (FATAL_EXIT_CODE);
 
   printf ("/* Generated automatically by the program `genpeep'\n\
     return (FATAL_EXIT_CODE);
 
   printf ("/* Generated automatically by the program `genpeep'\n\


@@ -374,10 +363,12 @@ from the machine description file `md'.  */\n\n");
   printf ("#include \"tm_p.h\"\n");
   printf ("#include \"regs.h\"\n");
   printf ("#include \"output.h\"\n");
   printf ("#include \"tm_p.h\"\n");
   printf ("#include \"regs.h\"\n");
   printf ("#include \"output.h\"\n");

-  printf ("#include \"real.h\"\n");

   printf ("#include \"recog.h\"\n");
   printf ("#include \"recog.h\"\n");

-  printf ("#include \"except.h\"\n\n");
-  printf ("#include \"function.h\"\n\n");
+  printf ("#include \"except.h\"\n");
+  printf ("#include \"function.h\"\n");
+  printf ("#include \"diagnostic-core.h\"\n");
+  printf ("#include \"flags.h\"\n");
+  printf ("#include \"tm-constrs.h\"\n\n");

 
   printf ("#ifdef HAVE_peephole\n");
   printf ("extern rtx peep_operand[];\n\n");
 
   printf ("#ifdef HAVE_peephole\n");
   printf ("extern rtx peep_operand[];\n\n");


@@ -395,24 +386,15 @@ from the machine description file `md'.  */\n\n");
 
   while (1)
     {
 
   while (1)
     {

-      int line_no, rtx_number = 0;
+      int line_no;
+      int insn_code_number;

 
 

-      desc = read_md_rtx (&line_no, &rtx_number);
+      desc = read_md_rtx (&line_no, &insn_code_number);

       if (desc == NULL)
        break;
 
       if (desc == NULL)
        break;
 

-       if (GET_CODE (desc) == DEFINE_PEEPHOLE)
-       {
-         gen_peephole (desc);
-         insn_code_number++;
-       }
-      if (GET_CODE (desc) == DEFINE_INSN
-         || GET_CODE (desc) == DEFINE_EXPAND
-         || GET_CODE (desc) == DEFINE_SPLIT
-         || GET_CODE (desc) == DEFINE_PEEPHOLE2)
-       {
-         insn_code_number++;
-       }
+      if (GET_CODE (desc) == DEFINE_PEEPHOLE)
+       gen_peephole (desc, insn_code_number);

     }
 
   printf ("  return 0;\n}\n\n");
     }
 
   printf ("  return 0;\n}\n\n");