/* Routines for name->symbol lookups in GDB.
- Copyright (C) 2003, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2007-2012 Free Software Foundation, Inc.
Contributed by David Carlton <carlton@bactrian.org> and by Kealia,
Inc.
* 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.
-
-*/
+ dict_<op> to dictionary.h. */
/* An enum representing the various implementations of dictionaries.
Used only for debugging. */
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 char *name,
- int (*equiv) (const char *,
- const char *),
- struct dict_iterator *iterator);
+ const char *name,
+ symbol_compare_ftype *equiv,
+ struct dict_iterator *iterator);
struct symbol *(*iter_match_next) (const char *name,
- int (*equiv) (const char *,
- const char *),
+ symbol_compare_ftype *equiv,
struct dict_iterator *iterator);
/* A size function, for maint print symtabs. */
int (*size) (const struct dictionary *dict);
static struct symbol *iter_match_first_hashed (const struct dictionary *dict,
const char *name,
- int (*compare) (const char *,
- const char *),
+ symbol_compare_ftype *compare,
struct dict_iterator *iterator);
static struct symbol *iter_match_next_hashed (const char *name,
- int (*compare) (const char *,
- const char *),
+ symbol_compare_ftype *compare,
struct dict_iterator *iterator);
static unsigned int dict_hash (const char *string);
static struct symbol *iter_match_first_linear (const struct dictionary *dict,
const char *name,
- int (*compare) (const char *,
- const char *),
+ symbol_compare_ftype *compare,
struct dict_iterator *iterator);
static struct symbol *iter_match_next_linear (const char *name,
- int (*compare) (const char *,
- const char *),
+ symbol_compare_ftype *compare,
struct dict_iterator *iterator);
static int size_linear (const struct dictionary *dict);
struct symbol *
dict_iter_match_first (const struct dictionary *dict,
- const char *name,
- int (*compare) (const char *, const char *),
+ const char *name, symbol_compare_ftype *compare,
struct dict_iterator *iterator)
{
- return (DICT_VECTOR (dict))->iter_match_first (dict, name, compare, iterator);
+ return (DICT_VECTOR (dict))->iter_match_first (dict, name,
+ compare, iterator);
}
struct symbol *
-dict_iter_match_next (const char *name,
- int (*compare) (const char *, const char *),
+dict_iter_match_next (const char *name, symbol_compare_ftype *compare,
struct dict_iterator *iterator)
{
return (DICT_VECTOR (DICT_ITERATOR_DICT (iterator)))
}
static struct symbol *
-iter_match_first_hashed (const struct dictionary *dict,
- const char *name,
- int (*compare) (const char *, const char *),
+iter_match_first_hashed (const struct dictionary *dict, const char *name,
+ symbol_compare_ftype *compare,
struct dict_iterator *iterator)
{
unsigned int hash_index = dict_hash (name) % DICT_HASHED_NBUCKETS (dict);
}
static struct symbol *
-iter_match_next_hashed (const char *name,
- int (*compare) (const char *, const char *),
+iter_match_next_hashed (const char *name, symbol_compare_ftype *compare,
struct dict_iterator *iterator)
{
struct symbol *next;
comparison operators hash to the same value. */
static unsigned int
-dict_hash (const char *string)
+dict_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
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;
- int c;
- if (*string == '_' && strncmp (string, "_ada_", 5) == 0)
- string += 5;
+ string = string0;
+ if (*string == '_')
+ {
+ if (strncmp (string, "_ada_", 5) == 0)
+ 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':
- case '(':
- return hash;
+ if (string0 == string)
+ return msymbol_hash_iw (string0);
+ else
+ return hash;
case ' ':
- string += 1;
- break;
+ case '(':
+ return msymbol_hash_iw (string0);
case '_':
- if (string[1] == '_')
+ if (string[1] == '_' && string != string0)
{
- if (((c = string[2]) < 'a' || c > 'z') && c != 'O')
+ int c = string[2];
+
+ if ((c < 'a' || c > 'z') && c != 'O')
return hash;
hash = 0;
string += 2;
}
/* FALL THROUGH */
default:
- hash = hash * 67 + *string - 113;
+ hash = SYMBOL_HASH_NEXT (hash, *string);
string += 1;
break;
}
static struct symbol *
iter_match_first_linear (const struct dictionary *dict,
- const char *name,
- int (*compare) (const char *, const char *),
+ const char *name, symbol_compare_ftype *compare,
struct dict_iterator *iterator)
{
DICT_ITERATOR_DICT (iterator) = dict;
}
static struct symbol *
-iter_match_next_linear (const char *name,
- int (*compare) (const char *, const char *),
+iter_match_next_linear (const char *name, symbol_compare_ftype *compare,
struct dict_iterator *iterator)
{
const struct dictionary *dict = DICT_ITERATOR_DICT (iterator);
projects / deliverable / binutils-gdb.git / blobdiff