* config/m68k/m68k-protos.h: Add a prototype for

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

diff --git a/gcc/genpeep.c b/gcc/genpeep.c
index f5fd84e..42550df 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 Free Software Foundation, Inc.
+   1999, 2000, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -53,14 +53,13 @@ static int n_operands;
 
 static int insn_code_number = 0;
 
-static void gen_peephole PARAMS ((rtx));
-static void match_rtx PARAMS ((rtx, struct link *, int));
-static void print_path PARAMS ((struct link *));
-static void print_code PARAMS ((RTX_CODE));
+static void gen_peephole (rtx);
+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 (peep)
-     rtx peep;
+gen_peephole (rtx peep)
 {
   int ninsns = XVECLEN (peep, 0);
   int i;
@@ -68,9 +67,6 @@ gen_peephole (peep)
   n_operands = 0;
 
   printf ("  insn = ins1;\n");
-#if 0
-  printf ("  want_jump = 0;\n");
-#endif
 
   for (i = 0; i < ninsns; i++)
     {
@@ -79,21 +75,16 @@ gen_peephole (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",
-                 insn_code_number);
+         printf ("  if (LABEL_P (insn)\n\
+      || BARRIER_P (insn))\n    goto L%d;\n",
+                 insn_code_number);
        }
 
-#if 0
-      printf ("  if (GET_CODE (insn) == JUMP_INSN)\n");
-      printf ("    want_jump = JUMP_LABEL (insn);\n");
-#endif
-
       printf ("  pat = PATTERN (insn);\n");
 
       /* Walk the insn's pattern, remembering at all times the path
@@ -117,15 +108,6 @@ gen_peephole (peep)
 
   printf ("  PATTERN (ins1) = gen_rtx_PARALLEL (VOIDmode, gen_rtvec_v (%d, operands));\n", n_operands);
 
-#if 0
-  printf ("  if (want_jump && GET_CODE (ins1) != JUMP_INSN)\n");
-  printf ("    {\n");
-  printf ("      rtx insn2 = emit_jump_insn_before (PATTERN (ins1), ins1);\n");
-  printf ("      delete_related_insns (ins1);\n");
-  printf ("      ins1 = ins2;\n");
-  printf ("    }\n");
-#endif
-
   /* Record this define_peephole's insn code in the insn,
      as if it had been recognized to match this.  */
   printf ("  INSN_CODE (ins1) = %d;\n",
@@ -143,10 +125,7 @@ gen_peephole (peep)
 }
 \f
 static void
-match_rtx (x, path, fail_label)
-     rtx x;
-     struct link *path;
-     int fail_label;
+match_rtx (rtx x, struct link *path, int fail_label)
 {
   RTX_CODE code;
   int i;
@@ -256,7 +235,7 @@ match_rtx (x, path, fail_label)
     case ADDRESS:
       match_rtx (XEXP (x, 0), path, fail_label);
       return;
-      
+
     default:
       break;
     }
@@ -343,8 +322,7 @@ match_rtx (x, path, fail_label)
    evaluate to the rtx at that point.  */
 
 static void
-print_path (path)
-     struct link *path;
+print_path (struct link *path)
 {
   if (path == 0)
     printf ("pat");
@@ -363,20 +341,17 @@ print_path (path)
 }
 \f
 static void
-print_code (code)
-     RTX_CODE code;
+print_code (RTX_CODE code)
 {
   const char *p1;
   for (p1 = GET_RTX_NAME (code); *p1; p1++)
     putchar (TOUPPER(*p1));
 }
 
-extern int main PARAMS ((int, char **));
+extern int main (int, char **);
 
 int
-main (argc, argv)
-     int argc;
-     char **argv;
+main (int argc, char **argv)
 {
   rtx desc;
 
@@ -384,9 +359,6 @@ main (argc, 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);
 
@@ -411,12 +383,12 @@ from the machine description file `md'.  */\n\n");
   printf ("extern rtx peep_operand[];\n\n");
   printf ("#define operands peep_operand\n\n");
 
-  printf ("rtx\npeephole (ins1)\n     rtx ins1;\n{\n");
+  printf ("rtx\npeephole (rtx ins1)\n{\n");
   printf ("  rtx insn ATTRIBUTE_UNUSED, x ATTRIBUTE_UNUSED, pat ATTRIBUTE_UNUSED;\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.  */
@@ -457,8 +429,7 @@ from the machine description file `md'.  */\n\n");
 
 /* Define this so we can link with print-rtl.o to get debug_rtx function.  */
 const char *
-get_insn_name (code)
-     int code ATTRIBUTE_UNUSED;
+get_insn_name (int code ATTRIBUTE_UNUSED)
 {
   return NULL;
 }