Copyright (C) 1995, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
Contributed by Jason Merrill (jason@cygnus.com).
-This file is part of GNU CC.
+This file is part of GCC.
-GNU CC 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 version.
+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
+version.
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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
-along with GNU CC; 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 COPYING. If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA. */
#include "config.h"
#include "system.h"
#include "intl.h"
-#include "hash.h"
+#include "obstack.h"
+#include "hashtab.h"
#include "demangle.h"
#include "collect2.h"
static int tlink_verbose;
\f
-/* Hash table boilerplate for working with hash.[ch]. We have hash tables
+/* Hash table boilerplate for working with htab_t. We have hash tables
for symbol names, file names, and demangled symbols. */
typedef struct symbol_hash_entry
{
- struct hash_entry root;
+ const char *key;
struct file_hash_entry *file;
int chosen;
int tweaking;
typedef struct file_hash_entry
{
- struct hash_entry root;
+ const char *key;
const char *args;
const char *dir;
const char *main;
typedef struct demangled_hash_entry
{
- struct hash_entry root;
+ const char *key;
const char *mangled;
} demangled;
-static struct hash_table symbol_table;
+/* Hash and comparison functions for these hash tables. */
+
+static int hash_string_eq PARAMS ((const void *, const void *));
+static hashval_t hash_string_hash PARAMS ((const void *));
+
+static int
+hash_string_eq (s1_p, s2_p)
+ const void *s1_p;
+ const void *s2_p;
+{
+ const char *const *s1 = (const char *const *)s1_p;
+ const char *s2 = (const char *)s2_p;
+ return strcmp (*s1, s2) == 0;
+}
+
+static hashval_t
+hash_string_hash (s_p)
+ const void *s_p;
+{
+ const char *const *s = (const char *const *)s_p;
+ return (*htab_hash_string) (*s);
+}
+
+static htab_t symbol_table;
-static struct hash_entry * symbol_hash_newfunc PARAMS ((struct hash_entry *,
- struct hash_table *,
- hash_table_key));
static struct symbol_hash_entry * symbol_hash_lookup PARAMS ((const char *,
int));
-static struct hash_entry * file_hash_newfunc PARAMS ((struct hash_entry *,
- struct hash_table *,
- hash_table_key));
static struct file_hash_entry * file_hash_lookup PARAMS ((const char *));
-static struct hash_entry * demangled_hash_newfunc PARAMS ((struct hash_entry *,
- struct hash_table *,
- hash_table_key));
static struct demangled_hash_entry *
demangled_hash_lookup PARAMS ((const char *, int));
static void symbol_push PARAMS ((symbol *));
static void demangle_new_symbols PARAMS ((void));
static int scan_linker_output PARAMS ((const char *));
-/* Create a new entry for the symbol hash table.
- Passed to hash_table_init. */
-
-static struct hash_entry *
-symbol_hash_newfunc (entry, table, string)
- struct hash_entry *entry;
- struct hash_table *table;
- hash_table_key string ATTRIBUTE_UNUSED;
-{
- struct symbol_hash_entry *ret = (struct symbol_hash_entry *) entry;
- if (ret == NULL)
- {
- ret = ((struct symbol_hash_entry *)
- hash_allocate (table, sizeof (struct symbol_hash_entry)));
- if (ret == NULL)
- return NULL;
- }
- ret->file = NULL;
- ret->chosen = 0;
- ret->tweaking = 0;
- ret->tweaked = 0;
- return (struct hash_entry *) ret;
-}
-
/* Look up an entry in the symbol hash table. */
static struct symbol_hash_entry *
const char *string;
int create;
{
- return ((struct symbol_hash_entry *)
- hash_lookup (&symbol_table, (const hash_table_key) string,
- create, string_copy));
-}
-
-static struct hash_table file_table;
-
-/* Create a new entry for the file hash table.
- Passed to hash_table_init. */
-
-static struct hash_entry *
-file_hash_newfunc (entry, table, string)
- struct hash_entry *entry;
- struct hash_table *table;
- hash_table_key string ATTRIBUTE_UNUSED;
-{
- struct file_hash_entry *ret = (struct file_hash_entry *) entry;
- if (ret == NULL)
+ PTR *e;
+ e = htab_find_slot_with_hash (symbol_table, string,
+ (*htab_hash_string)(string),
+ create ? INSERT : NO_INSERT);
+ if (e == NULL)
+ return NULL;
+ if (*e == NULL)
{
- ret = ((struct file_hash_entry *)
- hash_allocate (table, sizeof (struct file_hash_entry)));
- if (ret == NULL)
- return NULL;
+ struct symbol_hash_entry *v;
+ *e = v = xcalloc (1, sizeof (*v));
+ v->key = xstrdup (string);
}
- ret->args = NULL;
- ret->dir = NULL;
- ret->main = NULL;
- ret->tweaking = 0;
- return (struct hash_entry *) ret;
+ return *e;
}
+static htab_t file_table;
+
/* Look up an entry in the file hash table. */
static struct file_hash_entry *
file_hash_lookup (string)
const char *string;
{
- return ((struct file_hash_entry *)
- hash_lookup (&file_table, (const hash_table_key) string, true,
- string_copy));
-}
-
-static struct hash_table demangled_table;
-
-/* Create a new entry for the demangled name hash table.
- Passed to hash_table_init. */
-
-static struct hash_entry *
-demangled_hash_newfunc (entry, table, string)
- struct hash_entry *entry;
- struct hash_table *table;
- hash_table_key string ATTRIBUTE_UNUSED;
-{
- struct demangled_hash_entry *ret = (struct demangled_hash_entry *) entry;
- if (ret == NULL)
+ PTR *e;
+ e = htab_find_slot_with_hash (file_table, string,
+ (*htab_hash_string)(string),
+ INSERT);
+ if (*e == NULL)
{
- ret = ((struct demangled_hash_entry *)
- hash_allocate (table, sizeof (struct demangled_hash_entry)));
- if (ret == NULL)
- return NULL;
+ struct file_hash_entry *v;
+ *e = v = xcalloc (1, sizeof (*v));
+ v->key = xstrdup (string);
}
- ret->mangled = NULL;
- return (struct hash_entry *) ret;
+ return *e;
}
+static htab_t demangled_table;
+
/* Look up an entry in the demangled name hash table. */
static struct demangled_hash_entry *
const char *string;
int create;
{
- return ((struct demangled_hash_entry *)
- hash_lookup (&demangled_table, (const hash_table_key) string,
- create, string_copy));
+ PTR *e;
+ e = htab_find_slot_with_hash (demangled_table, string,
+ (*htab_hash_string)(string),
+ create ? INSERT : NO_INSERT);
+ if (e == NULL)
+ return NULL;
+ if (*e == NULL)
+ {
+ struct demangled_hash_entry *v;
+ *e = v = xcalloc (1, sizeof (*v));
+ v->key = xstrdup (string);
+ }
+ return *e;
}
\f
/* Stack code. */
{
const char *p;
- hash_table_init (&symbol_table, symbol_hash_newfunc, string_hash,
- string_compare);
- hash_table_init (&file_table, file_hash_newfunc, string_hash,
- string_compare);
- hash_table_init (&demangled_table, demangled_hash_newfunc,
- string_hash, string_compare);
+ symbol_table = htab_create (500, hash_string_hash, hash_string_eq,
+ NULL);
+ file_table = htab_create (500, hash_string_hash, hash_string_eq,
+ NULL);
+ demangled_table = htab_create (500, hash_string_hash, hash_string_eq,
+ NULL);
+
obstack_begin (&symbol_stack_obstack, 0);
obstack_begin (&file_stack_obstack, 0);
{
collect_execute (prog, argv, redir);
return collect_wait (prog);
-}
+}
static char *
frob_extension (s, ext)
file *f;
{
char c;
- FILE *stream = fopen ((char*) f->root.key, "r");
+ FILE *stream = fopen (f->key, "r");
if (tlink_verbose >= 2)
- fprintf (stderr, _("collect: reading %s\n"),
- (char*) f->root.key);
+ fprintf (stderr, _("collect: reading %s\n"), f->key);
while (fscanf (stream, "%c ", &c) == 1)
{
{
file *f;
+ putenv (xstrdup ("COMPILER_PATH"));
+ putenv (xstrdup ("LIBRARY_PATH"));
+
while ((f = file_pop ()) != NULL)
{
char *line, *command;
- FILE *stream = fopen ((char*) f->root.key, "r");
- const char *outname = frob_extension ((char*) f->root.key, ".rnw");
+ FILE *stream = fopen (f->key, "r");
+ const char *const outname = frob_extension (f->key, ".rnw");
FILE *output = fopen (outname, "w");
while ((line = tfgets (stream)) != NULL)
}
fclose (stream);
fclose (output);
- rename (outname, (char*) f->root.key);
+ rename (outname, f->key);
obstack_grow (&temporary_obstack, "cd ", 3);
obstack_grow (&temporary_obstack, f->dir, strlen (f->dir));
while ((sym = symbol_pop ()) != NULL)
{
demangled *dem;
- const char *p = cplus_demangle ((char*) sym->root.key,
- DMGL_PARAMS | DMGL_ANSI);
+ const char *p = cplus_demangle (sym->key, DMGL_PARAMS | DMGL_ANSI);
if (! p)
continue;
dem = demangled_hash_lookup (p, true);
- dem->mangled = (char*) sym->root.key;
+ dem->mangled = sym->key;
}
}
char *p = line, *q;
symbol *sym;
int end;
-
+
while (*p && ISSPACE ((unsigned char)*p))
++p;
mistakenly use GNU ld's "In function `foo':" message. */
if (q && (strstr (oldq, "ndefined")
|| strstr (oldq, "nresolved")
+ || strstr (oldq, "nsatisfied")
|| strstr (oldq, "ultiple")))
{
*q = 0;
if (dem)
sym = symbol_hash_lookup (dem->mangled, false);
else
- {
- if (*p == '_' && prepends_underscore)
+ {
+ if (*p == '_' && prepends_underscore)
++p;
sym = symbol_hash_lookup (p, false);
}
{
if (tlink_verbose >= 2)
fprintf (stderr, _("collect: tweaking %s in %s\n"),
- (char*) sym->root.key, (char*) sym->file->root.key);
+ sym->key, sym->file->key);
sym->tweaking = 1;
file_push (sym->file);
}
-
+
obstack_free (&temporary_obstack, temporary_firstobj);
}
OSDN Git Service
