Gcc 3.4.2 20040728.

1 files changed, 46 insertions, 58 deletions

diff --git a/contrib/gcc/gengenrtl.c b/contrib/gcc/gengenrtl.c
index 6bfd0ff..39f1dc2 100644
--- a/contrib/gcc/gengenrtl.c
+++ b/contrib/gcc/gengenrtl.c
@@ -1,5 +1,6 @@
 /* Generate code to allocate RTL structures.
-   Copyright (C) 1997, 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003
+   Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -19,47 +20,46 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
 
-#include "hconfig.h"
+#include "bconfig.h"
 #include "system.h"
 
-#define NO_GENRTL_H
-#include "rtl.h"
-#undef abort
-
-#include "real.h"
-
 struct rtx_definition
 {
   const char *const enumname, *const name, *const format;
 };
 
-#define DEF_RTL_EXPR(ENUM, NAME, FORMAT, CLASS) { STRINGX(ENUM), NAME, FORMAT },
+/* rtl.def needs CONST_DOUBLE_FORMAT, but we don't care what
+   CONST_DOUBLE_FORMAT is because we're not going to be generating
+   anything for CONST_DOUBLE anyway.  */
+#define CONST_DOUBLE_FORMAT ""
+
+#define DEF_RTL_EXPR(ENUM, NAME, FORMAT, CLASS) { #ENUM, NAME, FORMAT },
 
 static const struct rtx_definition defs[] =
 {
 #include "rtl.def"		/* rtl expressions are documented here */
 };
+#define NUM_RTX_CODE ARRAY_SIZE(defs)
 
 static const char *formats[NUM_RTX_CODE];
 
-static const char *type_from_format	PARAMS ((int));
-static const char *accessor_from_format	PARAMS ((int));
-static int special_format		PARAMS ((const char *));
-static int special_rtx			PARAMS ((int));
-static int excluded_rtx			PARAMS ((int));
-static void find_formats		PARAMS ((void));
-static void gendecl			PARAMS ((const char *));
-static void genmacro			PARAMS ((int));
-static void gendef			PARAMS ((const char *));
-static void genlegend			PARAMS ((void));
-static void genheader			PARAMS ((void));
-static void gencode			PARAMS ((void));
+static const char *type_from_format	(int);
+static const char *accessor_from_format	(int);
+static int special_format		(const char *);
+static int special_rtx			(int);
+static int excluded_rtx			(int);
+static void find_formats		(void);
+static void gendecl			(const char *);
+static void genmacro			(int);
+static void gendef			(const char *);
+static void genlegend			(void);
+static void genheader			(void);
+static void gencode			(void);
 
 /* Decode a format letter into a C type string.  */
 
 static const char *
