* config/alpha/alpha.c (alpha_sa_size): Force procedure type to

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

diff --git a/gcc/genoutput.c b/gcc/genoutput.c
index 4eac581..e651cb4 100644 (file)
--- a/gcc/genoutput.c
+++ b/gcc/genoutput.c
@@ -1,12 +1,12 @@
 /* Generate code from to output assembler insns as recognized from rtl.
    Copyright (C) 1987, 1988, 1992, 1994, 1995, 1997, 1998, 1999, 2000, 2002,
 /* Generate code from to output assembler insns as recognized from rtl.
    Copyright (C) 1987, 1988, 1992, 1994, 1995, 1997, 1998, 1999, 2000, 2002,

-   2003, 2004, 2005 Free Software Foundation, Inc.
+   2003, 2004, 2005, 2007, 2008 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
 
 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, 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */

 
 
 /* This program reads the machine description for the compiler target machine
 
 
 /* This program reads the machine description for the compiler target machine


@@ -155,7 +154,7 @@ struct data
 {
   struct data *next;
   const char *name;
 {
   struct data *next;
   const char *name;

-  const char *template;
+  const char *template_code;

   int code_number;
   int index_number;
   const char *filename;
   int code_number;
   int index_number;
   const char *filename;


@@ -244,6 +243,7 @@ output_prologue (void)
   printf ("#include \"toplev.h\"\n");
   printf ("#include \"output.h\"\n");
   printf ("#include \"target.h\"\n");
   printf ("#include \"toplev.h\"\n");
   printf ("#include \"output.h\"\n");
   printf ("#include \"target.h\"\n");

+  printf ("#include \"tm-constrs.h\"\n");

 }
 
 static void
 }
 
 static void


@@ -336,7 +336,7 @@ output_insn_data (void)
          break;
        case INSN_OUTPUT_FORMAT_SINGLE:
          {
          break;
        case INSN_OUTPUT_FORMAT_SINGLE:
          {

-           const char *p = d->template;
+           const char *p = d->template_code;

            char prev = 0;
 
            printf ("#if HAVE_DESIGNATED_INITIALIZERS\n");
            char prev = 0;
 
            printf ("#if HAVE_DESIGNATED_INITIALIZERS\n");


@@ -656,36 +656,36 @@ place_operands (struct data *d)
    templates, or C code to generate the assembler code template.  */
 
 static void
    templates, or C code to generate the assembler code template.  */
 
 static void

-process_template (struct data *d, const char *template)
+process_template (struct data *d, const char *template_code)

 {
   const char *cp;
   int i;
 
   /* Templates starting with * contain straight code to be run.  */
 {
   const char *cp;
   int i;
 
   /* Templates starting with * contain straight code to be run.  */

-  if (template[0] == '*')
+  if (template_code[0] == '*')

     {
     {

-      d->template = 0;
+      d->template_code = 0;

       d->output_format = INSN_OUTPUT_FORMAT_FUNCTION;
 
       puts ("\nstatic const char *");
       printf ("output_%d (rtx *operands ATTRIBUTE_UNUSED, rtx insn ATTRIBUTE_UNUSED)\n",
              d->code_number);
       puts ("{");
       d->output_format = INSN_OUTPUT_FORMAT_FUNCTION;
 
       puts ("\nstatic const char *");
       printf ("output_%d (rtx *operands ATTRIBUTE_UNUSED, rtx insn ATTRIBUTE_UNUSED)\n",
              d->code_number);
       puts ("{");

-      print_rtx_ptr_loc (template);
-      puts (template + 1);
+      print_rtx_ptr_loc (template_code);
+      puts (template_code + 1);

       puts ("}");
     }
 
   /* If the assembler code template starts with a @ it is a newline-separated
      list of assembler code templates, one for each alternative.  */
       puts ("}");
     }
 
   /* If the assembler code template starts with a @ it is a newline-separated
      list of assembler code templates, one for each alternative.  */

-  else if (template[0] == '@')
+  else if (template_code[0] == '@')

     {
     {

-      d->template = 0;
+      d->template_code = 0;

       d->output_format = INSN_OUTPUT_FORMAT_MULTI;
 
       printf ("\nstatic const char * const output_%d[] = {\n", d->code_number);
 
       d->output_format = INSN_OUTPUT_FORMAT_MULTI;
 
       printf ("\nstatic const char * const output_%d[] = {\n", d->code_number);
 

-      for (i = 0, cp = &template[1]; *cp; )
+      for (i = 0, cp = &template_code[1]; *cp; )

        {
          const char *ep, *sp;
 
        {
          const char *ep, *sp;
 


@@ -725,7 +725,7 @@ process_template (struct data *d, const char *template)
     }
   else
     {
     }
   else
     {

-      d->template = template;
+      d->template_code = template_code;

       d->output_format = INSN_OUTPUT_FORMAT_SINGLE;
     }
 }
       d->output_format = INSN_OUTPUT_FORMAT_SINGLE;
     }
 }


@@ -830,6 +830,22 @@ validate_insn_operands (struct data *d)
        have_error = 1;
       }
 }
        have_error = 1;
       }
 }

