* fixinc/fixtests.c(stdc_0_in_system_headers_test): Must return "FIX"

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

diff --git a/gcc/gengenrtl.c b/gcc/gengenrtl.c
index 54dccf1..d41e0d2 100644 (file)
--- a/gcc/gengenrtl.c
+++ b/gcc/gengenrtl.c
@@ -40,37 +40,56 @@ Boston, MA 02111-1307, USA.  */
    slots in a CONST_DOUBLE, so we provide them even if one would suffice.  */
 
 #ifdef REAL_ARITHMETIC
-#if MAX_LONG_DOUBLE_TYPE_SIZE == 96
-#define REAL_WIDTH     (11*8 + HOST_BITS_PER_WIDE_INT)/HOST_BITS_PER_WIDE_INT
-#elif MAX_LONG_DOUBLE_TYPE_SIZE == 128
-#define REAL_WIDTH     (19*8 + HOST_BITS_PER_WIDE_INT)/HOST_BITS_PER_WIDE_INT
-#elif HOST_FLOAT_FORMAT != TARGET_FLOAT_FORMAT
-#define REAL_WIDTH     (7*8 + HOST_BITS_PER_WIDE_INT)/HOST_BITS_PER_WIDE_INT
-#endif
+# if MAX_LONG_DOUBLE_TYPE_SIZE == 96
+#  define REAL_WIDTH   \
+     (11*8 + HOST_BITS_PER_WIDE_INT)/HOST_BITS_PER_WIDE_INT
+# else
+#  if MAX_LONG_DOUBLE_TYPE_SIZE == 128
+#   define REAL_WIDTH  \
+      (19*8 + HOST_BITS_PER_WIDE_INT)/HOST_BITS_PER_WIDE_INT
+#  else
+#   if HOST_FLOAT_FORMAT != TARGET_FLOAT_FORMAT
+#    define REAL_WIDTH \
+      (7*8 + HOST_BITS_PER_WIDE_INT)/HOST_BITS_PER_WIDE_INT
+#   endif
+#  endif
+# endif
 #endif /* REAL_ARITHMETIC */
 
 #ifndef REAL_WIDTH
-#if HOST_BITS_PER_WIDE_INT*2 >= MAX_LONG_DOUBLE_TYPE_SIZE
-#define REAL_WIDTH     2
-#elif HOST_BITS_PER_WIDE_INT*3 >= MAX_LONG_DOUBLE_TYPE_SIZE
-#define REAL_WIDTH     3
-#elif HOST_BITS_PER_WIDE_INT*4 >= MAX_LONG_DOUBLE_TYPE_SIZE
-#define REAL_WIDTH     4
-#endif
+# if HOST_BITS_PER_WIDE_INT*2 >= MAX_LONG_DOUBLE_TYPE_SIZE
+#  define REAL_WIDTH   2
+# else
+#  if HOST_BITS_PER_WIDE_INT*3 >= MAX_LONG_DOUBLE_TYPE_SIZE
+#   define REAL_WIDTH  3
+#  else
+#   if HOST_BITS_PER_WIDE_INT*4 >= MAX_LONG_DOUBLE_TYPE_SIZE
+#    define REAL_WIDTH 4
+#   endif
+#  endif
+# endif
 #endif /* REAL_WIDTH */
 
 #if REAL_WIDTH == 1
-#define CONST_DOUBLE_FORMAT    "e0ww"
-#elif REAL_WIDTH == 2
-#define CONST_DOUBLE_FORMAT    "e0ww"
-#elif REAL_WIDTH == 3
-#define CONST_DOUBLE_FORMAT    "e0www"
-#elif REAL_WIDTH == 4
-#define CONST_DOUBLE_FORMAT    "e0wwww"
-#elif REAL_WIDTH == 5
-#define CONST_DOUBLE_FORMAT    "e0wwwww"
+# define CONST_DOUBLE_FORMAT   "e0ww"
 #else
