Gcc 3.4.2 20040728.

1 files changed, 74 insertions, 104 deletions

diff --git a/contrib/gcc/gensupport.c b/contrib/gcc/gensupport.c
index 53172dd..44e07eb 100644
--- a/contrib/gcc/gensupport.c
+++ b/contrib/gcc/gensupport.c
@@ -1,5 +1,6 @@
 /* Support routines for the various generation passes.
-   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004
+   Free Software Foundation, Inc.
 
    This file is part of GCC.
 
@@ -18,8 +19,10 @@
    Software Foundation, 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
-#include "hconfig.h"
+#include "bconfig.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 #include "rtl.h"
 #include "obstack.h"
 #include "errors.h"
@@ -66,8 +69,8 @@ static struct queue_elem **define_cond_exec_tail = &define_cond_exec_queue;
 static struct queue_elem *other_queue;
 static struct queue_elem **other_tail = &other_queue;
 
-static void queue_pattern PARAMS ((rtx, struct queue_elem ***,
-				   const char *, int));
+static void queue_pattern (rtx, struct queue_elem ***,
+			   const char *, int);
 
 /* Current maximum length of directory names in the search path
    for include files.  (Altered as we get more of them.)  */
@@ -85,46 +88,45 @@ struct file_name_list *first_dir_md_include = 0;  /* First dir to search */
 struct file_name_list *first_bracket_include = 0;
 struct file_name_list *last_dir_md_include = 0;        /* Last in chain */
 
-static void remove_constraints PARAMS ((rtx));
-static void process_rtx PARAMS ((rtx, int));
-
-static int is_predicable PARAMS ((struct queue_elem *));
-static void identify_predicable_attribute PARAMS ((void));
-static int n_alternatives PARAMS ((const char *));
-static void collect_insn_data PARAMS ((rtx, int *, int *));
-static rtx alter_predicate_for_insn PARAMS ((rtx, int, int, int));
-static const char *alter_test_for_insn PARAMS ((struct queue_elem *,
-						struct queue_elem *));
-static char *shift_output_template PARAMS ((char *, const char *, int));
-static const char *alter_output_for_insn PARAMS ((struct queue_elem *,
-						  struct queue_elem *,
-						  int, int));
-static void process_one_cond_exec PARAMS ((struct queue_elem *));
-static void process_define_cond_exec PARAMS ((void));
-static void process_include PARAMS ((rtx, int));
-static char *save_string PARAMS ((const char *, int));
+static void remove_constraints (rtx);
+static void process_rtx (rtx, int);
+
+static int is_predicable (struct queue_elem *);
+static void identify_predicable_attribute (void);
+static int n_alternatives (const char *);
+static void collect_insn_data (rtx, int *, int *);
+static rtx alter_predicate_for_insn (rtx, int, int, int);
+static const char *alter_test_for_insn (struct queue_elem *,
+					struct queue_elem *);
+static char *shift_output_template (char *, const char *, int);
+static const char *alter_output_for_insn (struct queue_elem *,
+					  struct queue_elem *,
+					  int, int);
+static void process_one_cond_exec (struct queue_elem *);
+static void process_define_cond_exec (void);
+static void process_include (rtx, int);
+static char *save_string (const char *, int);
 
 void
-message_with_line VPARAMS ((int lineno, const char *msg, ...))
+message_with_line (int lineno, const char *msg, ...)
 {
-  VA_OPEN (ap, msg);
-  VA_FIXEDARG (ap, int, lineno);
-  VA_FIXEDARG (ap, const char *, msg);
+  va_list ap;
+
+  va_start (ap, msg);
 
   fprintf (stderr, "%s:%d: ", read_rtx_filename, lineno);
   vfprintf (stderr, msg, ap);
   fputc ('\n', stderr);
 
-  VA_CLOSE (ap);
+  va_end (ap);
 }
 
 /* Make a version of gen_rtx_CONST_INT so that GEN_INT can be used in
    the gensupport programs.  */
 
 rtx