+
+static void
+validate_optab_operands (struct data *d)
+{
+  if (!d->name || d->name[0] == '\0' || d->name[0] == '*')
+    return;
+
+  /* Miscellaneous tests.  */
+  if (strncmp (d->name, "cstore", 6) == 0
+      && d->name[strlen (d->name) - 1] == '4'
+      && d->operand[0].mode == VOIDmode)
+    {
+      message_with_line (d->lineno, "missing mode for operand 0 of cstore");
+      have_error = 1;
+    }
+}

 \f
 /* Look at a define_insn just read.  Assign its code number.  Record
    on idata the template and the number of arguments.  If the insn has
 \f
 /* Look at a define_insn just read.  Assign its code number.  Record
    on idata the template and the number of arguments.  If the insn has


@@ -871,6 +887,7 @@ gen_insn (rtx insn, int lineno)
 #endif
   validate_insn_operands (d);
   validate_insn_alternatives (d);
 #endif
   validate_insn_operands (d);
   validate_insn_alternatives (d);

+  validate_optab_operands (d);

   place_operands (d);
   process_template (d, XTMPL (insn, 3));
 }
   place_operands (d);
   process_template (d, XTMPL (insn, 3));
 }


@@ -952,10 +969,11 @@ gen_expand (rtx insn, int lineno)
 
   d->n_operands = max_opno + 1;
   d->n_dups = num_dups;
 
   d->n_operands = max_opno + 1;
   d->n_dups = num_dups;

-  d->template = 0;
+  d->template_code = 0;

   d->output_format = INSN_OUTPUT_FORMAT_NONE;
 
   validate_insn_alternatives (d);
   d->output_format = INSN_OUTPUT_FORMAT_NONE;
 
   validate_insn_alternatives (d);

+  validate_optab_operands (d);

   place_operands (d);
 }
 \f
   place_operands (d);
 }
 \f


@@ -993,7 +1011,7 @@ gen_split (rtx split, int lineno)
   d->n_operands = max_opno + 1;
   d->n_dups = 0;
   d->n_alternatives = 0;
   d->n_operands = max_opno + 1;
   d->n_dups = 0;
   d->n_alternatives = 0;

-  d->template = 0;
+  d->template_code = 0;

   d->output_format = INSN_OUTPUT_FORMAT_NONE;
 
   place_operands (d);
   d->output_format = INSN_OUTPUT_FORMAT_NONE;
 
   place_operands (d);


@@ -1120,9 +1138,12 @@ note_constraint (rtx exp, int lineno)
 {
   const char *name = XSTR (exp, 0);
   unsigned int namelen = strlen (name);
 {
   const char *name = XSTR (exp, 0);
   unsigned int namelen = strlen (name);

-  struct constraint_data **iter, **slot, *new;
+  struct constraint_data **iter, **slot, *new_cdata;

 
 

-  if (strchr (indep_constraints, name[0]))
+  /* The 'm' constraint is special here since that constraint letter
+     can be overridden by the back end by defining the
+     TARGET_MEM_CONSTRAINT macro.  */
+  if (strchr (indep_constraints, name[0]) && name[0] != 'm')

     {
       if (name[1] == '\0')
        message_with_line (lineno, "constraint letter '%s' cannot be "
     {
       if (name[1] == '\0')
        message_with_line (lineno, "constraint letter '%s' cannot be "


@@ -1170,12 +1191,12 @@ note_constraint (rtx exp, int lineno)
          return;
        }
     }
          return;
        }
     }

-  new = xmalloc (sizeof (struct constraint_data) + namelen);
-  strcpy ((char *)new + offsetof(struct constraint_data, name), name);
-  new->namelen = namelen;
-  new->lineno = lineno;
-  new->next_this_letter = *slot;
-  *slot = new;
+  new_cdata = XNEWVAR (struct constraint_data, sizeof (struct constraint_data) + namelen);
+  strcpy ((char *)new_cdata + offsetof(struct constraint_data, name), name);
+  new_cdata->namelen = namelen;
+  new_cdata->lineno = lineno;
+  new_cdata->next_this_letter = *slot;
+  *slot = new_cdata;

 }
 
 /* Return the length of the constraint name beginning at position S
 }
 
 /* Return the length of the constraint name beginning at position S