d8044160b7
2004-06-09 Geoffrey Keating <geoffk@apple.com> * Makefile.in (CPPLIB_H): Put files in order of inclusion. (CPP_ID_DATA_H): New. (gtype-desc.o): Update dependencies. (GTFILES): Use CPP_ID_DATA_H. Index: gcc/testsuite/ChangeLog 2004-06-09 Geoffrey Keating <geoffk@apple.com> * gcc.dg/pch/macro-4.c: New. * gcc.dg/pch/macro-4.hs: New. Index: libcpp/ChangeLog 2004-06-09 Geoffrey Keating <geoffk@apple.com> * traditional.c (push_replacement_text): Set macro->traditional. (save_replacement_text): Likewise. * pch.c (cpp_write_pch_state): Don't write list of defined macros. (struct save_macro_item): Delete. (struct save_macro_data): Use a character array not the previous structured format. (save_macros): Save macro as text not as internal structures. (cpp_prepare_state): Update for changes to save_macro_data. (cpp_read_state): Don't read macros defined in PCH. Restore -D macros as text. * macro.c (create_iso_definition): Honour alloc_subobject. Clear traditional flag. (_cpp_create_definition): Honour alloc_subobject. * lex.c (cpp_token_val_index): New. * internal.h: Include cpp-id-data.h. (uchar): Move definition to cpp-id-data.h. (U): Likewise. (cpp_macro): Likewise. * directives.c (struct answer): Move to cpp-id-data.h. (do_assert): Honour alloc_subobject. Index: libcpp/include/ChangeLog 2004-06-09 Geoffrey Keating <geoffk@apple.com> * symtab.h (struct ht): Add field 'alloc_subobject'. * cpplib.h (struct cpp_string): Add GTY marker. (enum cpp_token_fld_kind): New. (struct cpp_token): Add GTY markers. (cpp_token_val_index): Prototype. (CPP_HASHNODE_VALUE_IDX): New. (struct cpp_hashnode): Don't skip fields of 'value' when marking. * cpp-id-data.h: New file. From-SVN: r82851
253 lines
6.4 KiB
C
253 lines
6.4 KiB
C
/* String pool for GCC.
|
||
Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
|
||
|
||
This file is part of GCC.
|
||
|
||
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.
|
||
|
||
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 GCC; see the file COPYING. If not, write to the Free
|
||
Software Foundation, 59 Temple Place - Suite 330, Boston, MA
|
||
02111-1307, 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 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. */
|
||
|
||
#include "config.h"
|
||
#include "system.h"
|
||
#include "coretypes.h"
|
||
#include "tm.h"
|
||
#include "ggc.h"
|
||
#include "tree.h"
|
||
#include "symtab.h"
|
||
#include "cpplib.h"
|
||
|
||
/* The "" allocated string. */
|
||
const char empty_string[] = "";
|
||
|
||
/* Character strings, each containing a single decimal digit.
|
||
Written this way to save space. */
|
||
const char digit_vector[] = {
|
||
'0', 0, '1', 0, '2', 0, '3', 0, '4', 0,
|
||
'5', 0, '6', 0, '7', 0, '8', 0, '9', 0
|
||
};
|
||
|
||
struct ht *ident_hash;
|
||
static struct obstack string_stack;
|
||
|
||
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 (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 (hash_table *table ATTRIBUTE_UNUSED)
|
||
{
|
||
return GCC_IDENT_TO_HT_IDENT (make_node (IDENTIFIER_NODE));
|
||
}
|
||
|
||
/* Allocate and return a string constant of length LENGTH, containing
|
||
CONTENTS. If LENGTH is -1, CONTENTS is assumed to be a
|
||
nul-terminated string, and the length is calculated using strlen.
|
||
If the same string constant has been allocated before, that copy is
|
||
returned this time too. */
|
||
|
||
const char *
|
||
ggc_alloc_string (const char *contents, int length)
|
||
{
|
||
if (length == -1)
|
||
length = strlen (contents);
|
||
|
||
if (length == 0)
|
||
return empty_string;
|
||
if (length == 1 && ISDIGIT (contents[0]))
|
||
return digit_string (contents[0] - '0');
|
||
|
||
obstack_grow0 (&string_stack, contents, length);
|
||
return obstack_finish (&string_stack);
|
||
}
|
||
|
||
/* 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 (const char *text)
|
||
{
|
||
hashnode ht_node = ht_lookup (ident_hash,
|
||
(const unsigned char *) text,
|
||
strlen (text), HT_ALLOC);
|
||
|
||
/* ht_node can't be NULL here. */
|
||
return HT_IDENT_TO_GCC_IDENT (ht_node);
|
||
}
|
||
|
||
/* Identical to get_identifier, except that the length is assumed
|
||
known. */
|
||
|
||
tree
|
||
get_identifier_with_length (const char *text, size_t length)
|
||
{
|
||
hashnode ht_node = ht_lookup (ident_hash,
|
||
(const unsigned char *) text,
|
||
length, HT_ALLOC);
|
||
|
||
/* ht_node can't be NULL here. */
|
||
return HT_IDENT_TO_GCC_IDENT (ht_node);
|
||
}
|
||
|
||
/* If an identifier with the name TEXT (a null-terminated string) has
|
||
previously been referred to, return that node; otherwise return
|
||
NULL_TREE. */
|
||
|
||
tree
|
||
maybe_get_identifier (const char *text)
|
||
{
|
||
hashnode ht_node;
|
||
|
||
ht_node = ht_lookup (ident_hash, (const unsigned char *) text,
|
||
strlen (text), HT_NO_INSERT);
|
||
if (ht_node)
|
||
return HT_IDENT_TO_GCC_IDENT (ht_node);
|
||
|
||
return NULL_TREE;
|
||
}
|
||
|
||
/* Report some basic statistics about the string pool. */
|
||
|
||
void
|
||
stringpool_statistics (void)
|
||
{
|
||
ht_dump_statistics (ident_hash);
|
||
}
|
||
|
||
/* Mark an identifier for GC. */
|
||
|
||
static int
|
||
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;
|
||
}
|
||
|
||
/* Mark the trees hanging off the identifier node for GGC. These are
|
||
handled specially (not using gengtype) because of the special
|
||
treatment for strings. */
|
||
|
||
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);
|
||
}
|
||
|
||
/* 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"
|