PR testsuite/23611, PR testsuite/23615

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

diff --git a/gcc/genpeep.c b/gcc/genpeep.c
index 4c6e64b..89da38f 100644 (file)
--- a/gcc/genpeep.c
+++ b/gcc/genpeep.c
@@ -1,6 +1,6 @@
 /* Generate code from machine description to perform peephole optimizations.
    Copyright (C) 1987, 1989, 1992, 1997, 1998,
-   1999, 2000, 2003 Free Software Foundation, Inc.
+   1999, 2000, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -16,8 +16,8 @@ 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.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 
 #include "bconfig.h"
@@ -75,13 +75,13 @@ gen_peephole (rtx peep)
          printf ("  do { insn = NEXT_INSN (insn);\n");
          printf ("       if (insn == 0) goto L%d; }\n",
                  insn_code_number);
-         printf ("  while (GET_CODE (insn) == NOTE\n");
-         printf ("\t || (GET_CODE (insn) == INSN\n");
+         printf ("  while (NOTE_P (insn)\n");
+         printf ("\t || (NONJUMP_INSN_P (insn)\n");
          printf ("\t     && (GET_CODE (PATTERN (insn)) == USE\n");
          printf ("\t\t || GET_CODE (PATTERN (insn)) == CLOBBER)));\n");
 
-         printf ("  if (GET_CODE (insn) == CODE_LABEL\n\
-      || GET_CODE (insn) == BARRIER)\n    goto L%d;\n",
+         printf ("  if (LABEL_P (insn)\n\
+      || BARRIER_P (insn))\n    goto L%d;\n",
                  insn_code_number);
        }
 
@@ -359,9 +359,6 @@ main (int argc, char **argv)
 
   progname = "genpeep";
 
-  if (argc <= 1)
-    fatal ("no input file name");
-
   if (init_md_reader_args (argc, argv) != SUCCESS_EXIT_CODE)
     return (FATAL_EXIT_CODE);
 
@@ -391,7 +388,7 @@ from the machine description file `md'.  */\n\n");
 
   /* Early out: no peepholes for insns followed by barriers.  */
   printf ("  if (NEXT_INSN (ins1)\n");
-  printf ("      && GET_CODE (NEXT_INSN (ins1)) == BARRIER)\n");
+  printf ("      && BARRIER_P (NEXT_INSN (ins1)))\n");
   printf ("    return 0;\n\n");
 
   /* Read the machine description.  */