X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fpsymtab.c;h=df10a756fd180b56278b8cf10af726d90635215f;hb=59c35742fb785b1e454f45c2ace663000bf34f4c;hp=7af82d6327cf507d8d7fed5d7bd71220a91b59d6;hpb=d320c2b5e181828418224521f2acd2ff48e127f4;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/psymtab.c b/gdb/psymtab.c index 7af82d6327..df10a756fd 100644 --- a/gdb/psymtab.c +++ b/gdb/psymtab.c @@ -26,7 +26,6 @@ #include "source.h" #include "addrmap.h" #include "gdbtypes.h" -#include "bcache.h" #include "ui-out.h" #include "command.h" #include "readline/readline.h" @@ -38,18 +37,6 @@ #include #include -struct psymbol_bcache -{ - struct bcache *bcache; -}; - -static struct partial_symbol *match_partial_symbol (struct objfile *, - struct partial_symtab *, - int, - const char *, domain_enum, - symbol_name_match_type, - symbol_compare_ftype *); - static struct partial_symbol *lookup_partial_symbol (struct objfile *, struct partial_symtab *, const char *, int, @@ -67,22 +54,46 @@ static struct compunit_symtab *psymtab_to_symtab (struct objfile *objfile, -psymtab_storage::psymtab_storage (struct objfile *objfile) - : obstack (&objfile->objfile_obstack), - psymbol_cache (psymbol_bcache_init ()) +static unsigned long psymbol_hash (const void *addr, int length); +static int psymbol_compare (const void *addr1, const void *addr2, int length); + +psymtab_storage::psymtab_storage () + : psymbol_cache (psymbol_hash, psymbol_compare) { } psymtab_storage::~psymtab_storage () { - psymbol_bcache_free (psymbol_cache); +} + +/* See psymtab.h. */ + +struct partial_symtab * +psymtab_storage::allocate_psymtab () +{ + struct partial_symtab *psymtab; + + if (free_psymtabs != nullptr) + { + psymtab = free_psymtabs; + free_psymtabs = psymtab->next; + } + else + psymtab = XOBNEW (obstack (), struct partial_symtab); + + memset (psymtab, 0, sizeof (struct partial_symtab)); + + psymtab->next = psymtabs; + psymtabs = psymtab; + + return psymtab; } /* See psymtab.h. */ -objfile_psymtabs +psymtab_storage::partial_symtab_range require_partial_symbols (struct objfile *objfile, int verbose) { if ((objfile->flags & OBJF_PSYMTABS_READ) == 0) @@ -107,7 +118,7 @@ require_partial_symbols (struct objfile *objfile, int verbose) } } - return objfile_psymtabs (objfile); + return objfile->psymtabs (); } /* Helper function for psym_map_symtabs_matching_filename that @@ -290,14 +301,24 @@ find_pc_sect_psymtab (struct objfile *objfile, CORE_ADDR pc, struct obj_section *section, struct bound_minimal_symbol msymbol) { - CORE_ADDR baseaddr = ANOFFSET (objfile->section_offsets, - SECT_OFF_TEXT (objfile)); - - /* Try just the PSYMTABS_ADDRMAP mapping first as it has better granularity - than the later used TEXTLOW/TEXTHIGH one. */ - - if (objfile->partial_symtabs->psymtabs_addrmap != NULL) + /* Try just the PSYMTABS_ADDRMAP mapping first as it has better + granularity than the later used TEXTLOW/TEXTHIGH one. However, we need + to take care as the PSYMTABS_ADDRMAP can hold things other than partial + symtabs in some cases. + + This function should only be called for objfiles that are using partial + symtabs, not for objfiles that are using indexes (.gdb_index or + .debug_names), however 'maintenance print psymbols' calls this function + directly for all objfiles. If we assume that PSYMTABS_ADDRMAP contains + partial symtabs then we will end up returning a pointer to an object + that is not a partial_symtab, which doesn't end well. */ + + if (objfile->partial_symtabs->psymtabs != NULL + && objfile->partial_symtabs->psymtabs_addrmap != NULL) { + CORE_ADDR baseaddr = ANOFFSET (objfile->section_offsets, + SECT_OFF_TEXT (objfile)); + struct partial_symtab *pst = ((struct partial_symtab *) addrmap_find (objfile->partial_symtabs->psymtabs_addrmap, @@ -461,7 +482,7 @@ find_pc_sect_psymbol (struct objfile *objfile, static struct compunit_symtab * psym_lookup_symbol (struct objfile *objfile, - int block_index, const char *name, + block_enum block_index, const char *name, const domain_enum domain) { const int psymtab_index = (block_index == GLOBAL_BLOCK ? 1 : 0); @@ -480,7 +501,7 @@ psym_lookup_symbol (struct objfile *objfile, partial symtab is empty, we can assume it won't here because lookup_partial_symbol succeeded. */ const struct blockvector *bv = COMPUNIT_BLOCKVECTOR (stab); - struct block *block = BLOCKVECTOR_BLOCK (bv, block_index); + const struct block *block = BLOCKVECTOR_BLOCK (bv, block_index); sym = block_find_symbol (block, name, domain, block_find_non_opaque_type_preferred, @@ -510,10 +531,10 @@ static bool psymbol_name_matches (partial_symbol *psym, const lookup_name_info &lookup_name) { - const language_defn *lang = language_def (psym->language); + const language_defn *lang = language_def (psym->ginfo.language); symbol_name_matcher_ftype *name_match = get_symbol_name_matcher (lang, lookup_name); - return name_match (symbol_search_name (psym), lookup_name, NULL); + return name_match (symbol_search_name (&psym->ginfo), lookup_name, NULL); } /* Look in PST for a symbol in DOMAIN whose name matches NAME. Search @@ -527,8 +548,7 @@ psymbol_name_matches (partial_symbol *psym, static struct partial_symbol * match_partial_symbol (struct objfile *objfile, struct partial_symtab *pst, int global, - const char *name, domain_enum domain, - symbol_name_match_type match_type, + const lookup_name_info &name, domain_enum domain, symbol_compare_ftype *ordered_compare) { struct partial_symbol **start, **psym; @@ -539,8 +559,6 @@ match_partial_symbol (struct objfile *objfile, if (length == 0) return NULL; - lookup_name_info lookup_name (name, match_type); - start = (global ? &objfile->partial_symtabs->global_psymbols[pst->globals_offset] : &objfile->partial_symtabs->static_psymbols[pst->statics_offset]); @@ -563,11 +581,12 @@ match_partial_symbol (struct objfile *objfile, center = bottom + (top - bottom) / 2; gdb_assert (center < top); - enum language lang = (*center)->language; + enum language lang = (*center)->ginfo.language; const char *lang_ln - = lookup_name.language_lookup_name (lang).c_str (); + = name.language_lookup_name (lang).c_str (); - if (ordered_compare (symbol_search_name (*center), lang_ln) >= 0) + if (ordered_compare (symbol_search_name (&(*center)->ginfo), + lang_ln) >= 0) top = center; else bottom = center + 1; @@ -575,9 +594,9 @@ match_partial_symbol (struct objfile *objfile, gdb_assert (top == bottom); while (top <= real_top - && psymbol_name_matches (*top, lookup_name)) + && psymbol_name_matches (*top, name)) { - if (symbol_matches_domain ((*top)->language, + if (symbol_matches_domain ((*top)->ginfo.language, (*top)->domain, domain)) return *top; top++; @@ -591,9 +610,9 @@ match_partial_symbol (struct objfile *objfile, { for (psym = start; psym < start + length; psym++) { - if (symbol_matches_domain ((*psym)->language, + if (symbol_matches_domain ((*psym)->ginfo.language, (*psym)->domain, domain) - && psymbol_name_matches (*psym, lookup_name)) + && psymbol_name_matches (*psym, name)) return *psym; } } @@ -628,7 +647,7 @@ psymtab_search_name (const char *name) break; } - return gdb::unique_xmalloc_ptr (xstrdup (name)); + return make_unique_xstrdup (name); } /* Look, in partial_symtab PST, for symbol whose natural name is NAME. @@ -674,7 +693,7 @@ lookup_partial_symbol (struct objfile *objfile, if (!(center < top)) internal_error (__FILE__, __LINE__, _("failed internal consistency check")); - if (strcmp_iw_ordered (symbol_search_name (*center), + if (strcmp_iw_ordered (symbol_search_name (&(*center)->ginfo), search_name.get ()) >= 0) { top = center; @@ -690,15 +709,17 @@ lookup_partial_symbol (struct objfile *objfile, /* For `case_sensitivity == case_sensitive_off' strcmp_iw_ordered will search more exactly than what matches SYMBOL_MATCHES_SEARCH_NAME. */ - while (top >= start && symbol_matches_search_name (*top, lookup_name)) + while (top >= start && symbol_matches_search_name (&(*top)->ginfo, + lookup_name)) top--; /* Fixup to have a symbol which matches SYMBOL_MATCHES_SEARCH_NAME. */ top++; - while (top <= real_top && symbol_matches_search_name (*top, lookup_name)) + while (top <= real_top && symbol_matches_search_name (&(*top)->ginfo, + lookup_name)) { - if (symbol_matches_domain ((*top)->language, + if (symbol_matches_domain ((*top)->ginfo.language, (*top)->domain, domain)) return *top; top++; @@ -712,9 +733,9 @@ lookup_partial_symbol (struct objfile *objfile, { for (psym = start; psym < start + length; psym++) { - if (symbol_matches_domain ((*psym)->language, + if (symbol_matches_domain ((*psym)->ginfo.language, (*psym)->domain, domain) - && symbol_matches_search_name (*psym, lookup_name)) + && symbol_matches_search_name (&(*psym)->ginfo, lookup_name)) return *psym; } } @@ -814,10 +835,11 @@ print_partial_symbols (struct gdbarch *gdbarch, struct objfile *objfile, while (count-- > 0) { QUIT; - fprintf_filtered (outfile, " `%s'", (*p)->name); - if (symbol_demangled_name (*p) != NULL) + fprintf_filtered (outfile, " `%s'", (*p)->ginfo.name); + if (symbol_demangled_name (&(*p)->ginfo) != NULL) { - fprintf_filtered (outfile, " `%s'", symbol_demangled_name (*p)); + fprintf_filtered (outfile, " `%s'", + symbol_demangled_name (&(*p)->ginfo)); } fputs_filtered (", ", outfile); switch ((*p)->domain) @@ -831,9 +853,15 @@ print_partial_symbols (struct gdbarch *gdbarch, struct objfile *objfile, case STRUCT_DOMAIN: fputs_filtered ("struct domain, ", outfile); break; + case MODULE_DOMAIN: + fputs_filtered ("module domain, ", outfile); + break; case LABEL_DOMAIN: fputs_filtered ("label domain, ", outfile); break; + case COMMON_BLOCK_DOMAIN: + fputs_filtered ("common block domain, ", outfile); + break; default: fputs_filtered (", ", outfile); break; @@ -1140,49 +1168,16 @@ psymtab_to_fullname (struct partial_symtab *ps) return ps->fullname; } -/* 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 domain, struct objfile *objfile, - struct block *block, - int (*callback) (struct block *, struct symbol *, void *), - void *data, symbol_name_match_type match) -{ - struct block_iterator iter; - struct symbol *sym; - - lookup_name_info lookup_name (name, match); - - for (sym = block_iter_match_first (block, lookup_name, &iter); - sym != NULL; - sym = block_iter_match_next (lookup_name, &iter)) - { - if (symbol_matches_domain (SYMBOL_LANGUAGE (sym), - SYMBOL_DOMAIN (sym), domain)) - { - if (callback (block, sym, data)) - return 1; - } - } - - return 0; -} - /* Psymtab version of map_matching_symbols. See its definition in the definition of quick_symbol_functions in symfile.h. */ static void -psym_map_matching_symbols (struct objfile *objfile, - const char *name, domain_enum domain, - int global, - int (*callback) (struct block *, - struct symbol *, void *), - void *data, - symbol_name_match_type match, - symbol_compare_ftype *ordered_compare) +psym_map_matching_symbols + (struct objfile *objfile, + const lookup_name_info &name, domain_enum domain, + int global, + gdb::function_view callback, + symbol_compare_ftype *ordered_compare) { const int block_kind = global ? GLOBAL_BLOCK : STATIC_BLOCK; @@ -1190,19 +1185,17 @@ psym_map_matching_symbols (struct objfile *objfile, { QUIT; if (ps->readin - || match_partial_symbol (objfile, ps, global, name, domain, match, + || match_partial_symbol (objfile, ps, global, name, domain, ordered_compare)) { struct compunit_symtab *cust = psymtab_to_symtab (objfile, ps); - struct block *block; + const struct block *block; if (cust == NULL) continue; block = BLOCKVECTOR_BLOCK (COMPUNIT_BLOCKVECTOR (cust), block_kind); - if (map_block (name, domain, objfile, block, - callback, data, match)) - return; - if (callback (block, NULL, data)) + if (!iterate_over_symbols_terminated (block, name, + domain, callback)) return; } } @@ -1279,6 +1272,8 @@ recursively_search_psymtabs QUIT; if ((domain == ALL_DOMAIN + || (domain == MODULES_DOMAIN + && (*psym)->domain == MODULE_DOMAIN) || (domain == VARIABLES_DOMAIN && (*psym)->aclass != LOC_TYPEDEF && (*psym)->aclass != LOC_BLOCK) @@ -1287,7 +1282,8 @@ recursively_search_psymtabs || (domain == TYPES_DOMAIN && (*psym)->aclass == LOC_TYPEDEF)) && psymbol_name_matches (*psym, lookup_name) - && (sym_matcher == NULL || sym_matcher (symbol_search_name (*psym)))) + && (sym_matcher == NULL + || sym_matcher (symbol_search_name (&(*psym)->ginfo)))) { /* Found a match, so notify our caller. */ result = PST_SEARCHED_AND_FOUND; @@ -1319,7 +1315,7 @@ psym_expand_symtabs_matching for (partial_symtab *ps : require_partial_symbols (objfile, 1)) ps->searched_flag = PST_NOT_SEARCHED; - for (partial_symtab *ps : objfile_psymtabs (objfile)) + for (partial_symtab *ps : objfile->psymtabs ()) { QUIT; @@ -1482,8 +1478,8 @@ sort_pst_symbols (struct objfile *objfile, struct partial_symtab *pst) std::sort (begin, end, [] (partial_symbol *s1, partial_symbol *s2) { - return strcmp_iw_ordered (symbol_search_name (s1), - symbol_search_name (s2)) < 0; + return strcmp_iw_ordered (symbol_search_name (&s1->ginfo), + symbol_search_name (&s2->ginfo)) < 0; }); } @@ -1530,18 +1526,18 @@ psymbol_hash (const void *addr, int length) { unsigned long h = 0; struct partial_symbol *psymbol = (struct partial_symbol *) addr; - unsigned int lang = psymbol->language; + unsigned int lang = psymbol->ginfo.language; unsigned int domain = psymbol->domain; unsigned int theclass = psymbol->aclass; - h = hash_continue (&psymbol->value, sizeof (psymbol->value), h); + 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 (&theclass, sizeof (unsigned int), h); /* Note that psymbol names are interned via symbol_set_names, so there's no need to hash the contents of the name here. */ - h = hash_continue (&psymbol->name, - sizeof (psymbol->name), h); + h = hash_continue (&psymbol->ginfo.name, + sizeof (psymbol->ginfo.name), h); return h; } @@ -1556,61 +1552,15 @@ psymbol_compare (const void *addr1, const void *addr2, int length) struct partial_symbol *sym1 = (struct partial_symbol *) addr1; struct partial_symbol *sym2 = (struct partial_symbol *) addr2; - return (memcmp (&sym1->value, &sym2->value, - sizeof (sym1->value)) == 0 - && sym1->language == sym2->language + return (memcmp (&sym1->ginfo.value, &sym2->ginfo.value, + sizeof (sym1->ginfo.value)) == 0 + && sym1->ginfo.language == sym2->ginfo.language && sym1->domain == sym2->domain && sym1->aclass == sym2->aclass /* Note that psymbol names are interned via symbol_set_names, so there's no need to compare the contents of the name here. */ - && sym1->name == sym2->name); -} - -/* Initialize a partial symbol bcache. */ - -struct psymbol_bcache * -psymbol_bcache_init (void) -{ - struct psymbol_bcache *bcache = XCNEW (struct psymbol_bcache); - - bcache->bcache = bcache_xmalloc (psymbol_hash, psymbol_compare); - return bcache; -} - -/* Free a partial symbol bcache. */ - -void -psymbol_bcache_free (struct psymbol_bcache *bcache) -{ - if (bcache == NULL) - return; - - bcache_xfree (bcache->bcache); - xfree (bcache); -} - -/* Return the internal bcache of the psymbol_bcache BCACHE. */ - -struct bcache * -psymbol_bcache_get_bcache (struct psymbol_bcache *bcache) -{ - return bcache->bcache; -} - -/* Find a copy of the SYM in BCACHE. If BCACHE has never seen this - symbol before, add a copy to BCACHE. In either case, return a pointer - to BCACHE's copy of the symbol. If optional ADDED is not NULL, return - 1 in case of new entry or 0 if returning an old entry. */ - -static struct partial_symbol * -psymbol_bcache_full (struct partial_symbol *sym, - struct psymbol_bcache *bcache, - int *added) -{ - return ((struct partial_symbol *) - bcache_full (sym, sizeof (struct partial_symbol), bcache->bcache, - added)); + && sym1->ginfo.name == sym2->ginfo.name); } /* Helper function, initialises partial symbol structure and stashes @@ -1620,7 +1570,7 @@ psymbol_bcache_full (struct partial_symbol *sym, different domain (or address) is possible and correct. */ static struct partial_symbol * -add_psymbol_to_bcache (const char *name, int namelength, int copy_name, +add_psymbol_to_bcache (gdb::string_view name, bool copy_name, domain_enum domain, enum address_class theclass, short section, @@ -1629,21 +1579,21 @@ add_psymbol_to_bcache (const char *name, int namelength, int copy_name, int *added) { struct partial_symbol psymbol; + memset (&psymbol, 0, sizeof (psymbol)); psymbol.set_unrelocated_address (coreaddr); - psymbol.section = section; + psymbol.ginfo.section = section; psymbol.domain = domain; psymbol.aclass = theclass; - - memset (&psymbol.language_specific, 0, sizeof (psymbol.language_specific)); - psymbol.ada_mangled = 0; - symbol_set_language (&psymbol, language, &objfile->objfile_obstack); - symbol_set_names (&psymbol, name, namelength, copy_name, objfile->per_bfd); + symbol_set_language (&psymbol.ginfo, language, + objfile->partial_symtabs->obstack ()); + symbol_set_names (&psymbol.ginfo, name, copy_name, + objfile->per_bfd); /* Stash the partial symbol away in the cache. */ - return psymbol_bcache_full (&psymbol, - objfile->partial_symtabs->psymbol_cache, - added); + return ((struct partial_symbol *) + objfile->partial_symtabs->psymbol_cache.insert + (&psymbol, sizeof (struct partial_symbol), added)); } /* Helper function, adds partial symbol to the given partial symbol list. */ @@ -1657,14 +1607,10 @@ append_psymbol_to_list (std::vector *list, OBJSTAT (objfile, n_psyms++); } -/* Add a symbol with a long value to a psymtab. - Since one arg is a struct, we pass in a ptr and deref it (sigh). - The only value we need to store for psyms is an address. - For all other psyms pass zero for COREADDR. - Return the partial symbol that has been added. */ +/* See psympriv.h. */ void -add_psymbol_to_list (const char *name, int namelength, int copy_name, +add_psymbol_to_list (gdb::string_view name, bool copy_name, domain_enum domain, enum address_class theclass, short section, @@ -1677,7 +1623,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, theclass, + psym = add_psymbol_to_bcache (name, copy_name, domain, theclass, section, coreaddr, language, objfile, &added); /* Do not duplicate global partial symbols. */ @@ -1714,29 +1660,14 @@ init_psymbol_list (struct objfile *objfile, int total_symbols) struct partial_symtab * allocate_psymtab (const char *filename, struct objfile *objfile) { - struct partial_symtab *psymtab; + struct partial_symtab *psymtab + = objfile->partial_symtabs->allocate_psymtab (); - if (objfile->partial_symtabs->free_psymtabs) - { - psymtab = objfile->partial_symtabs->free_psymtabs; - objfile->partial_symtabs->free_psymtabs = psymtab->next; - } - else - psymtab = XOBNEW (&objfile->objfile_obstack, partial_symtab); - - memset (psymtab, 0, sizeof (struct partial_symtab)); psymtab->filename - = (const char *) bcache (filename, strlen (filename) + 1, - objfile->per_bfd->filename_cache); + = ((const char *) objfile->per_bfd->filename_cache.insert + (filename, strlen (filename) + 1)); psymtab->compunit_symtab = NULL; - /* Prepend it to the psymtab list for the objfile it belongs to. - Psymtabs are searched in most recent inserted -> least recent - inserted order. */ - - psymtab->next = objfile->partial_symtabs->psymtabs; - objfile->partial_symtabs->psymtabs = psymtab; - if (symtab_create_debug) { /* Be a bit clever with debugging messages, and don't print objfile @@ -1934,7 +1865,7 @@ maintenance_print_psymbols (const char *args, int from_tty) } found = 0; - for (objfile *objfile : all_objfiles (current_program_space)) + for (objfile *objfile : current_program_space->objfiles ()) { int printed_objfile_header = 0; int print_for_objfile = 1; @@ -2027,7 +1958,7 @@ maintenance_info_psymtabs (const char *regexp, int from_tty) re_comp (regexp); ALL_PSPACES (pspace) - for (objfile *objfile : all_objfiles (pspace)) + for (objfile *objfile : pspace->objfiles ()) { struct gdbarch *gdbarch = get_objfile_arch (objfile); @@ -2137,10 +2068,10 @@ maintenance_check_psymtabs (const char *ignore, int from_tty) struct symbol *sym; struct compunit_symtab *cust = NULL; const struct blockvector *bv; - struct block *b; + const struct block *b; int length; - for (objfile *objfile : all_objfiles (current_program_space)) + for (objfile *objfile : current_program_space->objfiles ()) for (partial_symtab *ps : require_partial_symbols (objfile, 1)) { struct gdbarch *gdbarch = get_objfile_arch (objfile); @@ -2175,13 +2106,13 @@ maintenance_check_psymtabs (const char *ignore, int from_tty) length = ps->n_static_syms; while (length--) { - sym = block_lookup_symbol (b, symbol_search_name (*psym), + sym = block_lookup_symbol (b, symbol_search_name (&(*psym)->ginfo), symbol_name_match_type::SEARCH_NAME, (*psym)->domain); if (!sym) { printf_filtered ("Static symbol `"); - puts_filtered ((*psym)->name); + puts_filtered ((*psym)->ginfo.name); printf_filtered ("' only found in "); puts_filtered (ps->filename); printf_filtered (" psymtab\n"); @@ -2193,13 +2124,13 @@ maintenance_check_psymtabs (const char *ignore, int from_tty) length = ps->n_global_syms; while (length--) { - sym = block_lookup_symbol (b, symbol_search_name (*psym), + sym = block_lookup_symbol (b, symbol_search_name (&(*psym)->ginfo), symbol_name_match_type::SEARCH_NAME, (*psym)->domain); if (!sym) { printf_filtered ("Global symbol `"); - puts_filtered ((*psym)->name); + puts_filtered ((*psym)->ginfo.name); printf_filtered ("' only found in "); puts_filtered (ps->filename); printf_filtered (" psymtab\n");