mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-01-06 12:09:26 +08:00
b5ec771e60
Summary: - This is preparation for supporting wild name matching on C++ too. - This is also preparation for TAB-completion fixes. - Makes symbol name matching (think strcmp_iw) be based on a per-language method. - Merges completion and non-completion name comparison (think language_ops::la_get_symbol_name_cmp generalized). - Avoid re-hashing lookup name multiple times - Centralizes preparing a name for lookup (Ada name encoding / C++ Demangling), both completion and non-completion. - Fixes Ada latent bug with verbatim name matches in expressions - Makes ada-lang.c use common|symtab.c completion code a bit more. Ada's wild matching basically means that "(gdb) break foo" will find all methods named "foo" in all packages. Translating to C++, it's roughly the same as saying that "break klass::method" sets breakpoints on all "klass::method" methods of all classes, no matter the namespace. A following patch will teach GDB about fullname vs wild matching for C++ too. This patch is preparatory work to get there. Another idea here is to do symbol name matching based on the symbol language's algorithm. I.e., avoid dependency on current language set. This allows for example doing (gdb) b foo::bar< int > (<tab> and having gdb name match the C++ symbols correctly even if the current language is C or Assembly (or Rust, or Ada, or ...), which can easily happen if you step into an Assembly/C runtime library frame. By encapsulating all the information related to a lookup name in a class, we can also cache hash computation for a given language in the lookup name object, to avoid recomputing it over and over. Similarly, because we don't really know upfront which languages the lookup name will be matched against, for each language we store the lookup name transformed into a search name. E.g., for C++, that means demangling the name. But for Ada, it means encoding the name. This actually forces us to centralize all the different lookup name encoding in a central place, resulting in clearer code, IMO. See e.g., the new ada_lookup_name_info class. The lookup name -> symbol search name computation is also done only once per language. The old language->la_get_symbol_name_cmp / symbol_name_cmp_ftype are generalized to work with both completion, and normal symbol look up. At some point early on, I had separate completion vs non-completion language vector entry points, but a single method ends up being better IMO for simplifying things -- the more we merge the completion / non-completion name lookup code paths, the less changes for bugs causing completion vs normal lookup finding different symbols. The ada-lex.l change is necessary because when doing (gdb) p <UpperCase> then the name that is passed to write_ write_var_or_type -> ada_lookup_symbol_list misses the "<>", i.e., it's just "UpperCase", and we end up doing a wild match against "UpperCase" lowercased by ada_lookup_name_info's constructor. I.e., "uppercase" wouldn't ever match "UpperCase", and the symbol lookup fails. This wouldn't cause any regression in the testsuite, but I added a new test that would pass before the patch and fail after, if it weren't for that fix. This is latent bug that happens to go unnoticed because that particular path was inconsistent with the rest of Ada symbol lookup by not lowercasing the lookup name. Ada's symbol_completion_add is deleted, replaced by using common code's completion_list_add_name. To make the latter work for Ada, we needed to add a new output parameter, because Ada wants to return back a custom completion candidates that are not the symbol name. With this patch, minimal symbol demangled name hashing is made consistent with regular symbol hashing. I.e., it now goes via the language vector's search_name_hash method too, as I had suggested in a previous patch. dw2_expand_symtabs_matching / .gdb_index symbol names were a challenge. The problem is that we have no way to telling what is the language of each symbol name found in the index, until we expand the corresponding full symbol, which is off course what we're trying to avoid. Language information is simply not considered in the index format... Since the symbol name hashing and comparison routines are per-language, we now have a problem. The patch sorts this out by matching each name against all languages. This is inneficient, and indeed slows down completion several times. E.g., with: $ cat script.cmd set pagination off set $count = 0 while $count < 400 complete b string_prin printf "count = %d\n", $count set $count = $count + 1 end $ time gdb --batch -q ./gdb-with-index -ex "source script-string_printf.cmd" I get, before patch (-O2, x86-64): real 0m1.773s user 0m1.737s sys 0m0.040s While after patch (-O2, x86-64): real 0m9.843s user 0m9.482s sys 0m0.034s However, the following patch will optimize this, and will actually make this use case faster compared to the "before patch" above: real 0m1.321s user 0m1.285s sys 0m0.039s gdb/ChangeLog: 2017-11-08 Pedro Alves <palves@redhat.com> * ada-lang.c (ada_encode): Rename to .. (ada_encode_1): ... this. Add throw_errors parameter and handle it. (ada_encode): Reimplement. (match_name): Delete, folded into full_name. (resolve_subexp): No longer pass the encoded name to ada_lookup_symbol_list. (should_use_wild_match): Delete. (name_match_type_from_name): New. (ada_lookup_simple_minsym): Use lookup_name_info and the language's symbol_name_matcher_ftype. (add_symbols_from_enclosing_procs, ada_add_local_symbols) (ada_add_block_renamings): Adjust to use lookup_name_info. (ada_lookup_name): New. (add_nonlocal_symbols, ada_add_all_symbols) (ada_lookup_symbol_list_worker, ada_lookup_symbol_list) (ada_iterate_over_symbols): Adjust to use lookup_name_info. (ada_name_for_lookup): Delete. (ada_lookup_encoded_symbol): Construct a verbatim name. (wild_match): Reverse sense of return type. Use bool. (full_match): Reverse sense of return type. Inline bits of old match_name here. (ada_add_block_symbols): Adjust to use lookup_name_info. (symbol_completion_match): Delete, folded into... (ada_lookup_name_info::matches): ... .this new method. (symbol_completion_add): Delete. (ada_collect_symbol_completion_matches): Add name_match_type parameter. Adjust to use lookup_name_info and completion_list_add_name. (get_var_value, ada_add_global_exceptions): Adjust to use lookup_name_info. (ada_get_symbol_name_cmp): Delete. (do_wild_match, do_full_match): New functions. (ada_lookup_name_info::ada_lookup_name_info): New method. (ada_symbol_name_matches, ada_get_symbol_name_matcher): New functions. (ada_language_defn): Install ada_get_symbol_name_matcher. * ada-lex.l (processId): If name starts with '<', copy it verbatim. * block.c (block_iter_match_step, block_iter_match_first) (block_iter_match_next, block_lookup_symbol) (block_lookup_symbol_primary, block_find_symbol): Adjust to use lookup_name_info. * block.h (block_iter_match_first, block_iter_match_next) (ALL_BLOCK_SYMBOLS_WITH_NAME): Adjust to use lookup_name_info. * c-lang.c (c_language_defn, cplus_language_defn) (asm_language_defn, minimal_language_defn): Adjust comments to refer to la_get_symbol_name_matcher. * completer.c (complete_files_symbols) (collect_explicit_location_matches, symbol_completer): Pass a symbol_name_match_type down. * completer.h (class completion_match, completion_match_result): New classes. (completion_tracker::reset_completion_match_result): New method. (completion_tracker::m_completion_match_result): New field. * cp-support.c (make_symbol_overload_list_block): Adjust to use lookup_name_info. (cp_fq_symbol_name_matches, cp_get_symbol_name_matcher): New functions. * cp-support.h (cp_get_symbol_name_matcher): New declaration. * d-lang.c: Adjust comments to refer to la_get_symbol_name_matcher. * dictionary.c (dict_vector) <iter_match_first, iter_match_next>: Adjust to use lookup_name_info. (dict_iter_match_first, dict_iter_match_next) (iter_match_first_hashed, iter_match_next_hashed) (iter_match_first_linear, iter_match_next_linear): Adjust to work with a lookup_name_info. * dictionary.h (dict_iter_match_first, dict_iter_match_next): Likewise. * dwarf2read.c (dw2_lookup_symbol): Adjust to use lookup_name_info. (dw2_map_matching_symbols): Adjust to use symbol_name_match_type. (gdb_index_symbol_name_matcher): New class. (dw2_expand_symtabs_matching) Adjust to use lookup_name_info and gdb_index_symbol_name_matcher. Accept a NULL symbol_matcher. * f-lang.c (f_collect_symbol_completion_matches): Adjust to work with a symbol_name_match_type. (f_language_defn): Adjust comments to refer to la_get_symbol_name_matcher. * go-lang.c (go_language_defn): Adjust comments to refer to la_get_symbol_name_matcher. * language.c (default_symbol_name_matcher) (language_get_symbol_name_matcher): New functions. (unknown_language_defn, auto_language_defn): Adjust comments to refer to la_get_symbol_name_matcher. * language.h (symbol_name_cmp_ftype): Delete. (language_defn) <la_collect_symbol_completion_matches>: Add match type parameter. <la_get_symbol_name_cmp>: Delete field. <la_get_symbol_name_matcher>: New field. <la_iterate_over_symbols>: Adjust to use lookup_name_info. (default_symbol_name_matcher, language_get_symbol_name_matcher): Declare. * linespec.c (iterate_over_all_matching_symtabs) (iterate_over_file_blocks): Adjust to use lookup_name_info. (find_methods): Add language parameter, and use lookup_name_info and the language's symbol_name_matcher_ftype. (linespec_complete_function): Adjust. (lookup_prefix_sym): Use lookup_name_info. (add_all_symbol_names_from_pspace): Adjust. (find_superclass_methods): Add language parameter and pass it down. (find_method): Pass symbol language down. (find_linespec_symbols): Don't demangle or Ada encode here. (search_minsyms_for_name): Add lookup_name_info parameter. (add_matching_symbols_to_info): Add name_match_type parameter. Use lookup_name_info. * m2-lang.c (m2_language_defn): Adjust comments to refer to la_get_symbol_name_matcher. * minsyms.c: Include <algorithm>. (add_minsym_to_demangled_hash_table): Remove table parameter and add objfile parameter. Use search_name_hash, and add language to demangled languages vector. (struct found_minimal_symbols): New struct. (lookup_minimal_symbol_mangled, lookup_minimal_symbol_demangled): New functions. (lookup_minimal_symbol): Adjust to use them. Don't canonicalize input names here. Use lookup_name_info instead. Lookup up demangled names once for each language in the demangled names vector. (iterate_over_minimal_symbols): Use lookup_name_info. Lookup up demangled names once for each language in the demangled names vector. (build_minimal_symbol_hash_tables): Adjust. * minsyms.h (iterate_over_minimal_symbols): Adjust to pass down a lookup_name_info. * objc-lang.c (objc_language_defn): Adjust comment to refer to la_get_symbol_name_matcher. * objfiles.h: Include <vector>. (objfile_per_bfd_storage) <demangled_hash_languages>: New field. * opencl-lang.c (opencl_language_defn): Adjust comment to refer to la_get_symbol_name_matcher. * p-lang.c (pascal_language_defn): Adjust comment to refer to la_get_symbol_name_matcher. * psymtab.c (psym_lookup_symbol): Use lookup_name_info. (match_partial_symbol): Use symbol_name_match_type, lookup_name_info and psymbol_name_matches. (lookup_partial_symbol): Use lookup_name_info. (map_block): Use symbol_name_match_type and lookup_name_info. (psym_map_matching_symbols): Use symbol_name_match_type. (psymbol_name_matches): New. (recursively_search_psymtabs): Use lookup_name_info and psymbol_name_matches. Rename 'kind' parameter to 'domain'. (psym_expand_symtabs_matching): Use lookup_name_info. Rename 'kind' parameter to 'domain'. * rust-lang.c (rust_language_defn): Adjust comment to refer to la_get_symbol_name_matcher. * symfile-debug.c (debug_qf_map_matching_symbols) (debug_qf_map_matching_symbols): Use symbol_name_match_type. (debug_qf_expand_symtabs_matching): Use lookup_name_info. * symfile.c (expand_symtabs_matching): Use lookup_name_info. * symfile.h (quick_symbol_functions) <map_matching_symbols>: Adjust to use symbol_name_match_type. <expand_symtabs_matching>: Adjust to use lookup_name_info. (expand_symtabs_matching): Adjust to use lookup_name_info. * symmisc.c (maintenance_expand_symtabs): Use lookup_name_info::match_any (). * symtab.c (symbol_matches_search_name): New. (eq_symbol_entry): Adjust to use lookup_name_info and the language's matcher. (demangle_for_lookup_info::demangle_for_lookup_info): New. (lookup_name_info::match_any): New. (iterate_over_symbols, search_symbols): Use lookup_name_info. (compare_symbol_name): Add language, lookup_name_info and completion_match_result parameters, and use them. (completion_list_add_name): Make extern. Add language and lookup_name_info parameters. Use them. (completion_list_add_symbol, completion_list_add_msymbol) (completion_list_objc_symbol): Add lookup_name_info parameters and adjust. Pass down language. (completion_list_add_fields): Add lookup_name_info parameters and adjust. Pass down language. (add_symtab_completions): Add lookup_name_info parameters and adjust. (default_collect_symbol_completion_matches_break_on): Add name_match_type parameter, and use it. Use lookup_name_info. (default_collect_symbol_completion_matches) (collect_symbol_completion_matches): Add name_match_type parameter, and pass it down. (collect_symbol_completion_matches_type): Adjust. (collect_file_symbol_completion_matches): Add name_match_type parameter, and use lookup_name_info. * symtab.h: Include <string> and "common/gdb_optional.h". (enum class symbol_name_match_type): New. (class ada_lookup_name_info): New. (struct demangle_for_lookup_info): New. (class lookup_name_info): New. (symbol_name_matcher_ftype): New. (SYMBOL_MATCHES_SEARCH_NAME): Use symbol_matches_search_name. (symbol_matches_search_name): Declare. (MSYMBOL_MATCHES_SEARCH_NAME): Delete. (default_collect_symbol_completion_matches) (collect_symbol_completion_matches) (collect_file_symbol_completion_matches): Add name_match_type parameter. (iterate_over_symbols): Use lookup_name_info. (completion_list_add_name): Declare. * utils.c (enum class strncmp_iw_mode): Moved to utils.h. (strncmp_iw_with_mode): Now extern. * utils.h (enum class strncmp_iw_mode): Moved from utils.c. (strncmp_iw_with_mode): Declare. gdb/testsuite/ChangeLog: 2017-11-08 Pedro Alves <palves@redhat.com> * gdb.ada/complete.exp (p <Exported_Capitalized>): New test. (p Exported_Capitalized): New test. (p exported_capitalized): New test.
931 lines
26 KiB
C
931 lines
26 KiB
C
/* Routines for name->symbol lookups in GDB.
|
|
|
|
Copyright (C) 2003-2017 Free Software Foundation, Inc.
|
|
|
|
Contributed by David Carlton <carlton@bactrian.org> and by Kealia,
|
|
Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
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 Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program 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 this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include <ctype.h>
|
|
#include "gdb_obstack.h"
|
|
#include "symtab.h"
|
|
#include "buildsym.h"
|
|
#include "dictionary.h"
|
|
|
|
/* This file implements dictionaries, which are tables that associate
|
|
symbols to names. They are represented by an opaque type 'struct
|
|
dictionary'. That type has various internal implementations, which
|
|
you can choose between depending on what properties you need
|
|
(e.g. fast lookup, order-preserving, expandable).
|
|
|
|
Each dictionary starts with a 'virtual function table' that
|
|
contains the functions that actually implement the various
|
|
operations that dictionaries provide. (Note, however, that, for
|
|
the sake of client code, we also provide some functions that can be
|
|
implemented generically in terms of the functions in the vtable.)
|
|
|
|
To add a new dictionary implementation <impl>, what you should do
|
|
is:
|
|
|
|
* Add a new element DICT_<IMPL> to dict_type.
|
|
|
|
* Create a new structure dictionary_<impl>. If your new
|
|
implementation is a variant of an existing one, make sure that
|
|
their structs have the same initial data members. Define accessor
|
|
macros for your new data members.
|
|
|
|
* Implement all the functions in dict_vector as static functions,
|
|
whose name is the same as the corresponding member of dict_vector
|
|
plus _<impl>. You don't have to do this for those members where
|
|
you can reuse existing generic functions
|
|
(e.g. add_symbol_nonexpandable, free_obstack) or in the case where
|
|
your new implementation is a variant of an existing implementation
|
|
and where the variant doesn't affect the member function in
|
|
question.
|
|
|
|
* Define a static const struct dict_vector dict_<impl>_vector.
|
|
|
|
* Define a function dict_create_<impl> to create these
|
|
gizmos. Add its declaration to dictionary.h.
|
|
|
|
To add a new operation <op> on all existing implementations, what
|
|
you should do is:
|
|
|
|
* Add a new member <op> to struct dict_vector.
|
|
|
|
* If there is useful generic behavior <op>, define a static
|
|
function <op>_something_informative that implements that behavior.
|
|
(E.g. add_symbol_nonexpandable, free_obstack.)
|
|
|
|
* For every implementation <impl> that should have its own specific
|
|
behavior for <op>, define a static function <op>_<impl>
|
|
implementing it.
|
|
|
|
* Modify all existing dict_vector_<impl>'s to include the appropriate
|
|
member.
|
|
|
|
* Define a function dict_<op> that looks up <op> in the dict_vector
|
|
and calls the appropriate function. Add a declaration for
|
|
dict_<op> to dictionary.h. */
|
|
|
|
/* An enum representing the various implementations of dictionaries.
|
|
Used only for debugging. */
|
|
|
|
enum dict_type
|
|
{
|
|
/* Symbols are stored in a fixed-size hash table. */
|
|
DICT_HASHED,
|
|
/* Symbols are stored in an expandable hash table. */
|
|
DICT_HASHED_EXPANDABLE,
|
|
/* Symbols are stored in a fixed-size array. */
|
|
DICT_LINEAR,
|
|
/* Symbols are stored in an expandable array. */
|
|
DICT_LINEAR_EXPANDABLE
|
|
};
|
|
|
|
/* The virtual function table. */
|
|
|
|
struct dict_vector
|
|
{
|
|
/* The type of the dictionary. This is only here to make debugging
|
|
a bit easier; it's not actually used. */
|
|
enum dict_type type;
|
|
/* The function to free a dictionary. */
|
|
void (*free) (struct dictionary *dict);
|
|
/* Add a symbol to a dictionary, if possible. */
|
|
void (*add_symbol) (struct dictionary *dict, struct symbol *sym);
|
|
/* Iterator functions. */
|
|
struct symbol *(*iterator_first) (const struct dictionary *dict,
|
|
struct dict_iterator *iterator);
|
|
struct symbol *(*iterator_next) (struct dict_iterator *iterator);
|
|
/* Functions to iterate over symbols with a given name. */
|
|
struct symbol *(*iter_match_first) (const struct dictionary *dict,
|
|
const lookup_name_info &name,
|
|
struct dict_iterator *iterator);
|
|
struct symbol *(*iter_match_next) (const lookup_name_info &name,
|
|
struct dict_iterator *iterator);
|
|
/* A size function, for maint print symtabs. */
|
|
int (*size) (const struct dictionary *dict);
|
|
};
|
|
|
|
/* Now comes the structs used to store the data for different
|
|
implementations. If two implementations have data in common, put
|
|
the common data at the top of their structs, ordered in the same
|
|
way. */
|
|
|
|
struct dictionary_hashed
|
|
{
|
|
int nbuckets;
|
|
struct symbol **buckets;
|
|
};
|
|
|
|
struct dictionary_hashed_expandable
|
|
{
|
|
/* How many buckets we currently have. */
|
|
int nbuckets;
|
|
struct symbol **buckets;
|
|
/* How many syms we currently have; we need this so we will know
|
|
when to add more buckets. */
|
|
int nsyms;
|
|
};
|
|
|
|
struct dictionary_linear
|
|
{
|
|
int nsyms;
|
|
struct symbol **syms;
|
|
};
|
|
|
|
struct dictionary_linear_expandable
|
|
{
|
|
/* How many symbols we currently have. */
|
|
int nsyms;
|
|
struct symbol **syms;
|
|
/* How many symbols we can store before needing to reallocate. */
|
|
int capacity;
|
|
};
|
|
|
|
/* And now, the star of our show. */
|
|
|
|
struct dictionary
|
|
{
|
|
const struct language_defn *language;
|
|
const struct dict_vector *vector;
|
|
union
|
|
{
|
|
struct dictionary_hashed hashed;
|
|
struct dictionary_hashed_expandable hashed_expandable;
|
|
struct dictionary_linear linear;
|
|
struct dictionary_linear_expandable linear_expandable;
|
|
}
|
|
data;
|
|
};
|
|
|
|
/* Accessor macros. */
|
|
|
|
#define DICT_VECTOR(d) (d)->vector
|
|
#define DICT_LANGUAGE(d) (d)->language
|
|
|
|
/* These can be used for DICT_HASHED_EXPANDABLE, too. */
|
|
|
|
#define DICT_HASHED_NBUCKETS(d) (d)->data.hashed.nbuckets
|
|
#define DICT_HASHED_BUCKETS(d) (d)->data.hashed.buckets
|
|
#define DICT_HASHED_BUCKET(d,i) DICT_HASHED_BUCKETS (d) [i]
|
|
|
|
#define DICT_HASHED_EXPANDABLE_NSYMS(d) (d)->data.hashed_expandable.nsyms
|
|
|
|
/* These can be used for DICT_LINEAR_EXPANDABLEs, too. */
|
|
|
|
#define DICT_LINEAR_NSYMS(d) (d)->data.linear.nsyms
|
|
#define DICT_LINEAR_SYMS(d) (d)->data.linear.syms
|
|
#define DICT_LINEAR_SYM(d,i) DICT_LINEAR_SYMS (d) [i]
|
|
|
|
#define DICT_LINEAR_EXPANDABLE_CAPACITY(d) \
|
|
(d)->data.linear_expandable.capacity
|
|
|
|
/* The initial size of a DICT_*_EXPANDABLE dictionary. */
|
|
|
|
#define DICT_EXPANDABLE_INITIAL_CAPACITY 10
|
|
|
|
/* This calculates the number of buckets we'll use in a hashtable,
|
|
given the number of symbols that it will contain. */
|
|
|
|
#define DICT_HASHTABLE_SIZE(n) ((n)/5 + 1)
|
|
|
|
/* Accessor macros for dict_iterators; they're here rather than
|
|
dictionary.h because code elsewhere should treat dict_iterators as
|
|
opaque. */
|
|
|
|
/* The dictionary that the iterator is associated to. */
|
|
#define DICT_ITERATOR_DICT(iter) (iter)->dict
|
|
/* For linear dictionaries, the index of the last symbol returned; for
|
|
hashed dictionaries, the bucket of the last symbol returned. */
|
|
#define DICT_ITERATOR_INDEX(iter) (iter)->index
|
|
/* For hashed dictionaries, this points to the last symbol returned;
|
|
otherwise, this is unused. */
|
|
#define DICT_ITERATOR_CURRENT(iter) (iter)->current
|
|
|
|
/* Declarations of functions for vectors. */
|
|
|
|
/* Functions that might work across a range of dictionary types. */
|
|
|
|
static void add_symbol_nonexpandable (struct dictionary *dict,
|
|
struct symbol *sym);
|
|
|
|
static void free_obstack (struct dictionary *dict);
|
|
|
|
/* Functions for DICT_HASHED and DICT_HASHED_EXPANDABLE
|
|
dictionaries. */
|
|
|
|
static struct symbol *iterator_first_hashed (const struct dictionary *dict,
|
|
struct dict_iterator *iterator);
|
|
|
|
static struct symbol *iterator_next_hashed (struct dict_iterator *iterator);
|
|
|
|
static struct symbol *iter_match_first_hashed (const struct dictionary *dict,
|
|
const lookup_name_info &name,
|
|
struct dict_iterator *iterator);
|
|
|
|
static struct symbol *iter_match_next_hashed (const lookup_name_info &name,
|
|
struct dict_iterator *iterator);
|
|
|
|
/* Functions only for DICT_HASHED. */
|
|
|
|
static int size_hashed (const struct dictionary *dict);
|
|
|
|
/* Functions only for DICT_HASHED_EXPANDABLE. */
|
|
|
|
static void free_hashed_expandable (struct dictionary *dict);
|
|
|
|
static void add_symbol_hashed_expandable (struct dictionary *dict,
|
|
struct symbol *sym);
|
|
|
|
static int size_hashed_expandable (const struct dictionary *dict);
|
|
|
|
/* Functions for DICT_LINEAR and DICT_LINEAR_EXPANDABLE
|
|
dictionaries. */
|
|
|
|
static struct symbol *iterator_first_linear (const struct dictionary *dict,
|
|
struct dict_iterator *iterator);
|
|
|
|
static struct symbol *iterator_next_linear (struct dict_iterator *iterator);
|
|
|
|
static struct symbol *iter_match_first_linear (const struct dictionary *dict,
|
|
const lookup_name_info &name,
|
|
struct dict_iterator *iterator);
|
|
|
|
static struct symbol *iter_match_next_linear (const lookup_name_info &name,
|
|
struct dict_iterator *iterator);
|
|
|
|
static int size_linear (const struct dictionary *dict);
|
|
|
|
/* Functions only for DICT_LINEAR_EXPANDABLE. */
|
|
|
|
static void free_linear_expandable (struct dictionary *dict);
|
|
|
|
static void add_symbol_linear_expandable (struct dictionary *dict,
|
|
struct symbol *sym);
|
|
|
|
/* Various vectors that we'll actually use. */
|
|
|
|
static const struct dict_vector dict_hashed_vector =
|
|
{
|
|
DICT_HASHED, /* type */
|
|
free_obstack, /* free */
|
|
add_symbol_nonexpandable, /* add_symbol */
|
|
iterator_first_hashed, /* iterator_first */
|
|
iterator_next_hashed, /* iterator_next */
|
|
iter_match_first_hashed, /* iter_name_first */
|
|
iter_match_next_hashed, /* iter_name_next */
|
|
size_hashed, /* size */
|
|
};
|
|
|
|
static const struct dict_vector dict_hashed_expandable_vector =
|
|
{
|
|
DICT_HASHED_EXPANDABLE, /* type */
|
|
free_hashed_expandable, /* free */
|
|
add_symbol_hashed_expandable, /* add_symbol */
|
|
iterator_first_hashed, /* iterator_first */
|
|
iterator_next_hashed, /* iterator_next */
|
|
iter_match_first_hashed, /* iter_name_first */
|
|
iter_match_next_hashed, /* iter_name_next */
|
|
size_hashed_expandable, /* size */
|
|
};
|
|
|
|
static const struct dict_vector dict_linear_vector =
|
|
{
|
|
DICT_LINEAR, /* type */
|
|
free_obstack, /* free */
|
|
add_symbol_nonexpandable, /* add_symbol */
|
|
iterator_first_linear, /* iterator_first */
|
|
iterator_next_linear, /* iterator_next */
|
|
iter_match_first_linear, /* iter_name_first */
|
|
iter_match_next_linear, /* iter_name_next */
|
|
size_linear, /* size */
|
|
};
|
|
|
|
static const struct dict_vector dict_linear_expandable_vector =
|
|
{
|
|
DICT_LINEAR_EXPANDABLE, /* type */
|
|
free_linear_expandable, /* free */
|
|
add_symbol_linear_expandable, /* add_symbol */
|
|
iterator_first_linear, /* iterator_first */
|
|
iterator_next_linear, /* iterator_next */
|
|
iter_match_first_linear, /* iter_name_first */
|
|
iter_match_next_linear, /* iter_name_next */
|
|
size_linear, /* size */
|
|
};
|
|
|
|
/* Declarations of helper functions (i.e. ones that don't go into
|
|
vectors). */
|
|
|
|
static struct symbol *iterator_hashed_advance (struct dict_iterator *iter);
|
|
|
|
static void insert_symbol_hashed (struct dictionary *dict,
|
|
struct symbol *sym);
|
|
|
|
static void expand_hashtable (struct dictionary *dict);
|
|
|
|
/* The creation functions. */
|
|
|
|
/* See dictionary.h. */
|
|
|
|
struct dictionary *
|
|
dict_create_hashed (struct obstack *obstack,
|
|
enum language language,
|
|
const struct pending *symbol_list)
|
|
{
|
|
struct dictionary *retval;
|
|
int nsyms = 0, nbuckets, i;
|
|
struct symbol **buckets;
|
|
const struct pending *list_counter;
|
|
|
|
retval = XOBNEW (obstack, struct dictionary);
|
|
DICT_VECTOR (retval) = &dict_hashed_vector;
|
|
DICT_LANGUAGE (retval) = language_def (language);
|
|
|
|
/* Calculate the number of symbols, and allocate space for them. */
|
|
for (list_counter = symbol_list;
|
|
list_counter != NULL;
|
|
list_counter = list_counter->next)
|
|
{
|
|
nsyms += list_counter->nsyms;
|
|
}
|
|
nbuckets = DICT_HASHTABLE_SIZE (nsyms);
|
|
DICT_HASHED_NBUCKETS (retval) = nbuckets;
|
|
buckets = XOBNEWVEC (obstack, struct symbol *, nbuckets);
|
|
memset (buckets, 0, nbuckets * sizeof (struct symbol *));
|
|
DICT_HASHED_BUCKETS (retval) = buckets;
|
|
|
|
/* Now fill the buckets. */
|
|
for (list_counter = symbol_list;
|
|
list_counter != NULL;
|
|
list_counter = list_counter->next)
|
|
{
|
|
for (i = list_counter->nsyms - 1; i >= 0; --i)
|
|
{
|
|
insert_symbol_hashed (retval, list_counter->symbol[i]);
|
|
}
|
|
}
|
|
|
|
return retval;
|
|
}
|
|
|
|
/* See dictionary.h. */
|
|
|
|
extern struct dictionary *
|
|
dict_create_hashed_expandable (enum language language)
|
|
{
|
|
struct dictionary *retval = XNEW (struct dictionary);
|
|
|
|
DICT_VECTOR (retval) = &dict_hashed_expandable_vector;
|
|
DICT_LANGUAGE (retval) = language_def (language);
|
|
DICT_HASHED_NBUCKETS (retval) = DICT_EXPANDABLE_INITIAL_CAPACITY;
|
|
DICT_HASHED_BUCKETS (retval) = XCNEWVEC (struct symbol *,
|
|
DICT_EXPANDABLE_INITIAL_CAPACITY);
|
|
DICT_HASHED_EXPANDABLE_NSYMS (retval) = 0;
|
|
|
|
return retval;
|
|
}
|
|
|
|
/* See dictionary.h. */
|
|
|
|
struct dictionary *
|
|
dict_create_linear (struct obstack *obstack,
|
|
enum language language,
|
|
const struct pending *symbol_list)
|
|
{
|
|
struct dictionary *retval;
|
|
int nsyms = 0, i, j;
|
|
struct symbol **syms;
|
|
const struct pending *list_counter;
|
|
|
|
retval = XOBNEW (obstack, struct dictionary);
|
|
DICT_VECTOR (retval) = &dict_linear_vector;
|
|
DICT_LANGUAGE (retval) = language_def (language);
|
|
|
|
/* Calculate the number of symbols, and allocate space for them. */
|
|
for (list_counter = symbol_list;
|
|
list_counter != NULL;
|
|
list_counter = list_counter->next)
|
|
{
|
|
nsyms += list_counter->nsyms;
|
|
}
|
|
DICT_LINEAR_NSYMS (retval) = nsyms;
|
|
syms = XOBNEWVEC (obstack, struct symbol *, nsyms );
|
|
DICT_LINEAR_SYMS (retval) = syms;
|
|
|
|
/* Now fill in the symbols. Start filling in from the back, so as
|
|
to preserve the original order of the symbols. */
|
|
for (list_counter = symbol_list, j = nsyms - 1;
|
|
list_counter != NULL;
|
|
list_counter = list_counter->next)
|
|
{
|
|
for (i = list_counter->nsyms - 1;
|
|
i >= 0;
|
|
--i, --j)
|
|
{
|
|
syms[j] = list_counter->symbol[i];
|
|
}
|
|
}
|
|
|
|
return retval;
|
|
}
|
|
|
|
/* See dictionary.h. */
|
|
|
|
struct dictionary *
|
|
dict_create_linear_expandable (enum language language)
|
|
{
|
|
struct dictionary *retval = XNEW (struct dictionary);
|
|
|
|
DICT_VECTOR (retval) = &dict_linear_expandable_vector;
|
|
DICT_LANGUAGE (retval) = language_def (language);
|
|
DICT_LINEAR_NSYMS (retval) = 0;
|
|
DICT_LINEAR_EXPANDABLE_CAPACITY (retval) = DICT_EXPANDABLE_INITIAL_CAPACITY;
|
|
DICT_LINEAR_SYMS (retval)
|
|
= XNEWVEC (struct symbol *, DICT_LINEAR_EXPANDABLE_CAPACITY (retval));
|
|
|
|
return retval;
|
|
}
|
|
|
|
/* The functions providing the dictionary interface. */
|
|
|
|
/* Free the memory used by a dictionary that's not on an obstack. (If
|
|
any.) */
|
|
|
|
void
|
|
dict_free (struct dictionary *dict)
|
|
{
|
|
(DICT_VECTOR (dict))->free (dict);
|
|
}
|
|
|
|
/* Add SYM to DICT. DICT had better be expandable. */
|
|
|
|
void
|
|
dict_add_symbol (struct dictionary *dict, struct symbol *sym)
|
|
{
|
|
(DICT_VECTOR (dict))->add_symbol (dict, sym);
|
|
}
|
|
|
|
/* Utility to add a list of symbols to a dictionary.
|
|
DICT must be an expandable dictionary. */
|
|
|
|
void
|
|
dict_add_pending (struct dictionary *dict, const struct pending *symbol_list)
|
|
{
|
|
const struct pending *list;
|
|
int i;
|
|
|
|
for (list = symbol_list; list != NULL; list = list->next)
|
|
{
|
|
for (i = 0; i < list->nsyms; ++i)
|
|
dict_add_symbol (dict, list->symbol[i]);
|
|
}
|
|
}
|
|
|
|
/* Initialize ITERATOR to point at the first symbol in DICT, and
|
|
return that first symbol, or NULL if DICT is empty. */
|
|
|
|
struct symbol *
|
|
dict_iterator_first (const struct dictionary *dict,
|
|
struct dict_iterator *iterator)
|
|
{
|
|
return (DICT_VECTOR (dict))->iterator_first (dict, iterator);
|
|
}
|
|
|
|
/* Advance ITERATOR, and return the next symbol, or NULL if there are
|
|
no more symbols. */
|
|
|
|
struct symbol *
|
|
dict_iterator_next (struct dict_iterator *iterator)
|
|
{
|
|
return (DICT_VECTOR (DICT_ITERATOR_DICT (iterator)))
|
|
->iterator_next (iterator);
|
|
}
|
|
|
|
struct symbol *
|
|
dict_iter_match_first (const struct dictionary *dict,
|
|
const lookup_name_info &name,
|
|
struct dict_iterator *iterator)
|
|
{
|
|
return (DICT_VECTOR (dict))->iter_match_first (dict, name, iterator);
|
|
}
|
|
|
|
struct symbol *
|
|
dict_iter_match_next (const lookup_name_info &name,
|
|
struct dict_iterator *iterator)
|
|
{
|
|
return (DICT_VECTOR (DICT_ITERATOR_DICT (iterator)))
|
|
->iter_match_next (name, iterator);
|
|
}
|
|
|
|
int
|
|
dict_size (const struct dictionary *dict)
|
|
{
|
|
return (DICT_VECTOR (dict))->size (dict);
|
|
}
|
|
|
|
/* Now come functions (well, one function, currently) that are
|
|
implemented generically by means of the vtable. Typically, they're
|
|
rarely used. */
|
|
|
|
/* Test to see if DICT is empty. */
|
|
|
|
int
|
|
dict_empty (struct dictionary *dict)
|
|
{
|
|
struct dict_iterator iter;
|
|
|
|
return (dict_iterator_first (dict, &iter) == NULL);
|
|
}
|
|
|
|
|
|
/* The functions implementing the dictionary interface. */
|
|
|
|
/* Generic functions, where appropriate. */
|
|
|
|
static void
|
|
free_obstack (struct dictionary *dict)
|
|
{
|
|
/* Do nothing! */
|
|
}
|
|
|
|
static void
|
|
add_symbol_nonexpandable (struct dictionary *dict, struct symbol *sym)
|
|
{
|
|
internal_error (__FILE__, __LINE__,
|
|
_("dict_add_symbol: non-expandable dictionary"));
|
|
}
|
|
|
|
/* Functions for DICT_HASHED and DICT_HASHED_EXPANDABLE. */
|
|
|
|
static struct symbol *
|
|
iterator_first_hashed (const struct dictionary *dict,
|
|
struct dict_iterator *iterator)
|
|
{
|
|
DICT_ITERATOR_DICT (iterator) = dict;
|
|
DICT_ITERATOR_INDEX (iterator) = -1;
|
|
return iterator_hashed_advance (iterator);
|
|
}
|
|
|
|
static struct symbol *
|
|
iterator_next_hashed (struct dict_iterator *iterator)
|
|
{
|
|
struct symbol *next;
|
|
|
|
next = DICT_ITERATOR_CURRENT (iterator)->hash_next;
|
|
|
|
if (next == NULL)
|
|
return iterator_hashed_advance (iterator);
|
|
else
|
|
{
|
|
DICT_ITERATOR_CURRENT (iterator) = next;
|
|
return next;
|
|
}
|
|
}
|
|
|
|
static struct symbol *
|
|
iterator_hashed_advance (struct dict_iterator *iterator)
|
|
{
|
|
const struct dictionary *dict = DICT_ITERATOR_DICT (iterator);
|
|
int nbuckets = DICT_HASHED_NBUCKETS (dict);
|
|
int i;
|
|
|
|
for (i = DICT_ITERATOR_INDEX (iterator) + 1; i < nbuckets; ++i)
|
|
{
|
|
struct symbol *sym = DICT_HASHED_BUCKET (dict, i);
|
|
|
|
if (sym != NULL)
|
|
{
|
|
DICT_ITERATOR_INDEX (iterator) = i;
|
|
DICT_ITERATOR_CURRENT (iterator) = sym;
|
|
return sym;
|
|
}
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
static struct symbol *
|
|
iter_match_first_hashed (const struct dictionary *dict,
|
|
const lookup_name_info &name,
|
|
struct dict_iterator *iterator)
|
|
{
|
|
const language_defn *lang = DICT_LANGUAGE (dict);
|
|
unsigned int hash_index = (name.search_name_hash (lang->la_language)
|
|
% DICT_HASHED_NBUCKETS (dict));
|
|
symbol_name_matcher_ftype *matches_name
|
|
= language_get_symbol_name_matcher (lang, name);
|
|
struct symbol *sym;
|
|
|
|
DICT_ITERATOR_DICT (iterator) = dict;
|
|
|
|
/* Loop through the symbols in the given bucket, breaking when SYM
|
|
first matches. If SYM never matches, it will be set to NULL;
|
|
either way, we have the right return value. */
|
|
|
|
for (sym = DICT_HASHED_BUCKET (dict, hash_index);
|
|
sym != NULL;
|
|
sym = sym->hash_next)
|
|
{
|
|
/* Warning: the order of arguments to compare matters! */
|
|
if (matches_name (SYMBOL_SEARCH_NAME (sym), name, NULL))
|
|
break;
|
|
}
|
|
|
|
DICT_ITERATOR_CURRENT (iterator) = sym;
|
|
return sym;
|
|
}
|
|
|
|
static struct symbol *
|
|
iter_match_next_hashed (const lookup_name_info &name,
|
|
struct dict_iterator *iterator)
|
|
{
|
|
const language_defn *lang = DICT_LANGUAGE (DICT_ITERATOR_DICT (iterator));
|
|
symbol_name_matcher_ftype *matches_name
|
|
= language_get_symbol_name_matcher (lang, name);
|
|
struct symbol *next;
|
|
|
|
for (next = DICT_ITERATOR_CURRENT (iterator)->hash_next;
|
|
next != NULL;
|
|
next = next->hash_next)
|
|
{
|
|
if (matches_name (SYMBOL_SEARCH_NAME (next), name, NULL))
|
|
break;
|
|
}
|
|
|
|
DICT_ITERATOR_CURRENT (iterator) = next;
|
|
|
|
return next;
|
|
}
|
|
|
|
/* Insert SYM into DICT. */
|
|
|
|
static void
|
|
insert_symbol_hashed (struct dictionary *dict,
|
|
struct symbol *sym)
|
|
{
|
|
unsigned int hash_index;
|
|
unsigned int hash;
|
|
struct symbol **buckets = DICT_HASHED_BUCKETS (dict);
|
|
|
|
/* We don't want to insert a symbol into a dictionary of a different
|
|
language. The two may not use the same hashing algorithm. */
|
|
gdb_assert (SYMBOL_LANGUAGE (sym) == DICT_LANGUAGE (dict)->la_language);
|
|
|
|
hash = search_name_hash (SYMBOL_LANGUAGE (sym), SYMBOL_SEARCH_NAME (sym));
|
|
hash_index = hash % DICT_HASHED_NBUCKETS (dict);
|
|
sym->hash_next = buckets[hash_index];
|
|
buckets[hash_index] = sym;
|
|
}
|
|
|
|
static int
|
|
size_hashed (const struct dictionary *dict)
|
|
{
|
|
return DICT_HASHED_NBUCKETS (dict);
|
|
}
|
|
|
|
/* Functions only for DICT_HASHED_EXPANDABLE. */
|
|
|
|
static void
|
|
free_hashed_expandable (struct dictionary *dict)
|
|
{
|
|
xfree (DICT_HASHED_BUCKETS (dict));
|
|
xfree (dict);
|
|
}
|
|
|
|
static void
|
|
add_symbol_hashed_expandable (struct dictionary *dict,
|
|
struct symbol *sym)
|
|
{
|
|
int nsyms = ++DICT_HASHED_EXPANDABLE_NSYMS (dict);
|
|
|
|
if (DICT_HASHTABLE_SIZE (nsyms) > DICT_HASHED_NBUCKETS (dict))
|
|
expand_hashtable (dict);
|
|
|
|
insert_symbol_hashed (dict, sym);
|
|
DICT_HASHED_EXPANDABLE_NSYMS (dict) = nsyms;
|
|
}
|
|
|
|
static int
|
|
size_hashed_expandable (const struct dictionary *dict)
|
|
{
|
|
return DICT_HASHED_EXPANDABLE_NSYMS (dict);
|
|
}
|
|
|
|
static void
|
|
expand_hashtable (struct dictionary *dict)
|
|
{
|
|
int old_nbuckets = DICT_HASHED_NBUCKETS (dict);
|
|
struct symbol **old_buckets = DICT_HASHED_BUCKETS (dict);
|
|
int new_nbuckets = 2 * old_nbuckets + 1;
|
|
struct symbol **new_buckets = XCNEWVEC (struct symbol *, new_nbuckets);
|
|
int i;
|
|
|
|
DICT_HASHED_NBUCKETS (dict) = new_nbuckets;
|
|
DICT_HASHED_BUCKETS (dict) = new_buckets;
|
|
|
|
for (i = 0; i < old_nbuckets; ++i)
|
|
{
|
|
struct symbol *sym, *next_sym;
|
|
|
|
sym = old_buckets[i];
|
|
if (sym != NULL)
|
|
{
|
|
for (next_sym = sym->hash_next;
|
|
next_sym != NULL;
|
|
next_sym = sym->hash_next)
|
|
{
|
|
insert_symbol_hashed (dict, sym);
|
|
sym = next_sym;
|
|
}
|
|
|
|
insert_symbol_hashed (dict, sym);
|
|
}
|
|
}
|
|
|
|
xfree (old_buckets);
|
|
}
|
|
|
|
/* See dictionary.h. */
|
|
|
|
unsigned int
|
|
default_search_name_hash (const char *string0)
|
|
{
|
|
/* The Ada-encoded version of a name P1.P2...Pn has either the form
|
|
P1__P2__...Pn<suffix> or _ada_P1__P2__...Pn<suffix> (where the Pi
|
|
are lower-cased identifiers). The <suffix> (which can be empty)
|
|
encodes additional information about the denoted entity. This
|
|
routine hashes such names to msymbol_hash_iw(Pn). It actually
|
|
does this for a superset of both valid Pi and of <suffix>, but
|
|
in other cases it simply returns msymbol_hash_iw(STRING0). */
|
|
|
|
const char *string;
|
|
unsigned int hash;
|
|
|
|
string = string0;
|
|
if (*string == '_')
|
|
{
|
|
if (startswith (string, "_ada_"))
|
|
string += 5;
|
|
else
|
|
return msymbol_hash_iw (string0);
|
|
}
|
|
|
|
hash = 0;
|
|
while (*string)
|
|
{
|
|
/* Ignore "TKB" suffixes.
|
|
|
|
These are used by Ada for subprograms implementing a task body.
|
|
For instance for a task T inside package Pck, the name of the
|
|
subprogram implementing T's body is `pck__tTKB'. We need to
|
|
ignore the "TKB" suffix because searches for this task body
|
|
subprogram are going to be performed using `pck__t' (the encoded
|
|
version of the natural name `pck.t'). */
|
|
if (strcmp (string, "TKB") == 0)
|
|
return hash;
|
|
|
|
switch (*string)
|
|
{
|
|
case '$':
|
|
case '.':
|
|
case 'X':
|
|
if (string0 == string)
|
|
return msymbol_hash_iw (string0);
|
|
else
|
|
return hash;
|
|
case ' ':
|
|
case '(':
|
|
return msymbol_hash_iw (string0);
|
|
case '_':
|
|
if (string[1] == '_' && string != string0)
|
|
{
|
|
int c = string[2];
|
|
|
|
if ((c < 'a' || c > 'z') && c != 'O')
|
|
return hash;
|
|
hash = 0;
|
|
string += 2;
|
|
break;
|
|
}
|
|
/* FALL THROUGH */
|
|
default:
|
|
hash = SYMBOL_HASH_NEXT (hash, *string);
|
|
string += 1;
|
|
break;
|
|
}
|
|
}
|
|
return hash;
|
|
}
|
|
|
|
/* Functions for DICT_LINEAR and DICT_LINEAR_EXPANDABLE. */
|
|
|
|
static struct symbol *
|
|
iterator_first_linear (const struct dictionary *dict,
|
|
struct dict_iterator *iterator)
|
|
{
|
|
DICT_ITERATOR_DICT (iterator) = dict;
|
|
DICT_ITERATOR_INDEX (iterator) = 0;
|
|
return DICT_LINEAR_NSYMS (dict) ? DICT_LINEAR_SYM (dict, 0) : NULL;
|
|
}
|
|
|
|
static struct symbol *
|
|
iterator_next_linear (struct dict_iterator *iterator)
|
|
{
|
|
const struct dictionary *dict = DICT_ITERATOR_DICT (iterator);
|
|
|
|
if (++DICT_ITERATOR_INDEX (iterator) >= DICT_LINEAR_NSYMS (dict))
|
|
return NULL;
|
|
else
|
|
return DICT_LINEAR_SYM (dict, DICT_ITERATOR_INDEX (iterator));
|
|
}
|
|
|
|
static struct symbol *
|
|
iter_match_first_linear (const struct dictionary *dict,
|
|
const lookup_name_info &name,
|
|
struct dict_iterator *iterator)
|
|
{
|
|
DICT_ITERATOR_DICT (iterator) = dict;
|
|
DICT_ITERATOR_INDEX (iterator) = -1;
|
|
|
|
return iter_match_next_linear (name, iterator);
|
|
}
|
|
|
|
static struct symbol *
|
|
iter_match_next_linear (const lookup_name_info &name,
|
|
struct dict_iterator *iterator)
|
|
{
|
|
const struct dictionary *dict = DICT_ITERATOR_DICT (iterator);
|
|
const language_defn *lang = DICT_LANGUAGE (dict);
|
|
symbol_name_matcher_ftype *matches_name
|
|
= language_get_symbol_name_matcher (lang, name);
|
|
|
|
int i, nsyms = DICT_LINEAR_NSYMS (dict);
|
|
struct symbol *sym, *retval = NULL;
|
|
|
|
for (i = DICT_ITERATOR_INDEX (iterator) + 1; i < nsyms; ++i)
|
|
{
|
|
sym = DICT_LINEAR_SYM (dict, i);
|
|
|
|
if (matches_name (SYMBOL_SEARCH_NAME (sym), name, NULL))
|
|
{
|
|
retval = sym;
|
|
break;
|
|
}
|
|
}
|
|
|
|
DICT_ITERATOR_INDEX (iterator) = i;
|
|
|
|
return retval;
|
|
}
|
|
|
|
static int
|
|
size_linear (const struct dictionary *dict)
|
|
{
|
|
return DICT_LINEAR_NSYMS (dict);
|
|
}
|
|
|
|
/* Functions only for DICT_LINEAR_EXPANDABLE. */
|
|
|
|
static void
|
|
free_linear_expandable (struct dictionary *dict)
|
|
{
|
|
xfree (DICT_LINEAR_SYMS (dict));
|
|
xfree (dict);
|
|
}
|
|
|
|
|
|
static void
|
|
add_symbol_linear_expandable (struct dictionary *dict,
|
|
struct symbol *sym)
|
|
{
|
|
int nsyms = ++DICT_LINEAR_NSYMS (dict);
|
|
|
|
/* Do we have enough room? If not, grow it. */
|
|
if (nsyms > DICT_LINEAR_EXPANDABLE_CAPACITY (dict))
|
|
{
|
|
DICT_LINEAR_EXPANDABLE_CAPACITY (dict) *= 2;
|
|
DICT_LINEAR_SYMS (dict)
|
|
= XRESIZEVEC (struct symbol *, DICT_LINEAR_SYMS (dict),
|
|
DICT_LINEAR_EXPANDABLE_CAPACITY (dict));
|
|
}
|
|
|
|
DICT_LINEAR_SYM (dict, nsyms - 1) = sym;
|
|
}
|