2010-04-29 Brian Hackett <bhackett1024@gmail.com>

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

diff --git a/gcc/gengenrtl.c b/gcc/gengenrtl.c
index 39f1dc2..149e54b 100644 (file)
--- a/gcc/gengenrtl.c
+++ b/gcc/gengenrtl.c
@@ -1,12 +1,12 @@
 /* Generate code to allocate RTL structures.
 /* Generate code to allocate RTL structures.

-   Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003
+   Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2007

    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
    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

-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 +15,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, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */

 
 
 #include "bconfig.h"
 
 
 #include "bconfig.h"


@@ -77,14 +76,12 @@ type_from_format (int c)
 
     case 'E':
       return "rtvec ";
 
     case 'E':
       return "rtvec ";

-    case 'b':
-      return "struct bitmap_head_def *";  /* bitmap - typedef not available */

     case 't':
       return "union tree_node *";  /* tree - typedef not available */
     case 'B':
       return "struct basic_block_def *";  /* basic block - typedef not available */
     default:
     case 't':
       return "union tree_node *";  /* tree - typedef not available */
     case 'B':
       return "struct basic_block_def *";  /* basic block - typedef not available */
     default:

-      abort ();
+      gcc_unreachable ();

     }
 }
 
     }
 }
 


@@ -110,9 +107,6 @@ accessor_from_format (int c)
     case 'E':
       return "XVEC";
 
     case 'E':
       return "XVEC";
 

-    case 'b':
-      return "XBITMAP";
-

     case 't':
       return "XTREE";
 
     case 't':
       return "XTREE";
 


@@ -120,7 +114,7 @@ accessor_from_format (int c)
       return "XBBDEF";
 
     default:
       return "XBBDEF";
 
     default:

-      abort ();
+      gcc_unreachable ();

     }
 }
 
     }
 }
 


@@ -157,7 +151,8 @@ special_rtx (int idx)
 static int
 excluded_rtx (int idx)
 {
 static int
 excluded_rtx (int idx)
 {

-  return (strcmp (defs[idx].enumname, "CONST_DOUBLE") == 0);
+  return ((strcmp (defs[idx].enumname, "CONST_DOUBLE") == 0)
+         || (strcmp (defs[idx].enumname, "CONST_FIXED") == 0));

 }
 
 /* Place a list of all format specifiers we use into the array FORMAT.  */
 }
 
 /* Place a list of all format specifiers we use into the array FORMAT.  */


@@ -191,7 +186,7 @@ gendecl (const char *format)
   const char *p;
   int i, pos;
 
   const char *p;
   int i, pos;
 

-  printf ("extern rtx gen_rtx_fmt_%s\t (RTX_CODE, ", format);
+  printf ("extern rtx gen_rtx_fmt_%s_stat\t (RTX_CODE, ", format);

   printf ("enum machine_mode mode");
 
   /* Write each parameter that is needed and start a new line when the line
   printf ("enum machine_mode mode");
 
   /* Write each parameter that is needed and start a new line when the line


@@ -208,8 +203,18 @@ gendecl (const char *format)
        printf (" %sarg%d", type_from_format (*p), i++);
        pos += ourlen;
       }
        printf (" %sarg%d", type_from_format (*p), i++);
        pos += ourlen;
       }

+  printf (" MEM_STAT_DECL");

 
   printf (");\n");
 
   printf (");\n");

+  printf ("#define gen_rtx_fmt_%s(c, m", format);
+  for (p = format, i = 0; *p != 0; p++)
+    if (*p != '0')
+      printf (", p%i",i++);
+  printf (")\\\n        gen_rtx_fmt_%s_stat (c, m", format);
+  for (p = format, i = 0; *p != 0; p++)
+    if (*p != '0')
+      printf (", p%i",i++);
+  printf (" MEM_STAT_INFO)\n\n");

 }
 
 /* Generate macros to generate RTL of code IDX using the functions we
 }
 
 /* Generate macros to generate RTL of code IDX using the functions we


@@ -257,21 +262,19 @@ gendef (const char *format)
   /* Start by writing the definition of the function name and the types
      of the arguments.  */
 
   /* Start by writing the definition of the function name and the types
      of the arguments.  */
 

-  printf ("rtx\ngen_rtx_fmt_%s (RTX_CODE code, enum machine_mode mode", format);
+  printf ("rtx\ngen_rtx_fmt_%s_stat (RTX_CODE code, enum machine_mode mode", format);

   for (p = format, i = 0; *p != 0; p++)
     if (*p != '0')
       printf (",\n\t%sarg%d", type_from_format (*p), i++);
 
   for (p = format, i = 0; *p != 0; p++)
     if (*p != '0')
       printf (",\n\t%sarg%d", type_from_format (*p), i++);
 

-  puts (")");
+  puts (" MEM_STAT_DECL)");

 
   /* Now write out the body of the function itself, which allocates
      the memory and initializes it.  */
   puts ("{");
   puts ("  rtx rt;");
 
   /* Now write out the body of the function itself, which allocates
      the memory and initializes it.  */
   puts ("{");
   puts ("  rtx rt;");

-  puts ("  rt = ggc_alloc_rtx (code);\n");
+  puts ("  rt = rtx_alloc_stat (code PASS_MEM_STAT);\n");

 
 

-  puts ("  memset (rt, 0, RTX_HDR_SIZE);\n");
-  puts ("  PUT_CODE (rt, code);");

   puts ("  PUT_MODE (rt, mode);");
 
   for (p = format, i = j = 0; *p ; ++p, ++i)
   puts ("  PUT_MODE (rt, mode);");
 
   for (p = format, i = j = 0; *p ; ++p, ++i)


@@ -301,6 +304,7 @@ genheader (void)
 
   puts ("#ifndef GCC_GENRTL_H");
   puts ("#define GCC_GENRTL_H\n");
 
   puts ("#ifndef GCC_GENRTL_H");
   puts ("#define GCC_GENRTL_H\n");

+  puts ("#include \"statistics.h\"\n");

 
   for (fmt = formats; *fmt; ++fmt)
     gendecl (*fmt);
 
   for (fmt = formats; *fmt; ++fmt)
     gendecl (*fmt);