OSDN Git Service
(root)
/
pf3gnuchains
/
gcc-fork.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2005-10-28 Andrew Pinski <pinskia@physics.uc.edu>
[pf3gnuchains/gcc-fork.git]
/
gcc
/
gen-protos.c
diff --git
a/gcc/gen-protos.c
b/gcc/gen-protos.c
index
d950257
..
388356a
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.
/* gen-protos.c - massages a list of prototypes, for use by fixproto.
- Copyright (C) 1993, 94-96, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1993, 1994, 1995, 1996, 1998,
+ 1999, 2003, 2004, 2005 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
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
@@
-13,51
+14,40
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+Foundation, 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
-#include "
h
config.h"
+#include "
b
config.h"
#include "system.h"
#include "system.h"
+#include "coretypes.h"
+#include "tm.h"
#include "scan.h"
#include "scan.h"
-#include "cpplib.h"
-#include "cpphash.h"
+#include "errors.h"
int verbose = 0;
int verbose = 0;
-char *progname;
+
+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;
#define HASH_SIZE 2503 /* a prime */
int hash_tab[HASH_SIZE];
int next_index;
-
-int
-hashf (name, len, hashsize)
- register const 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
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 !! */
{
int i, i0;
/* NOTE: If you edit this, also edit lookup_std_proto in fix-header.c !! */
- i = hash
f (fname, strlen (fname), HASH_SIZE)
;
+ i = hash
str (fname, strlen (fname)) % HASH_SIZE
;
i0 = i;
if (hash_tab[i] != 0)
{
i0 = i;
if (hash_tab[i] != 0)
{
+ collisions++;
for (;;)
{
i = (i+1) % HASH_SIZE;
for (;;)
{
i = (i+1) % HASH_SIZE;
- if (i == i0)
- abort ();
+ gcc_assert (i != i0);
if (hash_tab[i] == 0)
break;
}
if (hash_tab[i] == 0)
break;
}
@@
-74,11
+64,9
@@
add_hash (fname)
The fields of FN point to the input string. */
static int
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;
int param_nesting = 1;
char *param_start, *param_end, *decl_start, *name_start, *name_end;
@@
-118,7
+106,8
@@
parse_fn_proto (start, end, fn)
}
name_end = ptr+1;
}
name_end = ptr+1;
- while (ISALNUM ((unsigned char)*ptr) || *ptr == '_') --ptr;
+ while (ISIDNUM (*ptr))
+ --ptr;
name_start = ptr+1;
while (*ptr == ' ' || *ptr == '\t') ptr--;
ptr[1] = 0;
name_start = ptr+1;
while (*ptr == ' ' || *ptr == '\t') ptr--;
ptr[1] = 0;
@@
-138,9
+127,7
@@
parse_fn_proto (start, end, fn)
}
int
}
int
-main (argc, argv)
- int argc ATTRIBUTE_UNUSED;
- char **argv;
+main (int argc ATTRIBUTE_UNUSED, char **argv)
{
FILE *inf = stdin;
FILE *outf = stdout;
{
FILE *inf = stdin;
FILE *outf = stdout;
@@
-152,6
+139,9
@@
main (argc, argv)
while (i > 0 && argv[0][i-1] != '/') --i;
progname = &argv[0][i];
while (i > 0 && argv[0][i-1] != '/') --i;
progname = &argv[0][i];
+ /* Unlock the stdio streams. */
+ unlock_std_streams ();
+
INIT_SSTRING (&linebuf);
fprintf (outf, "struct fn_decl std_protos[] = {\n");
INIT_SSTRING (&linebuf);
fprintf (outf, "struct fn_decl std_protos[] = {\n");
@@
-159,7
+149,7
@@
main (argc, argv)
/* A hash table entry of 0 means "unused" so reserve it. */
fprintf (outf, " {\"\", \"\", \"\", 0},\n");
next_index = 1;
/* A hash table entry of 0 means "unused" so reserve it. */
fprintf (outf, " {\"\", \"\", \"\", 0},\n");
next_index = 1;
-
+
for (;;)
{
int c = skip_spaces (inf, ' ');
for (;;)
{
int c = skip_spaces (inf, ' ');
@@
-194,23
+184,8
@@
main (argc, argv)
fprintf (outf, " %d,\n", hash_tab[i]);
fprintf (outf, "};\n");
fprintf (outf, " %d,\n", hash_tab[i]);
fprintf (outf, "};\n");
- return 0;
-}
-
-/* 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 ();
-}
+ fprintf (stderr, "gen-protos: %d entries %d collisions\n",
+ next_index, collisions);
-void
-fatal (s)
- char *s;
-{
- fprintf (stderr, "%s: %s\n", "gen-protos", s);
- exit (FATAL_EXIT_CODE);
+ return 0;
}
}