X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fstringpool.c;h=b3cfcc45a096b82726a09a7d90bbddef2f550ff1;hb=3a8843c6da5f76535c016db4d0c8da620a7cde3e;hp=f3b34b139cfd59ce7627c0d8d949cc64827bf9a8;hpb=805e22b2051e9c6a75377ea6599654d7415da483;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/stringpool.c b/gcc/stringpool.c index f3b34b139cf..b3cfcc45a09 100644 --- a/gcc/stringpool.c +++ b/gcc/stringpool.c @@ -1,5 +1,6 @@ /* String pool for GCC. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 + Free Software Foundation, Inc. This file is part of GCC. @@ -15,14 +16,14 @@ for more details. You should have received a copy of the GNU General Public License 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. */ +Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301, USA. */ /* String text, identifier text and identifier node allocator. Strings 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 +34,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,25 +50,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 void mark_ident_hash PARAMS ((void *)); +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); - ggc_add_root (&ident_hash, 1, sizeof ident_hash, mark_ident_hash); } /* 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)); } @@ -78,9 +84,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); @@ -91,16 +95,17 @@ ggc_alloc_string (contents, length) return digit_string (contents[0] - '0'); obstack_grow0 (&string_stack, contents, length); - return obstack_finish (&string_stack); + return XOBFINISH (&string_stack, const char *); } /* Return an IDENTIFIER_NODE whose name is TEXT (a null-terminated string). 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, @@ -114,9 +119,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, @@ -131,8 +134,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; @@ -147,28 +149,106 @@ 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) { - ggc_mark_tree (HT_IDENT_TO_GCC_IDENT (h)); + gt_ggc_m_9tree_node (HT_IDENT_TO_GCC_IDENT (h)); return 1; } -/* Mark all identifiers for GC. */ +/* Mark the trees hanging off the identifier node for GGC. These are + handled specially (not using gengtype) because of the special + treatment for strings. */ -static void -mark_ident_hash (arg) - PTR arg ATTRIBUTE_UNUSED; +void +ggc_mark_stringpool (void) { ht_forall (ident_hash, mark_ident, NULL); } + +/* Strings are _not_ GCed, but this routine exists so that a separate + roots table isn't needed for the few global variables that refer + to strings. */ + +void +gt_ggc_m_S (void *x ATTRIBUTE_UNUSED) +{ +} + +/* Pointer-walking routine for strings (not very interesting, since + strings don't contain pointers). */ + +void +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 (const void *x) +{ + gt_pch_note_object ((void *)x, (void *)x, >_pch_p_S, + gt_types_enum_last); +} + +/* 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(()) +{ + 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 (void) +{ + spd = ggc_alloc (sizeof (*spd)); + spd->nslots = ident_hash->nslots; + spd->nelements = ident_hash->nelements; + 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_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; +} + +#include "gt-stringpool.h"