-type_from_format (c)
-     int c;
+type_from_format (int c)
 {
   switch (c)
     {
@@ -91,8 +91,7 @@ type_from_format (c)
 /* Decode a format letter into the proper accessor function.  */
 
 static const char *
-accessor_from_format (c)
-     int c;
+accessor_from_format (int c)
 {
   switch (c)
     {
@@ -129,8 +128,7 @@ accessor_from_format (c)
    the list of formats we write routines to create.  */
 
 static int
-special_format (fmt)
-     const char *fmt;
+special_format (const char *fmt)
 {
   return (strchr (fmt, '*') != 0
 	  || strchr (fmt, 'V') != 0
@@ -143,8 +141,7 @@ special_format (fmt)
    is a wrapper in emit-rtl.c).  */
 
 static int
-special_rtx (idx)
-     int idx;
+special_rtx (int idx)
 {
   return (strcmp (defs[idx].enumname, "CONST_INT") == 0
 	  || strcmp (defs[idx].enumname, "REG") == 0
@@ -158,8 +155,7 @@ special_rtx (idx)
    cannot have the obvious interface).  */
 
 static int
-excluded_rtx (idx)
-     int idx;
+excluded_rtx (int idx)
 {
   return (strcmp (defs[idx].enumname, "CONST_DOUBLE") == 0);
 }
@@ -167,9 +163,9 @@ excluded_rtx (idx)
 /* Place a list of all format specifiers we use into the array FORMAT.  */
 
 static void
-find_formats ()
+find_formats (void)
 {
-  int i;
+  unsigned int i;
 
   for (i = 0; i < NUM_RTX_CODE; i++)
     {
@@ -190,13 +186,12 @@ find_formats ()
 /* Write the declarations for the routine to allocate RTL with FORMAT.  */
 
 static void
-gendecl (format)
-     const char *format;
+gendecl (const char *format)
 {
   const char *p;
   int i, pos;
 
-  printf ("extern rtx gen_rtx_fmt_%s\tPARAMS ((RTX_CODE, ", format);
+  printf ("extern rtx gen_rtx_fmt_%s\t (RTX_CODE, ", format);
   printf ("enum machine_mode mode");
 
   /* Write each parameter that is needed and start a new line when the line
@@ -214,15 +209,14 @@ gendecl (format)
 	pos += ourlen;
       }
 
-  printf ("));\n");
+  printf (");\n");
 }
 
 /* Generate macros to generate RTL of code IDX using the functions we
    write.  */
 
 static void
-genmacro (idx)
-     int idx;
+genmacro (int idx)
 {
   const char *p;
   int i;
@@ -255,8 +249,7 @@ genmacro (idx)
    format is FORMAT.  */
 
 static void
-gendef (format)
-     const char *format;
+gendef (const char *format)
 {
   const char *p;
   int i, j;
@@ -264,23 +257,20 @@ gendef (format)
   /* Start by writing the definition of the function name and the types
      of the arguments.  */
 
-  printf ("rtx\ngen_rtx_fmt_%s (code, mode", format);
+  printf ("rtx\ngen_rtx_fmt_%s (RTX_CODE code, enum machine_mode mode", format);
   for (p = format, i = 0; *p != 0; p++)
     if (*p != '0')
-      printf (", arg%d", i++);
+      printf (",\n\t%sarg%d", type_from_format (*p), i++);
 
-  puts (")\n     RTX_CODE code;\n     enum machine_mode mode;");
-  for (p = format, i = 0; *p != 0; p++)
-    if (*p != '0')
-      printf ("     %sarg%d;\n", type_from_format (*p), i++);
+  puts (")");
 
   /* Now write out the body of the function itself, which allocates
      the memory and initializes it.  */
   puts ("{");
   puts ("  rtx rt;");
-  printf ("  rt = ggc_alloc_rtx (%d);\n", (int) strlen (format));
+  puts ("  rt = ggc_alloc_rtx (code);\n");
 
-  puts ("  memset (rt, 0, sizeof (struct rtx_def) - sizeof (rtunion));\n");
+  puts ("  memset (rt, 0, RTX_HDR_SIZE);\n");
   puts ("  PUT_CODE (rt, code);");
   puts ("  PUT_MODE (rt, mode);");
 
@@ -296,7 +286,7 @@ gendef (format)
 /* Generate the documentation header for files we write.  */
 
 static void
-genlegend ()
+genlegend (void)
 {
   puts ("/* Generated automatically by gengenrtl from rtl.def.  */\n");
 }
@@ -304,9 +294,9 @@ genlegend ()
 /* Generate the text of the header file we make, genrtl.h.  */
 
 static void
-genheader ()
+genheader (void)
 {
-  int i;
+  unsigned int i;
   const char **fmt;
 
   puts ("#ifndef GCC_GENRTL_H");
@@ -327,16 +317,17 @@ genheader ()
 /* Generate the text of the code file we write, genrtl.c.  */
 
 static void
-gencode ()
+gencode (void)
 {
   const char **fmt;
 
   puts ("#include \"config.h\"");
   puts ("#include \"system.h\"");
+  puts ("#include \"coretypes.h\"");
+  puts ("#include \"tm.h\"");
   puts ("#include \"obstack.h\"");
   puts ("#include \"rtl.h\"");
   puts ("#include \"ggc.h\"\n");
-  puts ("extern struct obstack *rtl_obstack;\n");
 
   for (fmt = formats; *fmt != 0; fmt++)
     gendef (*fmt);
@@ -345,12 +336,9 @@ gencode ()
 /* This is the main program.  We accept only one argument, "-h", which
    says we are writing the genrtl.h file.  Otherwise we are writing the
    genrtl.c file.  */
-extern int main PARAMS ((int, char **));
 
 int
-main (argc, argv)
-     int argc;
-     char **argv;
+main (int argc, char **argv)
 {
   find_formats ();
   genlegend ();