diff options
Diffstat (limited to 'gdb/psymtab.c')
| -rw-r--r-- | gdb/psymtab.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gdb/psymtab.c b/gdb/psymtab.c index 4ee9dc1..b3c2f44 100644 --- a/gdb/psymtab.c +++ b/gdb/psymtab.c @@ -1247,13 +1247,13 @@ psymtab_to_fullname (struct partial_symtab *ps) return ps->fullname; } -/* For all symbols, s, in BLOCK that are in NAMESPACE and match NAME +/* For all symbols, s, in BLOCK that are in DOMAIN and match NAME according to the function MATCH, call CALLBACK(BLOCK, s, DATA). BLOCK is assumed to come from OBJFILE. Returns 1 iff CALLBACK ever returns non-zero, and otherwise returns 0. */ static int -map_block (const char *name, domain_enum namespace, struct objfile *objfile, +map_block (const char *name, domain_enum domain, struct objfile *objfile, struct block *block, int (*callback) (struct block *, struct symbol *, void *), void *data, symbol_compare_ftype *match) @@ -1265,7 +1265,7 @@ map_block (const char *name, domain_enum namespace, struct objfile *objfile, sym != NULL; sym = block_iter_match_next (name, match, &iter)) { if (symbol_matches_domain (SYMBOL_LANGUAGE (sym), - SYMBOL_DOMAIN (sym), namespace)) + SYMBOL_DOMAIN (sym), domain)) { if (callback (block, sym, data)) return 1; @@ -1280,7 +1280,7 @@ map_block (const char *name, domain_enum namespace, struct objfile *objfile, static void psym_map_matching_symbols (struct objfile *objfile, - const char *name, domain_enum namespace, + const char *name, domain_enum domain, int global, int (*callback) (struct block *, struct symbol *, void *), @@ -1295,7 +1295,7 @@ psym_map_matching_symbols (struct objfile *objfile, { QUIT; if (ps->readin - || match_partial_symbol (objfile, ps, global, name, namespace, match, + || match_partial_symbol (objfile, ps, global, name, domain, match, ordered_compare)) { struct compunit_symtab *cust = psymtab_to_symtab (objfile, ps); @@ -1304,7 +1304,7 @@ psym_map_matching_symbols (struct objfile *objfile, if (cust == NULL) continue; block = BLOCKVECTOR_BLOCK (COMPUNIT_BLOCKVECTOR (cust), block_kind); - if (map_block (name, namespace, objfile, block, + if (map_block (name, domain, objfile, block, callback, data, match)) return; if (callback (block, NULL, data)) @@ -1550,12 +1550,12 @@ psymbol_hash (const void *addr, int length) struct partial_symbol *psymbol = (struct partial_symbol *) addr; unsigned int lang = psymbol->ginfo.language; unsigned int domain = PSYMBOL_DOMAIN (psymbol); - unsigned int class = PSYMBOL_CLASS (psymbol); + unsigned int theclass = PSYMBOL_CLASS (psymbol); h = hash_continue (&psymbol->ginfo.value, sizeof (psymbol->ginfo.value), h); h = hash_continue (&lang, sizeof (unsigned int), h); h = hash_continue (&domain, sizeof (unsigned int), h); - h = hash_continue (&class, sizeof (unsigned int), h); + h = hash_continue (&theclass, sizeof (unsigned int), h); h = hash_continue (psymbol->ginfo.name, strlen (psymbol->ginfo.name), h); return h; @@ -1633,7 +1633,7 @@ psymbol_bcache_full (struct partial_symbol *sym, static const struct partial_symbol * add_psymbol_to_bcache (const char *name, int namelength, int copy_name, domain_enum domain, - enum address_class class, + enum address_class theclass, long val, /* Value as a long */ CORE_ADDR coreaddr, /* Value as a CORE_ADDR */ enum language language, struct objfile *objfile, @@ -1658,7 +1658,7 @@ add_psymbol_to_bcache (const char *name, int namelength, int copy_name, SYMBOL_SECTION (&psymbol) = -1; SYMBOL_SET_LANGUAGE (&psymbol, language, &objfile->objfile_obstack); PSYMBOL_DOMAIN (&psymbol) = domain; - PSYMBOL_CLASS (&psymbol) = class; + PSYMBOL_CLASS (&psymbol) = theclass; SYMBOL_SET_NAMES (&psymbol, name, namelength, copy_name, objfile); @@ -1718,7 +1718,7 @@ append_psymbol_to_list (struct psymbol_allocation_list *list, void add_psymbol_to_list (const char *name, int namelength, int copy_name, domain_enum domain, - enum address_class class, + enum address_class theclass, struct psymbol_allocation_list *list, long val, /* Value as a long */ CORE_ADDR coreaddr, /* Value as a CORE_ADDR */ @@ -1729,7 +1729,7 @@ add_psymbol_to_list (const char *name, int namelength, int copy_name, int added; /* Stash the partial symbol away in the cache. */ - psym = add_psymbol_to_bcache (name, namelength, copy_name, domain, class, + psym = add_psymbol_to_bcache (name, namelength, copy_name, domain, theclass, val, coreaddr, language, objfile, &added); /* Do not duplicate global partial symbols. */ |