X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fstringpool.c;h=0227688f6e176b723c0f863ee6db3f3e55af14ff;hb=8adfde8a54ea40ae2cf42010468ac64be35430b6;hp=1edb46f66a6086bfd44858f96ea10b5f58b9ccaa;hpb=573aba856d39e5b11d72261a6ccb6004dcb923cd;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/stringpool.c b/gcc/stringpool.c index 1edb46f66a6..0227688f6e1 100644 --- a/gcc/stringpool.c +++ b/gcc/stringpool.c @@ -1,5 +1,5 @@ /* String pool for GCC. - 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. @@ -22,7 +22,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA allocated by ggc_alloc_string are stored in an obstack which is never shrunk. Identifiers are uniquely stored in a hash table. - We have our own private hash table implementation. libiberty's + We use cpplib's hash table implementation. libiberty's hashtab.c is not used because it requires 100% average space overhead per string, which is unacceptable. Also, this algorithm is faster. */ @@ -33,7 +33,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "tm.h" #include "ggc.h" #include "tree.h" -#include "hashtable.h" +#include "symtab.h" +#include "cpplib.h" /* The "" allocated string. */ const char empty_string[] = ""; @@ -48,23 +49,29 @@ const char digit_vector[] = { struct ht *ident_hash; static struct obstack string_stack; -static hashnode alloc_node PARAMS ((hash_table *)); -static int mark_ident PARAMS ((struct cpp_reader *, hashnode, const PTR)); +static hashnode alloc_node (hash_table *); +static int mark_ident (struct cpp_reader *, hashnode, const void *); + +static void * +stringpool_ggc_alloc (size_t x) +{ + return ggc_alloc (x); +} /* Initialize the string pool. */ void -init_stringpool () +init_stringpool (void) { /* Create with 16K (2^14) entries. */ ident_hash = ht_create (14); ident_hash->alloc_node = alloc_node; + ident_hash->alloc_subobject = stringpool_ggc_alloc; gcc_obstack_init (&string_stack); } /* Allocate a hash node. */ static hashnode -alloc_node (table) - hash_table *table ATTRIBUTE_UNUSED; +alloc_node (hash_table *table ATTRIBUTE_UNUSED) { return GCC_IDENT_TO_HT_IDENT (make_node (IDENTIFIER_NODE)); } @@ -76,9 +83,7 @@ alloc_node (table) returned this time too. */ const char * -ggc_alloc_string (contents, length) - const char *contents; - int length; +ggc_alloc_string (const char *contents, int length) { if (length == -1) length = strlen (contents); @@ -96,9 +101,10 @@ ggc_alloc_string (contents, length) If an identifier with that name has previously been referred to, the same node is returned this time. */ +#undef get_identifier + tree -get_identifier (text) - const char *text; +get_identifier (const char *text) { hashnode ht_node = ht_lookup (ident_hash, (const unsigned char *) text, @@ -112,9 +118,7 @@ get_identifier (text) known. */ tree -get_identifier_with_length (text, length) - const char *text; - unsigned int length; +get_identifier_with_length (const char *text, size_t length) { hashnode ht_node = ht_lookup (ident_hash, (const unsigned char *) text, @@ -129,8 +133,7 @@ get_identifier_with_length (text, length) NULL_TREE. */ tree -maybe_get_identifier (text) - const char *text; +maybe_get_identifier (const char *text) { hashnode ht_node; @@ -145,18 +148,16 @@ maybe_get_identifier (text) /* Report some basic statistics about the string pool. */ void -stringpool_statistics () +stringpool_statistics (void) { ht_dump_statistics (ident_hash); } - + /* Mark an identifier for GC. */ static int -mark_ident (pfile, h, v) - struct cpp_reader *pfile ATTRIBUTE_UNUSED; - hashnode h; - const PTR v ATTRIBUTE_UNUSED; +mark_ident (struct cpp_reader *pfile ATTRIBUTE_UNUSED, hashnode h, + const void *v ATTRIBUTE_UNUSED) { gt_ggc_m_9tree_node (HT_IDENT_TO_GCC_IDENT (h)); return 1; @@ -167,7 +168,7 @@ mark_ident (pfile, h, v) treatment for strings. */ void -ggc_mark_stringpool () +ggc_mark_stringpool (void) { ht_forall (ident_hash, mark_ident, NULL); } @@ -177,8 +178,7 @@ ggc_mark_stringpool () to strings. */ void -gt_ggc_m_S (x) - void *x ATTRIBUTE_UNUSED; +gt_ggc_m_S (void *x ATTRIBUTE_UNUSED) { } @@ -186,65 +186,66 @@ gt_ggc_m_S (x) strings don't contain pointers). */ void -gt_pch_p_S (obj, x, op, cookie) - void *obj ATTRIBUTE_UNUSED; - void *x ATTRIBUTE_UNUSED; - gt_pointer_operator op ATTRIBUTE_UNUSED; - void *cookie ATTRIBUTE_UNUSED; +gt_pch_p_S (void *obj ATTRIBUTE_UNUSED, void *x ATTRIBUTE_UNUSED, + gt_pointer_operator op ATTRIBUTE_UNUSED, + void *cookie ATTRIBUTE_UNUSED) { } /* PCH pointer-walking routine for strings. */ void -gt_pch_n_S (x) - const void *x; +gt_pch_n_S (const void *x) { gt_pch_note_object ((void *)x, (void *)x, >_pch_p_S); } - + /* Handle saving and restoring the string pool for PCH. */ +/* SPD is saved in the PCH file and holds the information needed + to restore the string pool. */ + struct string_pool_data GTY(()) { - tree * GTY((length ("%h.nslots"))) entries; + struct ht_identifier * * + GTY((length ("%h.nslots"), + nested_ptr (union tree_node, "%h ? GCC_IDENT_TO_HT_IDENT (%h) : NULL", + "%h ? HT_IDENT_TO_GCC_IDENT (%h) : NULL"))) + entries; unsigned int nslots; unsigned int nelements; }; static GTY(()) struct string_pool_data * spd; +/* Save the stringpool data in SPD. */ + void -gt_pch_save_stringpool () +gt_pch_save_stringpool (void) { - unsigned int i; - spd = ggc_alloc (sizeof (*spd)); spd->nslots = ident_hash->nslots; spd->nelements = ident_hash->nelements; - spd->entries = ggc_alloc (sizeof (tree *) * spd->nslots); - for (i = 0; i < spd->nslots; i++) - if (ident_hash->entries[i] != NULL) - spd->entries[i] = HT_IDENT_TO_GCC_IDENT (ident_hash->entries[i]); - else - spd->entries[i] = NULL; + spd->entries = ggc_alloc (sizeof (spd->entries[0]) * spd->nslots); + memcpy (spd->entries, ident_hash->entries, + spd->nslots * sizeof (spd->entries[0])); } +/* Return the stringpool to its state before gt_pch_save_stringpool + was called. */ + void -gt_pch_restore_stringpool () -{ - unsigned int i; - - ident_hash->nslots = spd->nslots; - ident_hash->nelements = spd->nelements; - ident_hash->entries = xrealloc (ident_hash->entries, - sizeof (hashnode) * spd->nslots); - for (i = 0; i < spd->nslots; i++) - if (spd->entries[i] != NULL) - ident_hash->entries[i] = GCC_IDENT_TO_HT_IDENT (spd->entries[i]); - else - ident_hash->entries[i] = NULL; +gt_pch_fixup_stringpool (void) +{ +} +/* A PCH file has been restored, which loaded SPD; fill the real hash table + from SPD. */ + +void +gt_pch_restore_stringpool (void) +{ + ht_load (ident_hash, spd->entries, spd->nslots, spd->nelements, false); spd = NULL; }