-#define CONST_DOUBLE_FORMAT    /* nothing - will cause syntax error */
+# if REAL_WIDTH == 2
+#  define CONST_DOUBLE_FORMAT  "e0ww"
+# else
+#  if REAL_WIDTH == 3
+#   define CONST_DOUBLE_FORMAT "e0www"
+#  else
+#   if REAL_WIDTH == 4
+#    define CONST_DOUBLE_FORMAT        "e0wwww"
+#   else
+#    if REAL_WIDTH == 5
+#     define CONST_DOUBLE_FORMAT       "e0wwwww"
+#    else
+#     define CONST_DOUBLE_FORMAT /* nothing - will cause syntax error */
+#    endif
+#   endif
+#  endif
+# endif
 #endif
 
 
@@ -79,7 +98,7 @@ struct rtx_definition
   const char *enumname, *name, *format;
 };
 
-#define DEF_RTL_EXPR(ENUM, NAME, FORMAT, CLASS) { STRINGIFY(ENUM), NAME, FORMAT },
+#define DEF_RTL_EXPR(ENUM, NAME, FORMAT, CLASS) { STRINGX(ENUM), NAME, FORMAT },
 
 struct rtx_definition defs[] = 
 {  
@@ -180,7 +199,7 @@ special_format (fmt)
 
 /* Return nonzero if the RTL code given by index IDX is one that we should not
    generate a gen_RTX_FOO function foo (because that function is present
-   elsewhere in the compiler.  */
+   elsewhere in the compiler).  */
 
 static int
 special_rtx (idx)
@@ -189,6 +208,7 @@ special_rtx (idx)
   return (strcmp (defs[idx].enumname, "CONST_INT") == 0
          || strcmp (defs[idx].enumname, "CONST_DOUBLE") == 0
          || strcmp (defs[idx].enumname, "REG") == 0
+         || strcmp (defs[idx].enumname, "SUBREG") == 0
          || strcmp (defs[idx].enumname, "MEM") == 0);
 }
 
@@ -302,10 +322,7 @@ gendef (format)
      the memory and initializes it.  */
   puts ("{");
   puts ("  rtx rt;");
-  puts ("  if (ggc_p)");
-  printf ("    rt = ggc_alloc_rtx (%d);\n", (int) strlen (format));
-  puts ("  else");
-  printf ("    rt = obstack_alloc_rtx (%d);\n", (int) strlen (format));
+  printf ("  rt = ggc_alloc_rtx (%d);\n", (int) strlen (format));
 
   puts ("  memset (rt, 0, sizeof (struct rtx_def) - sizeof (rtunion));\n");
   puts ("  PUT_CODE (rt, code);");
@@ -335,7 +352,10 @@ genheader ()
 {
   int i;
   const char **fmt;
-  
+
+  puts ("#ifndef GCC_GENRTL_H");
+  puts ("#define GCC_GENRTL_H\n");
+
   for (fmt = formats; *fmt; ++fmt)
     gendecl (*fmt);
 
@@ -344,6 +364,8 @@ genheader ()
   for (i = 0; i < NUM_RTX_CODE; i++)
     if (! special_format (defs[i].format))
       genmacro (i);
+
+  puts ("\n#endif /* GCC_GENRTL_H */");
 }
 
 /* Generate the text of the code file we write, genrtl.c.  */
@@ -362,7 +384,7 @@ gencode ()
   puts ("#define obstack_alloc_rtx(n)                                  \\");
   puts ("    ((rtx) obstack_alloc (rtl_obstack,                                \\");
   puts ("                        sizeof (struct rtx_def)               \\");
-  puts ("                        + ((n) - 2) * sizeof (rtunion)))\n");
+  puts ("                        + ((n) - 1) * sizeof (rtunion)))\n");
 
   for (fmt = formats; *fmt != 0; fmt++)
     gendef (*fmt);
@@ -373,7 +395,7 @@ PTR
 xmalloc (nbytes)
   size_t nbytes;
 {
-  register PTR tmp = (PTR) malloc (nbytes);
+  register PTR tmp = (PTR) really_call_malloc (nbytes);
 
   if (!tmp)
     {
@@ -404,6 +426,8 @@ main (argc, argv)
   else
     gencode ();
 
-  fflush (stdout);
-  return (ferror (stdout) != 0 ? FATAL_EXIT_CODE : SUCCESS_EXIT_CODE);
+  if (ferror (stdout) || fflush (stdout) || fclose (stdout))
+    return FATAL_EXIT_CODE;
+
+  return SUCCESS_EXIT_CODE;
 }