-gen_rtx_CONST_INT (mode, arg)
-     enum machine_mode mode ATTRIBUTE_UNUSED;
-     HOST_WIDE_INT arg;
+gen_rtx_CONST_INT (enum machine_mode mode ATTRIBUTE_UNUSED,
+		   HOST_WIDE_INT arg)
 {
   rtx rt = rtx_alloc (CONST_INT);
 
@@ -135,13 +137,10 @@ gen_rtx_CONST_INT (mode, arg)
 /* Queue PATTERN on LIST_TAIL.  */
 
 static void
-queue_pattern (pattern, list_tail, filename, lineno)
-     rtx pattern;
-     struct queue_elem ***list_tail;
-     const char *filename;
-     int lineno;
+queue_pattern (rtx pattern, struct queue_elem ***list_tail,
+	       const char *filename, int lineno)
 {
-  struct queue_elem *e = (struct queue_elem *) xmalloc (sizeof (*e));
+  struct queue_elem *e = xmalloc (sizeof (*e));
   e->data = pattern;
   e->filename = filename;
   e->lineno = lineno;
@@ -153,8 +152,7 @@ queue_pattern (pattern, list_tail, filename, lineno)
 /* Recursively remove constraints from an rtx.  */
 
 static void
-remove_constraints (part)
-     rtx part;
+remove_constraints (rtx part)
 {
   int i, j;
   const char *format_ptr;
@@ -184,13 +182,11 @@ remove_constraints (part)
       }
 }
 
-/* Process an include file assuming that it lives in gcc/config/{target}/ 
+/* Process an include file assuming that it lives in gcc/config/{target}/
    if the include looks like (include "file").  */
 
 static void
-process_include (desc, lineno)
-     rtx desc;
-     int lineno;
+process_include (rtx desc, int lineno)
 {
   const char *filename = XSTR (desc, 0);
   const char *old_filename;
@@ -199,7 +195,7 @@ process_include (desc, lineno)
   FILE *input_file;
 
   /* If specified file name is absolute, skip the include stack.  */
-  if (! IS_ABSOLUTE_PATHNAME (filename))
+  if (! IS_ABSOLUTE_PATH (filename))
     {
       struct file_name_list *stackp;
 
@@ -210,7 +206,7 @@ process_include (desc, lineno)
 
 	  pathname = concat (stackp->fname, sep, filename, NULL);
 	  input_file = fopen (pathname, "r");
-	  if (input_file != NULL) 
+	  if (input_file != NULL)
 	    goto success;
 	  free (pathname);
 	}
@@ -263,12 +259,10 @@ process_include (desc, lineno)
   fclose (input_file);
 }
 
-/* Process a top level rtx in some way, queueing as appropriate.  */
+/* Process a top level rtx in some way, queuing as appropriate.  */
 
 static void
-process_rtx (desc, lineno)
-     rtx desc;
-     int lineno;
+process_rtx (rtx desc, int lineno)
 {
   switch (GET_CODE (desc))
     {
@@ -336,8 +330,7 @@ process_rtx (desc, lineno)
    a DEFINE_INSN.  */
 
 static int
-is_predicable (elem)
-     struct queue_elem *elem;
+is_predicable (struct queue_elem *elem)
 {
   rtvec vec = XVEC (elem->data, 4);
   const char *value;
@@ -425,7 +418,7 @@ is_predicable (elem)
    and its default.  */
 
 static void
-identify_predicable_attribute ()
+identify_predicable_attribute (void)
 {
   struct queue_elem *elem;
   char *p_true, *p_false;
@@ -492,8 +485,7 @@ identify_predicable_attribute ()
 /* Return the number of alternatives in constraint S.  */
 
 static int
-n_alternatives (s)
-     const char *s;
+n_alternatives (const char *s)
 {
   int n = 1;
 
@@ -508,9 +500,7 @@ n_alternatives (s)
    operands.  */
 
 static void
-collect_insn_data (pattern, palt, pmax)
-     rtx pattern;
-     int *palt, *pmax;
+collect_insn_data (rtx pattern, int *palt, int *pmax)
 {
   const char *fmt;
   enum rtx_code code;
@@ -522,7 +512,7 @@ collect_insn_data (pattern, palt, pmax)
     case MATCH_OPERAND:
       i = n_alternatives (XSTR (pattern, 2));
       *palt = (i > *palt ? i : *palt);
-      /* FALLTHRU */
+      /* Fall through.  */
 
     case MATCH_OPERATOR:
     case MATCH_SCRATCH:
@@ -550,7 +540,7 @@ collect_insn_data (pattern, palt, pmax)
 	case 'V':
 	  if (XVEC (pattern, i) == NULL)
 	    break;
-	  /* FALLTHRU */
+	  /* Fall through.  */
 	case 'E':
 	  for (j = XVECLEN (pattern, i) - 1; j >= 0; --j)
 	    collect_insn_data (XVECEXP (pattern, i, j), palt, pmax);
@@ -566,9 +556,7 @@ collect_insn_data (pattern, palt, pmax)
 }
 
 static rtx
-alter_predicate_for_insn (pattern, alt, max_op, lineno)
-     rtx pattern;
-     int alt, max_op, lineno;
+alter_predicate_for_insn (rtx pattern, int alt, int max_op, int lineno)
 {
   const char *fmt;
   enum rtx_code code;
@@ -595,7 +583,7 @@ alter_predicate_for_insn (pattern, alt, max_op, lineno)
 	  {
 	    size_t c_len = strlen (c);
 	    size_t len = alt * (c_len + 1);
-	    char *new_c = (char *) xmalloc (len);
+	    char *new_c = xmalloc (len);
 
 	    memcpy (new_c, c, c_len);
 	    for (i = 1; i < alt; ++i)
@@ -607,7 +595,7 @@ alter_predicate_for_insn (pattern, alt, max_op, lineno)
 	    XSTR (pattern, 2) = new_c;
 	  }
       }
-      /* FALLTHRU */
+      /* Fall through.  */
 
     case MATCH_OPERATOR:
     case MATCH_SCRATCH:
@@ -657,8 +645,8 @@ alter_predicate_for_insn (pattern, alt, max_op, lineno)
 }
 
 static const char *
-alter_test_for_insn (ce_elem, insn_elem)
-     struct queue_elem *ce_elem, *insn_elem;
+alter_test_for_insn (struct queue_elem *ce_elem,
+		     struct queue_elem *insn_elem)
 {
   const char *ce_test, *insn_test;
 
@@ -677,10 +665,7 @@ alter_test_for_insn (ce_elem, insn_elem)
    adjusted string.  */
 
 static char *
-shift_output_template (new, old, disp)
-     char *new;
-     const char *old;
-     int disp;
+shift_output_template (char *new, const char *old, int disp)
 {
   while (*old)
     {
@@ -704,9 +689,9 @@ shift_output_template (new, old, disp)
 }
 
 static const char *
-alter_output_for_insn (ce_elem, insn_elem, alt, max_op)
-     struct queue_elem *ce_elem, *insn_elem;
-     int alt, max_op;
+alter_output_for_insn (struct queue_elem *ce_elem,
+		       struct queue_elem *insn_elem,
+		       int alt, int max_op)
 {
   const char *ce_out, *insn_out;
   char *new, *p;
@@ -766,8 +751,7 @@ alter_output_for_insn (ce_elem, insn_elem, alt, max_op)
 /* Replicate insns as appropriate for the given DEFINE_COND_EXEC.  */
 
 static void
-process_one_cond_exec (ce_elem)
-     struct queue_elem *ce_elem;
+process_one_cond_exec (struct queue_elem *ce_elem)
 {
   struct queue_elem *insn_elem;
   for (insn_elem = define_insn_queue; insn_elem ; insn_elem = insn_elem->next)
@@ -843,7 +827,7 @@ process_one_cond_exec (ce_elem)
    patterns appropriately.  */
 
 static void
-process_define_cond_exec ()
+process_define_cond_exec (void)
 {
   struct queue_elem *elem;
 
@@ -856,11 +840,9 @@ process_define_cond_exec ()
 }
 
 static char *
-save_string (s, len)
-     const char *s;
-     int len;
+save_string (const char *s, int len)
 {
-  register char *result = xmalloc (len + 1);
+  char *result = xmalloc (len + 1);
 
   memcpy (result, s, len);
   result[len] = 0;
@@ -871,9 +853,7 @@ save_string (s, len)
 /* The entry point for initializing the reader.  */
 
 int
-init_md_reader_args (argc, argv)
-     int argc;
-     char **argv;
+init_md_reader_args (int argc, char **argv)
 {
   int i;
   const char *in_fname;
@@ -896,8 +876,7 @@ init_md_reader_args (argc, argv)
 	      {
 		struct file_name_list *dirtmp;
 
-		dirtmp = (struct file_name_list *)
-		  xmalloc (sizeof (struct file_name_list));
+		dirtmp = xmalloc (sizeof (struct file_name_list));
 		dirtmp->next = 0;	/* New one goes on the end */
 		if (first_dir_md_include == 0)
 		  first_dir_md_include = dirtmp;
@@ -926,8 +905,7 @@ init_md_reader_args (argc, argv)
 /* The entry point for initializing the reader.  */
 
 int
-init_md_reader (filename)
-     const char *filename;
+init_md_reader (const char *filename)
 {
   FILE *input_file;
   int c;
@@ -935,7 +913,7 @@ init_md_reader (filename)
   char *lastsl;
 
   lastsl = strrchr (filename, '/');
-  if (lastsl != NULL) 
+  if (lastsl != NULL)
     base_dir = save_string (filename, lastsl - filename + 1 );
 
   read_rtx_filename = filename;
@@ -951,8 +929,8 @@ init_md_reader (filename)
 				 hash_c_test, cmp_c_test, NULL);
 
   for (i = 0; i < n_insn_conditions; i++)
-    *(htab_find_slot (condition_table, (PTR) &insn_conditions[i], INSERT))
-      = (PTR) &insn_conditions[i];
+    *(htab_find_slot (condition_table, &insn_conditions[i], INSERT))
+      = (void *) &insn_conditions[i];
 
   obstack_init (rtl_obstack);
   errors = 0;
@@ -985,9 +963,7 @@ init_md_reader (filename)
 /* The entry point for reading a single rtx from an md file.  */
 
 rtx
-read_md_rtx (lineno, seqnr)
-     int *lineno;
-     int *seqnr;
+read_md_rtx (int *lineno, int *seqnr)
 {
   struct queue_elem **queue, *elem;
   rtx desc;
@@ -1050,8 +1026,7 @@ read_md_rtx (lineno, seqnr)
 /* Compute a hash function of a c_test structure, which is keyed
    by its ->expr field.  */
 hashval_t
-hash_c_test (x)
-     const PTR x;
+hash_c_test (const void *x)
 {
   const struct c_test *a = (const struct c_test *) x;
   const unsigned char *base, *s = (const unsigned char *) a->expr;
@@ -1077,9 +1052,7 @@ hash_c_test (x)
 
 /* Compare two c_test expression structures.  */
 int
-cmp_c_test (x, y)
-     const PTR x;
-     const PTR y;
+cmp_c_test (const void *x, const void *y)
 {
   const struct c_test *a = (const struct c_test *) x;
   const struct c_test *b = (const struct c_test *) y;
@@ -1092,8 +1065,7 @@ cmp_c_test (x, y)
    at compile time.  Returns a tristate: 1 for known true, 0 for
    known false, -1 for unknown.  */
 int
-maybe_eval_c_test (expr)
-     const char *expr;
+maybe_eval_c_test (const char *expr)
 {
   const struct c_test *test;
   struct c_test dummy;
@@ -1105,7 +1077,7 @@ maybe_eval_c_test (expr)
     return -1;
 
   dummy.expr = expr;
-  test = (const struct c_test *) htab_find (condition_table, &dummy);
+  test = htab_find (condition_table, &dummy);
   if (!test)
     abort ();
 
@@ -1115,8 +1087,7 @@ maybe_eval_c_test (expr)
 /* Given a string, return the number of comma-separated elements in it.
    Return 0 for the null string.  */
 int
-n_comma_elts (s)
-     const char *s;
+n_comma_elts (const char *s)
 {
   int n;
 
@@ -1137,8 +1108,7 @@ n_comma_elts (s)
    a comma and an element is ignored.  */
 
 const char *
-scan_comma_elt (pstr)
-     const char **pstr;
+scan_comma_elt (const char **pstr)
 {
   const char *start;
   const char *p = *pstr;