X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fpsymtab.c;h=ba403ae24865a0f0b303729a8a83d2f3efb09b8d;hb=d3ecddab5fc036fb57588a9bfff73575dc419052;hp=78a46997ca8397f6444e591aa9ca15b728a57239;hpb=af97b4161f07a716783183f1b17fa5cac9f99a49;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/psymtab.c b/gdb/psymtab.c index 78a46997ca..ba403ae248 100644 --- a/gdb/psymtab.c +++ b/gdb/psymtab.c @@ -28,7 +28,7 @@ #include "gdbtypes.h" #include "ui-out.h" #include "command.h" -#include "readline/readline.h" +#include "readline/tilde.h" #include "gdb_regex.h" #include "dictionary.h" #include "language.h" @@ -37,13 +37,6 @@ #include #include -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, @@ -101,7 +94,7 @@ psymtab_storage::allocate_psymtab () /* See psymtab.h. */ psymtab_storage::partial_symtab_range -require_partial_symbols (struct objfile *objfile, int verbose) +require_partial_symbols (struct objfile *objfile, bool verbose) { if ((objfile->flags & OBJF_PSYMTABS_READ) == 0) { @@ -168,7 +161,7 @@ psym_map_symtabs_matching_filename { const char *name_basename = lbasename (name); - for (partial_symtab *pst : require_partial_symbols (objfile, 1)) + for (partial_symtab *pst : require_partial_symbols (objfile, true)) { /* We can skip shared psymtabs here, because any file name will be attached to the unshared psymtab. */ @@ -308,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, @@ -361,7 +364,7 @@ find_pc_sect_psymtab (struct objfile *objfile, CORE_ADDR pc, its CUs may be missing in PSYMTABS_ADDRMAP as they may be varying debug info type in single OBJFILE. */ - for (partial_symtab *pst : require_partial_symbols (objfile, 1)) + for (partial_symtab *pst : require_partial_symbols (objfile, true)) if (!pst->psymtabs_addrmap_supported && pc >= pst->text_low (objfile) && pc < pst->text_high (objfile)) { @@ -479,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); @@ -487,7 +490,7 @@ psym_lookup_symbol (struct objfile *objfile, lookup_name_info lookup_name (name, symbol_name_match_type::FULL); - for (partial_symtab *ps : require_partial_symbols (objfile, 1)) + for (partial_symtab *ps : require_partial_symbols (objfile, true)) { if (!ps->readin && lookup_partial_symbol (objfile, ps, name, psymtab_index, domain)) @@ -528,10 +531,10 @@ static bool psymbol_name_matches (partial_symbol *psym, const lookup_name_info &lookup_name) { - const language_defn *lang = language_def (psym->ginfo.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->ginfo), lookup_name, NULL); + return name_match (psym->ginfo.search_name (), lookup_name, NULL); } /* Look in PST for a symbol in DOMAIN whose name matches NAME. Search @@ -545,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; @@ -557,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]); @@ -581,11 +581,11 @@ match_partial_symbol (struct objfile *objfile, center = bottom + (top - bottom) / 2; gdb_assert (center < top); - enum language lang = (*center)->ginfo.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)->ginfo), + if (ordered_compare ((*center)->ginfo.search_name (), lang_ln) >= 0) top = center; else @@ -594,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)->ginfo.language, + if (symbol_matches_domain ((*top)->ginfo.language (), (*top)->domain, domain)) return *top; top++; @@ -610,9 +610,9 @@ match_partial_symbol (struct objfile *objfile, { for (psym = start; psym < start + length; psym++) { - if (symbol_matches_domain ((*psym)->ginfo.language, + if (symbol_matches_domain ((*psym)->ginfo.language (), (*psym)->domain, domain) - && psymbol_name_matches (*psym, lookup_name)) + && psymbol_name_matches (*psym, name)) return *psym; } } @@ -647,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. @@ -693,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)->ginfo), + if (strcmp_iw_ordered ((*center)->ginfo.search_name (), search_name.get ()) >= 0) { top = center; @@ -719,7 +719,7 @@ lookup_partial_symbol (struct objfile *objfile, while (top <= real_top && symbol_matches_search_name (&(*top)->ginfo, lookup_name)) { - if (symbol_matches_domain ((*top)->ginfo.language, + if (symbol_matches_domain ((*top)->ginfo.language (), (*top)->domain, domain)) return *top; top++; @@ -733,7 +733,7 @@ lookup_partial_symbol (struct objfile *objfile, { for (psym = start; psym < start + length; psym++) { - if (symbol_matches_domain ((*psym)->ginfo.language, + if (symbol_matches_domain ((*psym)->ginfo.language (), (*psym)->domain, domain) && symbol_matches_search_name (&(*psym)->ginfo, lookup_name)) return *psym; @@ -780,7 +780,7 @@ psym_find_last_source_symtab (struct objfile *ofp) { struct partial_symtab *cs_pst = NULL; - for (partial_symtab *ps : require_partial_symbols (ofp, 1)) + for (partial_symtab *ps : require_partial_symbols (ofp, true)) { const char *name = ps->filename; int len = strlen (name); @@ -816,7 +816,7 @@ psym_find_last_source_symtab (struct objfile *ofp) static void psym_forget_cached_source_info (struct objfile *objfile) { - for (partial_symtab *pst : require_partial_symbols (objfile, 1)) + for (partial_symtab *pst : require_partial_symbols (objfile, true)) { if (pst->fullname != NULL) { @@ -836,10 +836,10 @@ print_partial_symbols (struct gdbarch *gdbarch, struct objfile *objfile, { QUIT; fprintf_filtered (outfile, " `%s'", (*p)->ginfo.name); - if (symbol_demangled_name (&(*p)->ginfo) != NULL) + if ((*p)->ginfo.demangled_name () != NULL) { fprintf_filtered (outfile, " `%s'", - symbol_demangled_name (&(*p)->ginfo)); + (*p)->ginfo.demangled_name ()); } fputs_filtered (", ", outfile); switch ((*p)->domain) @@ -853,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; @@ -1001,7 +1007,7 @@ psym_print_stats (struct objfile *objfile) int i; i = 0; - for (partial_symtab *ps : require_partial_symbols (objfile, 1)) + for (partial_symtab *ps : require_partial_symbols (objfile, true)) { if (ps->readin == 0) i++; @@ -1041,7 +1047,7 @@ static void psym_expand_symtabs_for_function (struct objfile *objfile, const char *func_name) { - for (partial_symtab *ps : require_partial_symbols (objfile, 1)) + for (partial_symtab *ps : require_partial_symbols (objfile, true)) { if (ps->readin) continue; @@ -1060,7 +1066,7 @@ psym_expand_symtabs_for_function (struct objfile *objfile, static void psym_expand_all_symtabs (struct objfile *objfile) { - for (partial_symtab *psymtab : require_partial_symbols (objfile, 1)) + for (partial_symtab *psymtab : require_partial_symbols (objfile, true)) psymtab_to_symtab (objfile, psymtab); } @@ -1071,7 +1077,7 @@ static void psym_expand_symtabs_with_fullname (struct objfile *objfile, const char *fullname) { - for (partial_symtab *p : require_partial_symbols (objfile, 1)) + for (partial_symtab *p : require_partial_symbols (objfile, true)) { /* Anonymous psymtabs don't have a name of a source file. */ if (p->anonymous) @@ -1094,7 +1100,7 @@ psym_map_symbol_filenames (struct objfile *objfile, symbol_filename_ftype *fun, void *data, int need_fullname) { - for (partial_symtab *ps : require_partial_symbols (objfile, 1)) + for (partial_symtab *ps : require_partial_symbols (objfile, true)) { const char *fullname; @@ -1162,57 +1168,24 @@ 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, - const struct block *block, - int (*callback) (const 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) (const 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; - for (partial_symtab *ps : require_partial_symbols (objfile, 1)) + for (partial_symtab *ps : require_partial_symbols (objfile, true)) { 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); @@ -1221,10 +1194,8 @@ psym_map_matching_symbols (struct objfile *objfile, 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; } } @@ -1301,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) @@ -1310,7 +1283,7 @@ recursively_search_psymtabs && (*psym)->aclass == LOC_TYPEDEF)) && psymbol_name_matches (*psym, lookup_name) && (sym_matcher == NULL - || sym_matcher (symbol_search_name (&(*psym)->ginfo)))) + || sym_matcher ((*psym)->ginfo.search_name ()))) { /* Found a match, so notify our caller. */ result = PST_SEARCHED_AND_FOUND; @@ -1339,7 +1312,7 @@ psym_expand_symtabs_matching lookup_name_info lookup_name = lookup_name_in.make_ignore_params (); /* Clear the search flags. */ - for (partial_symtab *ps : require_partial_symbols (objfile, 1)) + for (partial_symtab *ps : require_partial_symbols (objfile, true)) ps->searched_flag = PST_NOT_SEARCHED; for (partial_symtab *ps : objfile->psymtabs ()) @@ -1433,7 +1406,7 @@ psym_find_compunit_symtab_by_address (struct objfile *objfile, { std::set seen_addrs; - for (partial_symtab *pst : require_partial_symbols (objfile, 1)) + for (partial_symtab *pst : require_partial_symbols (objfile, true)) { psym_fill_psymbol_map (objfile, pst, &seen_addrs, @@ -1505,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->ginfo), - symbol_search_name (&s2->ginfo)) < 0; + return strcmp_iw_ordered (s1->ginfo.search_name (), + s2->ginfo.search_name ()) < 0; }); } @@ -1553,18 +1526,17 @@ psymbol_hash (const void *addr, int length) { unsigned long h = 0; struct partial_symbol *psymbol = (struct partial_symbol *) addr; - unsigned int lang = psymbol->ginfo.language; + unsigned int lang = psymbol->ginfo.language (); unsigned int domain = psymbol->domain; unsigned int theclass = psymbol->aclass; - 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); + h = fast_hash (&psymbol->ginfo.value, sizeof (psymbol->ginfo.value), h); + h = fast_hash (&lang, sizeof (unsigned int), h); + h = fast_hash (&domain, sizeof (unsigned int), h); + h = fast_hash (&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->ginfo.name, - sizeof (psymbol->ginfo.name), h); + h = fast_hash (&psymbol->ginfo.name, sizeof (psymbol->ginfo.name), h); return h; } @@ -1581,7 +1553,7 @@ psymbol_compare (const void *addr1, const void *addr2, int length) return (memcmp (&sym1->ginfo.value, &sym2->ginfo.value, sizeof (sym1->ginfo.value)) == 0 - && sym1->ginfo.language == sym2->ginfo.language + && sym1->ginfo.language () == sym2->ginfo.language () && sym1->domain == sym2->domain && sym1->aclass == sym2->aclass /* Note that psymbol names are interned via @@ -1597,7 +1569,7 @@ psymbol_compare (const void *addr1, const void *addr2, int length) 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, @@ -1612,9 +1584,8 @@ add_psymbol_to_bcache (const char *name, int namelength, int copy_name, psymbol.ginfo.section = section; psymbol.domain = domain; psymbol.aclass = theclass; - symbol_set_language (&psymbol.ginfo, language, - objfile->partial_symtabs->obstack ()); - symbol_set_names (&psymbol.ginfo, name, namelength, copy_name, + psymbol.ginfo.set_language (language, objfile->partial_symtabs->obstack ()); + symbol_set_names (&psymbol.ginfo, name, copy_name, objfile->per_bfd); /* Stash the partial symbol away in the cache. */ @@ -1634,14 +1605,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, @@ -1654,7 +1621,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. */ @@ -1932,7 +1899,7 @@ maintenance_print_psymbols (const char *args, int from_tty) } else { - for (partial_symtab *ps : require_partial_symbols (objfile, 1)) + for (partial_symtab *ps : require_partial_symbols (objfile, true)) { int print_for_source = 0; @@ -1997,7 +1964,7 @@ maintenance_info_psymtabs (const char *regexp, int from_tty) actually find a symtab whose name matches. */ int printed_objfile_start = 0; - for (partial_symtab *psymtab : require_partial_symbols (objfile, 1)) + for (partial_symtab *psymtab : require_partial_symbols (objfile, true)) { QUIT; @@ -2103,7 +2070,7 @@ maintenance_check_psymtabs (const char *ignore, int from_tty) int length; for (objfile *objfile : current_program_space->objfiles ()) - for (partial_symtab *ps : require_partial_symbols (objfile, 1)) + for (partial_symtab *ps : require_partial_symbols (objfile, true)) { struct gdbarch *gdbarch = get_objfile_arch (objfile); @@ -2137,7 +2104,7 @@ 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)->ginfo), + sym = block_lookup_symbol (b, (*psym)->ginfo.search_name (), symbol_name_match_type::SEARCH_NAME, (*psym)->domain); if (!sym) @@ -2155,7 +2122,7 @@ 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)->ginfo), + sym = block_lookup_symbol (b, (*psym)->ginfo.search_name (), symbol_name_match_type::SEARCH_NAME, (*psym)->domain); if (!sym)