* config/vax/vax.h (target_flags, MASK_UNIX_ASM, MASK_VAXC_ALIGNMENT)

[pf3gnuchains/gcc-fork.git] / gcc / gen-protos.c

diff --git a/gcc/gen-protos.c b/gcc/gen-protos.c
index 47cf87e..b8fa31b 100644 (file)
--- a/gcc/gen-protos.c
+++ b/gcc/gen-protos.c
@@ -1,5 +1,6 @@
 /* gen-protos.c - massages a list of prototypes, for use by fixproto.
-   Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 1996, 1998,
+   1999, 2003, 2004 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -15,59 +16,38 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#include <stdio.h>
-#include <ctype.h>
-#include "hconfig.h"
+#include "bconfig.h"
+#include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 #include "scan.h"
-#include "cpplib.h"
-#include "cpphash.h"
+#include "errors.h"
 
 int verbose = 0;
-char *progname;
 
-/* Table of prototypes that override sys-protos.h.  */
-static char *overrides[] =
-{
-#ifdef SYS_PROTO_OVERRIDES
-  SYS_PROTO_OVERRIDES
-#endif
-  0
-};
+static void add_hash (const char *);
+static int parse_fn_proto (char *, char *, struct fn_decl *);
 
 #define HASH_SIZE 2503 /* a prime */
 int hash_tab[HASH_SIZE];
 int next_index;
-
-static int
-hashf (name, len, hashsize)
-     register U_CHAR *name;
-     register int len;
-     int hashsize;
-{
-  register int r = 0;
-
-  while (len--)
-    r = HASHSTEP (r, *name++);
-
-  return MAKE_POS (r) % hashsize;
-}
+int collisions;
 
 static void
-add_hash (fname)
-     char *fname;
+add_hash (const char *fname)
 {
   int i, i0;
 
   /* NOTE:  If you edit this, also edit lookup_std_proto in fix-header.c !! */
-  i = hashf (fname, strlen (fname), HASH_SIZE);
+  i = hashstr (fname, strlen (fname)) % HASH_SIZE;
   i0 = i;
   if (hash_tab[i] != 0)
     {
+      collisions++;
       for (;;)
        {
          i = (i+1) % HASH_SIZE;
-         if (i == i0)
-           abort ();
+         gcc_assert (i != i0);
          if (hash_tab[i] == 0)
            break;
        }
@@ -84,11 +64,9 @@ add_hash (fname)
    The fields of FN point to the input string.  */
 
 static int
-parse_fn_proto (start, end, fn)
-     char *start, *end;
-     struct fn_decl *fn;
+parse_fn_proto (char *start, char *end, struct fn_decl *fn)
 {
-  register char *ptr;
+  char *ptr;
   int param_nesting = 1;
   char *param_start, *param_end, *decl_start, *name_start, *name_end;
 
@@ -119,7 +97,7 @@ parse_fn_proto (start, end, fn)
   ptr--;
   while (*ptr == ' ' || *ptr == '\t') ptr--;
 
-  if (!isalnum (*ptr))
+  if (!ISALNUM ((unsigned char)*ptr))
     {
       if (verbose)
        fprintf (stderr, "%s: Can't handle this complex prototype: %s\n",
@@ -128,7 +106,8 @@ parse_fn_proto (start, end, fn)
     }
   name_end = ptr+1;
 
-  while (isalnum (*ptr) || *ptr == '_') --ptr;
+  while (ISIDNUM (*ptr))
+    --ptr;
   name_start = ptr+1;
   while (*ptr == ' ' || *ptr == '\t') ptr--;
   ptr[1] = 0;
@@ -148,15 +127,12 @@ parse_fn_proto (start, end, fn)
 }
 
 int
-main (argc, argv)
-     int argc;
-     char **argv;
+main (int argc ATTRIBUTE_UNUSED, char **argv)
 {
   FILE *inf = stdin;
   FILE *outf = stdout;
   int i;
   sstring linebuf;
-  char **optr;
   struct fn_decl fn_decl;
 
   i = strlen (argv[0]);
@@ -168,31 +144,8 @@ main (argc, argv)
   fprintf (outf, "struct fn_decl std_protos[] = {\n");
 
   /* A hash table entry of 0 means "unused" so reserve it.  */
-  fprintf (outf, "  {\"\", \"\", \"\"},\n");
+  fprintf (outf, "  {\"\", \"\", \"\", 0},\n");
   next_index = 1;
-  
-  /* Output the overriding prototypes first so fix-header will use them
-     in preference to the default ones.  */
-  /* ??? Two copies of the prototype are output.  This doesn't cause any
-     problems, but one might wish to avoid outputting the second one.  */
-
-  for (optr = overrides; *optr; ++optr)
-    {
-      /* Using sstring's here may be overkill but parse_fn_proto modifies
-        the input string.  */
-      linebuf.ptr = linebuf.base;
-      make_sstring_space (&linebuf, strlen (*optr) + 1);
-      strcpy (linebuf.base, *optr);
-      linebuf.ptr = linebuf.base + strlen (*optr);
-
-      if (! parse_fn_proto (linebuf.base, linebuf.ptr, &fn_decl))
-       continue;
-
-      add_hash (fn_decl.fname);
-
-      fprintf (outf, "  {\"%s\", \"%s\", \"%s\"},\n",
-              fn_decl.fname, fn_decl.rtype, fn_decl.params);
-    }
 
   for (;;)
     {
@@ -213,13 +166,13 @@ main (argc, argv)
 
       add_hash (fn_decl.fname);
 
-      fprintf (outf, "  {\"%s\", \"%s\", \"%s\"},\n",
+      fprintf (outf, "  {\"%s\", \"%s\", \"%s\", 0},\n",
               fn_decl.fname, fn_decl.rtype, fn_decl.params);
 
       if (c == EOF)
        break;
     }
-  fprintf (outf, "  {0, 0, 0}\n};\n");
+  fprintf (outf, "  {0, 0, 0, 0}\n};\n");
 
 
   fprintf (outf, "#define HASH_SIZE %d\n", HASH_SIZE);
@@ -228,23 +181,8 @@ main (argc, argv)
     fprintf (outf, "  %d,\n", hash_tab[i]);
   fprintf (outf, "};\n");
 
-  return 0;
-}
+  fprintf (stderr, "gen-protos: %d entries %d collisions\n",
+          next_index, collisions);
 
-/* Avoid error if config defines abort as fancy_abort.
-   It's not worth "really" implementing this because ordinary
-   compiler users never run fix-header.  */
-
-void
-fancy_abort ()
-{
-  abort ();
-}
-
-void
-fatal (s)
-     char *s;
-{
-  fprintf (stderr, "%s: %s\n", "gen-protos", s);
-  exit (FATAL_EXIT_CODE);
+  return 0;
 }