X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fpsymtab.c;h=356901f14b75189993c36e456084e76e20641482;hb=6eee24ce30f8e95335c2ad8586f9a64398eb2cd4;hp=549628cad6a50a520a8770a5dff68d4d7671d453;hpb=4ae976d1df96aee0ecd97ea1235efc4490562932;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/psymtab.c b/gdb/psymtab.c index 549628cad6..356901f14b 100644 --- a/gdb/psymtab.c +++ b/gdb/psymtab.c @@ -1,6 +1,6 @@ /* Partial symbol tables. - Copyright (C) 2009-2018 Free Software Foundation, Inc. + Copyright (C) 2009-2019 Free Software Foundation, Inc. This file is part of GDB. @@ -19,8 +19,8 @@ #include "defs.h" #include "symtab.h" -#include "psympriv.h" #include "objfiles.h" +#include "psympriv.h" #include "block.h" #include "filenames.h" #include "source.h" @@ -62,16 +62,12 @@ static struct partial_symbol *find_pc_sect_psymbol (struct objfile *, CORE_ADDR, struct obj_section *); -static void fixup_psymbol_section (struct partial_symbol *psym, - struct objfile *objfile); - static struct compunit_symtab *psymtab_to_symtab (struct objfile *objfile, struct partial_symtab *pst); -/* Ensure that the partial symbols for OBJFILE have been loaded. This - function always returns its argument, as a convenience. */ +/* See psymtab.h. */ -struct objfile * +objfile_psymtabs require_partial_symbols (struct objfile *objfile, int verbose) { if ((objfile->flags & OBJF_PSYMTABS_READ) == 0) @@ -81,11 +77,8 @@ require_partial_symbols (struct objfile *objfile, int verbose) if (objfile->sf->sym_read_psymbols) { if (verbose) - { - printf_unfiltered (_("Reading symbols from %s..."), - objfile_name (objfile)); - gdb_flush (gdb_stdout); - } + printf_filtered (_("Reading symbols from %s...\n"), + objfile_name (objfile)); (*objfile->sf->sym_read_psymbols) (objfile); /* Partial symbols list are not expected to changed after this @@ -93,41 +86,15 @@ require_partial_symbols (struct objfile *objfile, int verbose) objfile->global_psymbols.shrink_to_fit (); objfile->static_psymbols.shrink_to_fit (); - if (verbose) - { - if (!objfile_has_symbols (objfile)) - { - wrap_here (""); - printf_unfiltered (_("(no debugging symbols found)...")); - wrap_here (""); - } - - printf_unfiltered (_("done.\n")); - } + if (verbose && !objfile_has_symbols (objfile)) + printf_filtered (_("(No debugging symbols found in %s)\n"), + objfile_name (objfile)); } } - return objfile; + return objfile_psymtabs (objfile); } -/* Traverse all psymtabs in one objfile, requiring that the psymtabs - be read in. */ - -#define ALL_OBJFILE_PSYMTABS_REQUIRED(objfile, p) \ - for ((p) = require_partial_symbols (objfile, 1)->psymtabs; \ - (p) != NULL; \ - (p) = (p)->next) - -/* We want to make sure this file always requires psymtabs. */ - -#undef ALL_OBJFILE_PSYMTABS - -/* Traverse all psymtabs in all objfiles. */ - -#define ALL_PSYMTABS(objfile, p) \ - ALL_OBJFILES (objfile) \ - ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, p) - /* Helper function for psym_map_symtabs_matching_filename that expands the symtabs and calls the iterator. */ @@ -166,57 +133,56 @@ psym_map_symtabs_matching_filename const char *real_path, gdb::function_view callback) { - struct partial_symtab *pst; const char *name_basename = lbasename (name); - ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, pst) - { - /* We can skip shared psymtabs here, because any file name will be - attached to the unshared psymtab. */ - if (pst->user != NULL) - continue; - - /* Anonymous psymtabs don't have a file name. */ - if (pst->anonymous) - continue; + for (partial_symtab *pst : require_partial_symbols (objfile, 1)) + { + /* We can skip shared psymtabs here, because any file name will be + attached to the unshared psymtab. */ + if (pst->user != NULL) + continue; - if (compare_filenames_for_search (pst->filename, name)) - { - if (partial_map_expand_apply (objfile, name, real_path, - pst, callback)) - return true; + /* Anonymous psymtabs don't have a file name. */ + if (pst->anonymous) continue; - } - /* Before we invoke realpath, which can get expensive when many - files are involved, do a quick comparison of the basenames. */ - if (! basenames_may_differ - && FILENAME_CMP (name_basename, lbasename (pst->filename)) != 0) - continue; + if (compare_filenames_for_search (pst->filename, name)) + { + if (partial_map_expand_apply (objfile, name, real_path, + pst, callback)) + return true; + continue; + } - if (compare_filenames_for_search (psymtab_to_fullname (pst), name)) - { - if (partial_map_expand_apply (objfile, name, real_path, - pst, callback)) - return true; + /* Before we invoke realpath, which can get expensive when many + files are involved, do a quick comparison of the basenames. */ + if (! basenames_may_differ + && FILENAME_CMP (name_basename, lbasename (pst->filename)) != 0) continue; - } - /* If the user gave us an absolute path, try to find the file in - this symtab and use its absolute path. */ - if (real_path != NULL) - { - gdb_assert (IS_ABSOLUTE_PATH (real_path)); - gdb_assert (IS_ABSOLUTE_PATH (name)); - if (filename_cmp (psymtab_to_fullname (pst), real_path) == 0) - { - if (partial_map_expand_apply (objfile, name, real_path, - pst, callback)) - return true; - continue; - } - } - } + if (compare_filenames_for_search (psymtab_to_fullname (pst), name)) + { + if (partial_map_expand_apply (objfile, name, real_path, + pst, callback)) + return true; + continue; + } + + /* If the user gave us an absolute path, try to find the file in + this symtab and use its absolute path. */ + if (real_path != NULL) + { + gdb_assert (IS_ABSOLUTE_PATH (real_path)); + gdb_assert (IS_ABSOLUTE_PATH (name)); + if (filename_cmp (psymtab_to_fullname (pst), real_path) == 0) + { + if (partial_map_expand_apply (objfile, name, real_path, + pst, callback)) + return true; + continue; + } + } + } return false; } @@ -232,7 +198,7 @@ find_pc_sect_psymtab_closer (struct objfile *objfile, { struct partial_symtab *tpst; struct partial_symtab *best_pst = pst; - CORE_ADDR best_addr = pst->text_low (); + CORE_ADDR best_addr = pst->text_low (objfile); gdb_assert (!pst->psymtabs_addrmap_supported); @@ -256,7 +222,7 @@ find_pc_sect_psymtab_closer (struct objfile *objfile, that is closest and still less than the given PC. */ for (tpst = pst; tpst != NULL; tpst = tpst->next) { - if (pc >= tpst->text_low () && pc < tpst->text_high ()) + if (pc >= tpst->text_low (objfile) && pc < tpst->text_high (objfile)) { struct partial_symbol *p; CORE_ADDR this_addr; @@ -277,7 +243,7 @@ find_pc_sect_psymtab_closer (struct objfile *objfile, if (p != NULL) this_addr = p->address (objfile); else - this_addr = tpst->text_low (); + this_addr = tpst->text_low (objfile); /* Check whether it is closer than our current BEST_ADDR. Since this symbol address is @@ -309,15 +275,17 @@ find_pc_sect_psymtab (struct objfile *objfile, CORE_ADDR pc, struct obj_section *section, struct bound_minimal_symbol msymbol) { - struct partial_symtab *pst; + 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->psymtabs_addrmap != NULL) { - pst = ((struct partial_symtab *) - addrmap_find (objfile->psymtabs_addrmap, pc)); + struct partial_symtab *pst + = ((struct partial_symtab *) + addrmap_find (objfile->psymtabs_addrmap, pc - baseaddr)); if (pst != NULL) { /* FIXME: addrmaps currently do not handle overlayed sections, @@ -359,9 +327,9 @@ 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. */ - ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, pst) + for (partial_symtab *pst : require_partial_symbols (objfile, 1)) if (!pst->psymtabs_addrmap_supported - && pc >= pst->text_low () && pc < pst->text_high ()) + && pc >= pst->text_low (objfile) && pc < pst->text_high (objfile)) { struct partial_symtab *best_pst; @@ -411,12 +379,12 @@ find_pc_sect_psymbol (struct objfile *objfile, { struct partial_symbol *best = NULL; CORE_ADDR best_pc; + const CORE_ADDR textlow = psymtab->text_low (objfile); gdb_assert (psymtab != NULL); /* Cope with programs that start at address 0. */ - best_pc = ((psymtab->text_low () != 0) - ? psymtab->text_low () - 1 : 0); + best_pc = (textlow != 0) ? textlow - 1 : 0; /* Search the global symbols as well as the static symbols, so that find_pc_partial_function doesn't use a minimal symbol and thus @@ -429,12 +397,11 @@ find_pc_sect_psymbol (struct objfile *objfile, && p->aclass == LOC_BLOCK && pc >= p->address (objfile) && (p->address (objfile) > best_pc - || (psymtab->text_low () == 0 + || (psymtab->text_low (objfile) == 0 && best_pc == 0 && p->address (objfile) == 0))) { if (section != NULL) /* Match on a specific section. */ { - fixup_psymbol_section (p, objfile); if (!matching_obj_sections (p->obj_section (objfile), section)) continue; @@ -452,12 +419,11 @@ find_pc_sect_psymbol (struct objfile *objfile, && p->aclass == LOC_BLOCK && pc >= p->address (objfile) && (p->address (objfile) > best_pc - || (psymtab->text_low () == 0 + || (psymtab->text_low (objfile) == 0 && best_pc == 0 && p->address (objfile) == 0))) { if (section != NULL) /* Match on a specific section. */ { - fixup_psymbol_section (p, objfile); if (!matching_obj_sections (p->obj_section (objfile), section)) continue; @@ -470,35 +436,6 @@ find_pc_sect_psymbol (struct objfile *objfile, return best; } -static void -fixup_psymbol_section (struct partial_symbol *psym, struct objfile *objfile) -{ - CORE_ADDR addr; - - if (psym == NULL) - return; - - if (psym->section >= 0) - return; - - gdb_assert (objfile); - - switch (psym->aclass) - { - case LOC_STATIC: - case LOC_LABEL: - case LOC_BLOCK: - addr = psym->address (objfile); - break; - default: - /* Nothing else will be listed in the minsyms -- no use looking - it up. */ - return; - } - - fixup_section (psym, addr, objfile); -} - /* Psymtab version of lookup_symbol. See its definition in the definition of quick_symbol_functions in symfile.h. */ @@ -507,43 +444,42 @@ psym_lookup_symbol (struct objfile *objfile, int block_index, const char *name, const domain_enum domain) { - struct partial_symtab *ps; const int psymtab_index = (block_index == GLOBAL_BLOCK ? 1 : 0); struct compunit_symtab *stab_best = NULL; lookup_name_info lookup_name (name, symbol_name_match_type::FULL); - ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, ps) - { - if (!ps->readin && lookup_partial_symbol (objfile, ps, name, - psymtab_index, domain)) - { - struct symbol *sym, *with_opaque = NULL; - struct compunit_symtab *stab = psymtab_to_symtab (objfile, ps); - /* Note: While psymtab_to_symtab can return NULL if the 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); - - sym = block_find_symbol (block, name, domain, - block_find_non_opaque_type_preferred, - &with_opaque); - - /* Some caution must be observed with overloaded functions - and methods, since the index will not contain any overload - information (but NAME might contain it). */ - - if (sym != NULL - && SYMBOL_MATCHES_SEARCH_NAME (sym, lookup_name)) - return stab; - if (with_opaque != NULL - && SYMBOL_MATCHES_SEARCH_NAME (with_opaque, lookup_name)) - stab_best = stab; - - /* Keep looking through other psymtabs. */ - } - } + for (partial_symtab *ps : require_partial_symbols (objfile, 1)) + { + if (!ps->readin && lookup_partial_symbol (objfile, ps, name, + psymtab_index, domain)) + { + struct symbol *sym, *with_opaque = NULL; + struct compunit_symtab *stab = psymtab_to_symtab (objfile, ps); + /* Note: While psymtab_to_symtab can return NULL if the + 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); + + sym = block_find_symbol (block, name, domain, + block_find_non_opaque_type_preferred, + &with_opaque); + + /* Some caution must be observed with overloaded functions + and methods, since the index will not contain any overload + information (but NAME might contain it). */ + + if (sym != NULL + && SYMBOL_MATCHES_SEARCH_NAME (sym, lookup_name)) + return stab; + if (with_opaque != NULL + && SYMBOL_MATCHES_SEARCH_NAME (with_opaque, lookup_name)) + stab_best = stab; + + /* Keep looking through other psymtabs. */ + } + } return stab_best; } @@ -795,52 +731,15 @@ psymtab_to_symtab (struct objfile *objfile, struct partial_symtab *pst) return pst->compunit_symtab; } -/* Psymtab version of relocate. See its definition in - the definition of quick_symbol_functions in symfile.h. */ - -static void -psym_relocate (struct objfile *objfile, - const struct section_offsets *new_offsets, - const struct section_offsets *delta) -{ - struct partial_symtab *p; - - ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, p) - { - p->set_text_low (p->text_low () - + ANOFFSET (delta, SECT_OFF_TEXT (objfile))); - p->set_text_high (p->text_high () - + ANOFFSET (delta, SECT_OFF_TEXT (objfile))); - } - - for (partial_symbol *psym : objfile->global_psymbols) - { - fixup_psymbol_section (psym, objfile); - if (psym->section >= 0) - psym->set_address (psym->unrelocated_address () - + ANOFFSET (delta, psym->section)); - } - for (partial_symbol *psym : objfile->static_psymbols) - { - fixup_psymbol_section (psym, objfile); - if (psym->section >= 0) - psym->set_address (psym->unrelocated_address () - + ANOFFSET (delta, psym->section)); - } - - objfile->psymbol_map.clear (); -} - /* Psymtab version of find_last_source_symtab. See its definition in the definition of quick_symbol_functions in symfile.h. */ static struct symtab * psym_find_last_source_symtab (struct objfile *ofp) { - struct partial_symtab *ps; struct partial_symtab *cs_pst = NULL; - ALL_OBJFILE_PSYMTABS_REQUIRED (ofp, ps) + for (partial_symtab *ps : require_partial_symbols (ofp, 1)) { const char *name = ps->filename; int len = strlen (name); @@ -876,9 +775,7 @@ psym_find_last_source_symtab (struct objfile *ofp) static void psym_forget_cached_source_info (struct objfile *objfile) { - struct partial_symtab *pst; - - ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, pst) + for (partial_symtab *pst : require_partial_symbols (objfile, 1)) { if (pst->fullname != NULL) { @@ -999,10 +896,10 @@ dump_psymtab (struct objfile *objfile, struct partial_symtab *psymtab, fprintf_filtered (outfile, "(object "); gdb_print_host_address (psymtab, outfile); fprintf_filtered (outfile, ")\n\n"); - fprintf_unfiltered (outfile, " Read from object file %s (", - objfile_name (objfile)); + fprintf_filtered (outfile, " Read from object file %s (", + objfile_name (objfile)); gdb_print_host_address (objfile, outfile); - fprintf_unfiltered (outfile, ")\n"); + fprintf_filtered (outfile, ")\n"); if (psymtab->readin) { @@ -1015,9 +912,9 @@ dump_psymtab (struct objfile *objfile, struct partial_symtab *psymtab, } fprintf_filtered (outfile, " Symbols cover text addresses "); - fputs_filtered (paddress (gdbarch, psymtab->text_low ()), outfile); + fputs_filtered (paddress (gdbarch, psymtab->text_low (objfile)), outfile); fprintf_filtered (outfile, "-"); - fputs_filtered (paddress (gdbarch, psymtab->text_high ()), outfile); + fputs_filtered (paddress (gdbarch, psymtab->text_high (objfile)), outfile); fprintf_filtered (outfile, "\n"); fprintf_filtered (outfile, " Address map supported - %s.\n", psymtab->psymtabs_addrmap_supported ? "yes" : "no"); @@ -1058,10 +955,9 @@ static void psym_print_stats (struct objfile *objfile) { int i; - struct partial_symtab *ps; i = 0; - ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, ps) + for (partial_symtab *ps : require_partial_symbols (objfile, 1)) { if (ps->readin == 0) i++; @@ -1101,19 +997,17 @@ static void psym_expand_symtabs_for_function (struct objfile *objfile, const char *func_name) { - struct partial_symtab *ps; - - ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, ps) - { - if (ps->readin) - continue; + for (partial_symtab *ps : require_partial_symbols (objfile, 1)) + { + if (ps->readin) + continue; - if ((lookup_partial_symbol (objfile, ps, func_name, 1, VAR_DOMAIN) - != NULL) - || (lookup_partial_symbol (objfile, ps, func_name, 0, VAR_DOMAIN) - != NULL)) - psymtab_to_symtab (objfile, ps); - } + if ((lookup_partial_symbol (objfile, ps, func_name, 1, VAR_DOMAIN) + != NULL) + || (lookup_partial_symbol (objfile, ps, func_name, 0, VAR_DOMAIN) + != NULL)) + psymtab_to_symtab (objfile, ps); + } } /* Psymtab version of expand_all_symtabs. See its definition in @@ -1122,12 +1016,8 @@ psym_expand_symtabs_for_function (struct objfile *objfile, static void psym_expand_all_symtabs (struct objfile *objfile) { - struct partial_symtab *psymtab; - - ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, psymtab) - { - psymtab_to_symtab (objfile, psymtab); - } + for (partial_symtab *psymtab : require_partial_symbols (objfile, 1)) + psymtab_to_symtab (objfile, psymtab); } /* Psymtab version of expand_symtabs_with_fullname. See its definition in @@ -1137,9 +1027,7 @@ static void psym_expand_symtabs_with_fullname (struct objfile *objfile, const char *fullname) { - struct partial_symtab *p; - - ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, p) + for (partial_symtab *p : require_partial_symbols (objfile, 1)) { /* Anonymous psymtabs don't have a name of a source file. */ if (p->anonymous) @@ -1162,9 +1050,7 @@ psym_map_symbol_filenames (struct objfile *objfile, symbol_filename_ftype *fun, void *data, int need_fullname) { - struct partial_symtab *ps; - - ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, ps) + for (partial_symtab *ps : require_partial_symbols (objfile, 1)) { const char *fullname; @@ -1208,12 +1094,11 @@ psymtab_to_fullname (struct partial_symtab *ps) if (ps->fullname == NULL) { gdb::unique_xmalloc_ptr fullname; - int fd = find_and_open_source (ps->filename, ps->dirname, &fullname); + scoped_fd fd = find_and_open_source (ps->filename, ps->dirname, + &fullname); ps->fullname = fullname.release (); - if (fd >= 0) - close (fd); - else + if (fd.get () < 0) { /* rewrite_source_path would be applied by find_and_open_source, we should report the pathname where GDB tried to find the file. */ @@ -1278,9 +1163,8 @@ psym_map_matching_symbols (struct objfile *objfile, symbol_compare_ftype *ordered_compare) { const int block_kind = global ? GLOBAL_BLOCK : STATIC_BLOCK; - struct partial_symtab *ps; - ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, ps) + for (partial_symtab *ps : require_partial_symbols (objfile, 1)) { QUIT; if (ps->readin @@ -1309,7 +1193,9 @@ psym_map_matching_symbols (struct objfile *objfile, static bool recursively_search_psymtabs - (struct partial_symtab *ps, struct objfile *objfile, enum search_domain domain, + (struct partial_symtab *ps, + struct objfile *objfile, + enum search_domain domain, const lookup_name_info &lookup_name, gdb::function_view sym_matcher) { @@ -1401,17 +1287,13 @@ psym_expand_symtabs_matching gdb::function_view expansion_notify, enum search_domain domain) { - struct partial_symtab *ps; - lookup_name_info lookup_name = lookup_name_in.make_ignore_params (); /* Clear the search flags. */ - ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, ps) - { - ps->searched_flag = PST_NOT_SEARCHED; - } + for (partial_symtab *ps : require_partial_symbols (objfile, 1)) + ps->searched_flag = PST_NOT_SEARCHED; - ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, ps) + for (partial_symtab *ps : objfile_psymtabs (objfile)) { QUIT; @@ -1500,23 +1382,21 @@ psym_find_compunit_symtab_by_address (struct objfile *objfile, { if (objfile->psymbol_map.empty ()) { - struct partial_symtab *pst; - std::set seen_addrs; - ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, pst) - { - psym_fill_psymbol_map (objfile, pst, - &seen_addrs, - objfile->global_psymbols, - pst->globals_offset, - pst->n_global_syms); - psym_fill_psymbol_map (objfile, pst, - &seen_addrs, - objfile->static_psymbols, - pst->statics_offset, - pst->n_static_syms); - } + for (partial_symtab *pst : require_partial_symbols (objfile, 1)) + { + psym_fill_psymbol_map (objfile, pst, + &seen_addrs, + objfile->global_psymbols, + pst->globals_offset, + pst->n_global_syms); + psym_fill_psymbol_map (objfile, pst, + &seen_addrs, + objfile->static_psymbols, + pst->statics_offset, + pst->n_static_syms); + } objfile->psymbol_map.shrink_to_fit (); @@ -1551,7 +1431,6 @@ const struct quick_symbol_functions psym_functions = psym_lookup_symbol, psym_print_stats, psym_dump, - psym_relocate, psym_expand_symtabs_for_function, psym_expand_all_symtabs, psym_expand_symtabs_with_fullname, @@ -1590,17 +1469,15 @@ sort_pst_symbols (struct objfile *objfile, struct partial_symtab *pst) struct partial_symtab * start_psymtab_common (struct objfile *objfile, const char *filename, - CORE_ADDR textlow, - std::vector &global_psymbols, - std::vector &static_psymbols) + CORE_ADDR textlow) { struct partial_symtab *psymtab; psymtab = allocate_psymtab (filename, objfile); psymtab->set_text_low (textlow); - psymtab->set_text_high (psymtab->text_low ()); /* default */ - psymtab->globals_offset = global_psymbols.size (); - psymtab->statics_offset = static_psymbols.size (); + psymtab->set_text_high (psymtab->raw_text_low ()); /* default */ + psymtab->globals_offset = objfile->global_psymbols.size (); + psymtab->statics_offset = objfile->static_psymbols.size (); return psymtab; } @@ -1718,14 +1595,15 @@ static struct partial_symbol * add_psymbol_to_bcache (const char *name, int namelength, int copy_name, domain_enum domain, enum address_class theclass, + short section, CORE_ADDR coreaddr, enum language language, struct objfile *objfile, int *added) { struct partial_symbol psymbol; - psymbol.set_address (coreaddr); - psymbol.section = -1; + psymbol.set_unrelocated_address (coreaddr); + psymbol.section = section; psymbol.domain = domain; psymbol.aclass = theclass; @@ -1759,7 +1637,8 @@ void add_psymbol_to_list (const char *name, int namelength, int copy_name, domain_enum domain, enum address_class theclass, - std::vector *list, + short section, + psymbol_placement where, CORE_ADDR coreaddr, enum language language, struct objfile *objfile) { @@ -1769,33 +1648,39 @@ add_psymbol_to_list (const char *name, int namelength, int copy_name, /* Stash the partial symbol away in the cache. */ psym = add_psymbol_to_bcache (name, namelength, copy_name, domain, theclass, - coreaddr, language, objfile, &added); + section, coreaddr, language, objfile, &added); /* Do not duplicate global partial symbols. */ - if (list == &objfile->global_psymbols - && !added) + if (where == psymbol_placement::GLOBAL && !added) return; /* Save pointer to partial symbol in psymtab, growing symtab if needed. */ + std::vector *list + = (where == psymbol_placement::STATIC + ? &objfile->static_psymbols + : &objfile->global_psymbols); append_psymbol_to_list (list, psym, objfile); } -/* Initialize storage for partial symbols. */ +/* See psympriv.h. */ void init_psymbol_list (struct objfile *objfile, int total_symbols) { - /* Free any previously allocated psymbol lists. */ - objfile->global_psymbols.clear (); - objfile->static_psymbols.clear (); - - /* Current best guess is that approximately a twentieth - of the total symbols (in a debugging file) are global or static - oriented symbols, then multiply that by slop factor of two. */ - objfile->global_psymbols.reserve (total_symbols / 10); - objfile->static_psymbols.reserve (total_symbols / 10); + if (objfile->global_psymbols.capacity () == 0 + && objfile->static_psymbols.capacity () == 0) + { + /* Current best guess is that approximately a twentieth of the + total symbols (in a debugging file) are global or static + oriented symbols, then multiply that by slop factor of + two. */ + objfile->global_psymbols.reserve (total_symbols / 10); + objfile->static_psymbols.reserve (total_symbols / 10); + } } +/* See psympriv.h. */ + struct partial_symtab * allocate_psymtab (const char *filename, struct objfile *objfile) { @@ -1833,13 +1718,13 @@ allocate_psymtab (const char *filename, struct objfile *objfile) { xfree (last_objfile_name); last_objfile_name = xstrdup (objfile_name (objfile)); - fprintf_unfiltered (gdb_stdlog, - "Creating one or more psymtabs for objfile %s ...\n", - last_objfile_name); + fprintf_filtered (gdb_stdlog, + "Creating one or more psymtabs for objfile %s ...\n", + last_objfile_name); } - fprintf_unfiltered (gdb_stdlog, - "Created psymtab %s for module %s.\n", - host_address_to_string (psymtab), filename); + fprintf_filtered (gdb_stdlog, + "Created psymtab %s for module %s.\n", + host_address_to_string (psymtab), filename); } return psymtab; @@ -1951,8 +1836,6 @@ maintenance_print_psymbols (const char *args, int from_tty) { struct ui_file *outfile = gdb_stdout; char *address_arg = NULL, *source_arg = NULL, *objfile_arg = NULL; - struct objfile *objfile; - struct partial_symtab *ps; int i, outfile_idx, found; CORE_ADDR pc = 0; struct obj_section *section = NULL; @@ -2021,7 +1904,7 @@ maintenance_print_psymbols (const char *args, int from_tty) } found = 0; - ALL_OBJFILES (objfile) + for (objfile *objfile : all_objfiles (current_program_space)) { int printed_objfile_header = 0; int print_for_objfile = 1; @@ -2040,7 +1923,8 @@ maintenance_print_psymbols (const char *args, int from_tty) /* We don't assume each pc has a unique objfile (this is for debugging). */ - ps = find_pc_sect_psymtab (objfile, pc, section, msymbol); + struct partial_symtab *ps = find_pc_sect_psymtab (objfile, pc, + section, msymbol); if (ps != NULL) { if (!printed_objfile_header) @@ -2056,7 +1940,7 @@ maintenance_print_psymbols (const char *args, int from_tty) } else { - ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, ps) + for (partial_symtab *ps : require_partial_symbols (objfile, 1)) { int print_for_source = 0; @@ -2108,106 +1992,111 @@ static void maintenance_info_psymtabs (const char *regexp, int from_tty) { struct program_space *pspace; - struct objfile *objfile; if (regexp) re_comp (regexp); ALL_PSPACES (pspace) - ALL_PSPACE_OBJFILES (pspace, objfile) - { - struct gdbarch *gdbarch = get_objfile_arch (objfile); - struct partial_symtab *psymtab; - - /* We don't want to print anything for this objfile until we - actually find a symtab whose name matches. */ - int printed_objfile_start = 0; - - ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, psymtab) - { - QUIT; - - if (! regexp - || re_exec (psymtab->filename)) - { - if (! printed_objfile_start) - { - printf_filtered ("{ objfile %s ", objfile_name (objfile)); - wrap_here (" "); - printf_filtered ("((struct objfile *) %s)\n", - host_address_to_string (objfile)); - printed_objfile_start = 1; - } - - printf_filtered (" { psymtab %s ", psymtab->filename); - wrap_here (" "); - printf_filtered ("((struct partial_symtab *) %s)\n", - host_address_to_string (psymtab)); - - printf_filtered (" readin %s\n", - psymtab->readin ? "yes" : "no"); - printf_filtered (" fullname %s\n", - psymtab->fullname - ? psymtab->fullname : "(null)"); - printf_filtered (" text addresses "); - fputs_filtered (paddress (gdbarch, psymtab->text_low ()), - gdb_stdout); - printf_filtered (" -- "); - fputs_filtered (paddress (gdbarch, psymtab->text_high ()), - gdb_stdout); - printf_filtered ("\n"); - printf_filtered (" psymtabs_addrmap_supported %s\n", - (psymtab->psymtabs_addrmap_supported - ? "yes" : "no")); - printf_filtered (" globals "); - if (psymtab->n_global_syms) - { - auto p = &objfile->global_psymbols[psymtab->globals_offset]; - - printf_filtered ("(* (struct partial_symbol **) %s @ %d)\n", - host_address_to_string (p), - psymtab->n_global_syms); - } - else - printf_filtered ("(none)\n"); - printf_filtered (" statics "); - if (psymtab->n_static_syms) - { - auto p = &objfile->static_psymbols[psymtab->statics_offset]; - - printf_filtered ("(* (struct partial_symbol **) %s @ %d)\n", - host_address_to_string (p), - psymtab->n_static_syms); - } - else - printf_filtered ("(none)\n"); - printf_filtered (" dependencies "); - if (psymtab->number_of_dependencies) - { - int i; + for (objfile *objfile : all_objfiles (pspace)) + { + struct gdbarch *gdbarch = get_objfile_arch (objfile); - printf_filtered ("{\n"); - for (i = 0; i < psymtab->number_of_dependencies; i++) - { - struct partial_symtab *dep = psymtab->dependencies[i]; + /* We don't want to print anything for this objfile until we + actually find a symtab whose name matches. */ + int printed_objfile_start = 0; - /* Note the string concatenation there --- no comma. */ - printf_filtered (" psymtab %s " - "((struct partial_symtab *) %s)\n", - dep->filename, - host_address_to_string (dep)); - } - printf_filtered (" }\n"); - } - else - printf_filtered ("(none)\n"); - printf_filtered (" }\n"); - } - } + for (partial_symtab *psymtab : require_partial_symbols (objfile, 1)) + { + QUIT; + + if (! regexp + || re_exec (psymtab->filename)) + { + if (! printed_objfile_start) + { + printf_filtered ("{ objfile %s ", objfile_name (objfile)); + wrap_here (" "); + printf_filtered ("((struct objfile *) %s)\n", + host_address_to_string (objfile)); + printed_objfile_start = 1; + } + + printf_filtered (" { psymtab %s ", psymtab->filename); + wrap_here (" "); + printf_filtered ("((struct partial_symtab *) %s)\n", + host_address_to_string (psymtab)); + + printf_filtered (" readin %s\n", + psymtab->readin ? "yes" : "no"); + printf_filtered (" fullname %s\n", + psymtab->fullname + ? psymtab->fullname : "(null)"); + printf_filtered (" text addresses "); + fputs_filtered (paddress (gdbarch, + psymtab->text_low (objfile)), + gdb_stdout); + printf_filtered (" -- "); + fputs_filtered (paddress (gdbarch, + psymtab->text_high (objfile)), + gdb_stdout); + printf_filtered ("\n"); + printf_filtered (" psymtabs_addrmap_supported %s\n", + (psymtab->psymtabs_addrmap_supported + ? "yes" : "no")); + printf_filtered (" globals "); + if (psymtab->n_global_syms) + { + auto p + = &objfile->global_psymbols[psymtab->globals_offset]; + + printf_filtered + ("(* (struct partial_symbol **) %s @ %d)\n", + host_address_to_string (p), + psymtab->n_global_syms); + } + else + printf_filtered ("(none)\n"); + printf_filtered (" statics "); + if (psymtab->n_static_syms) + { + auto p + = &objfile->static_psymbols[psymtab->statics_offset]; + + printf_filtered + ("(* (struct partial_symbol **) %s @ %d)\n", + host_address_to_string (p), + psymtab->n_static_syms); + } + else + printf_filtered ("(none)\n"); + printf_filtered (" dependencies "); + if (psymtab->number_of_dependencies) + { + int i; + + printf_filtered ("{\n"); + for (i = 0; i < psymtab->number_of_dependencies; i++) + { + struct partial_symtab *dep = psymtab->dependencies[i]; + + /* Note the string concatenation there --- no + comma. */ + printf_filtered (" psymtab %s " + "((struct partial_symtab *) %s)\n", + dep->filename, + host_address_to_string (dep)); + } + printf_filtered (" }\n"); + } + else + printf_filtered ("(none)\n"); + printf_filtered (" }\n"); + } + } - if (printed_objfile_start) - printf_filtered ("}\n"); - } + if (printed_objfile_start) + printf_filtered ("}\n"); + } } /* Check consistency of currently expanded psymtabs vs symtabs. */ @@ -2217,91 +2106,94 @@ maintenance_check_psymtabs (const char *ignore, int from_tty) { struct symbol *sym; struct compunit_symtab *cust = NULL; - struct partial_symtab *ps; const struct blockvector *bv; - struct objfile *objfile; struct block *b; int length; - ALL_PSYMTABS (objfile, ps) - { - struct gdbarch *gdbarch = get_objfile_arch (objfile); - - /* We don't call psymtab_to_symtab here because that may cause symtab - expansion. When debugging a problem it helps if checkers leave - things unchanged. */ - cust = ps->compunit_symtab; - - /* First do some checks that don't require the associated symtab. */ - if (ps->text_high () < ps->text_low ()) + for (objfile *objfile : all_objfiles (current_program_space)) + for (partial_symtab *ps : require_partial_symbols (objfile, 1)) { - printf_filtered ("Psymtab "); - puts_filtered (ps->filename); - printf_filtered (" covers bad range "); - fputs_filtered (paddress (gdbarch, ps->text_low ()), gdb_stdout); - printf_filtered (" - "); - fputs_filtered (paddress (gdbarch, ps->text_high ()), gdb_stdout); - printf_filtered ("\n"); - continue; - } + struct gdbarch *gdbarch = get_objfile_arch (objfile); - /* Now do checks requiring the associated symtab. */ - if (cust == NULL) - continue; - bv = COMPUNIT_BLOCKVECTOR (cust); - b = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK); - partial_symbol **psym = &objfile->static_psymbols[ps->statics_offset]; - length = ps->n_static_syms; - while (length--) - { - sym = block_lookup_symbol (b, symbol_search_name (*psym), - symbol_name_match_type::SEARCH_NAME, - (*psym)->domain); - if (!sym) + /* We don't call psymtab_to_symtab here because that may cause symtab + expansion. When debugging a problem it helps if checkers leave + things unchanged. */ + cust = ps->compunit_symtab; + + /* First do some checks that don't require the associated symtab. */ + if (ps->text_high (objfile) < ps->text_low (objfile)) { - printf_filtered ("Static symbol `"); - puts_filtered ((*psym)->name); - printf_filtered ("' only found in "); + printf_filtered ("Psymtab "); puts_filtered (ps->filename); - printf_filtered (" psymtab\n"); + printf_filtered (" covers bad range "); + fputs_filtered (paddress (gdbarch, ps->text_low (objfile)), + gdb_stdout); + printf_filtered (" - "); + fputs_filtered (paddress (gdbarch, ps->text_high (objfile)), + gdb_stdout); + printf_filtered ("\n"); + continue; } - psym++; - } - b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK); - psym = &objfile->global_psymbols[ps->globals_offset]; - length = ps->n_global_syms; - while (length--) - { - sym = block_lookup_symbol (b, symbol_search_name (*psym), - symbol_name_match_type::SEARCH_NAME, - (*psym)->domain); - if (!sym) + + /* Now do checks requiring the associated symtab. */ + if (cust == NULL) + continue; + bv = COMPUNIT_BLOCKVECTOR (cust); + b = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK); + partial_symbol **psym = &objfile->static_psymbols[ps->statics_offset]; + length = ps->n_static_syms; + while (length--) + { + sym = block_lookup_symbol (b, symbol_search_name (*psym), + symbol_name_match_type::SEARCH_NAME, + (*psym)->domain); + if (!sym) + { + printf_filtered ("Static symbol `"); + puts_filtered ((*psym)->name); + printf_filtered ("' only found in "); + puts_filtered (ps->filename); + printf_filtered (" psymtab\n"); + } + psym++; + } + b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK); + psym = &objfile->global_psymbols[ps->globals_offset]; + length = ps->n_global_syms; + while (length--) { - printf_filtered ("Global symbol `"); - puts_filtered ((*psym)->name); - printf_filtered ("' only found in "); + sym = block_lookup_symbol (b, symbol_search_name (*psym), + symbol_name_match_type::SEARCH_NAME, + (*psym)->domain); + if (!sym) + { + printf_filtered ("Global symbol `"); + puts_filtered ((*psym)->name); + printf_filtered ("' only found in "); + puts_filtered (ps->filename); + printf_filtered (" psymtab\n"); + } + psym++; + } + if (ps->raw_text_high () != 0 + && (ps->text_low (objfile) < BLOCK_START (b) + || ps->text_high (objfile) > BLOCK_END (b))) + { + printf_filtered ("Psymtab "); puts_filtered (ps->filename); - printf_filtered (" psymtab\n"); + printf_filtered (" covers "); + fputs_filtered (paddress (gdbarch, ps->text_low (objfile)), + gdb_stdout); + printf_filtered (" - "); + fputs_filtered (paddress (gdbarch, ps->text_high (objfile)), + gdb_stdout); + printf_filtered (" but symtab covers only "); + fputs_filtered (paddress (gdbarch, BLOCK_START (b)), gdb_stdout); + printf_filtered (" - "); + fputs_filtered (paddress (gdbarch, BLOCK_END (b)), gdb_stdout); + printf_filtered ("\n"); } - psym++; - } - if (ps->text_high () != 0 - && (ps->text_low () < BLOCK_START (b) - || ps->text_high () > BLOCK_END (b))) - { - printf_filtered ("Psymtab "); - puts_filtered (ps->filename); - printf_filtered (" covers "); - fputs_filtered (paddress (gdbarch, ps->text_low ()), gdb_stdout); - printf_filtered (" - "); - fputs_filtered (paddress (gdbarch, ps->text_high ()), gdb_stdout); - printf_filtered (" but symtab covers only "); - fputs_filtered (paddress (gdbarch, BLOCK_START (b)), gdb_stdout); - printf_filtered (" - "); - fputs_filtered (paddress (gdbarch, BLOCK_END (b)), gdb_stdout); - printf_filtered ("\n"); } - } } void @@ -2309,8 +2201,8 @@ _initialize_psymtab (void) { add_cmd ("psymbols", class_maintenance, maintenance_print_psymbols, _("\ Print dump of current partial symbol definitions.\n\ -Usage: mt print psymbols [-objfile objfile] [-pc address] [--] [outfile]\n\ - mt print psymbols [-objfile objfile] [-source source] [--] [outfile]\n\ +Usage: mt print psymbols [-objfile OBJFILE] [-pc ADDRESS] [--] [OUTFILE]\n\ + mt print psymbols [-objfile OBJFILE] [-source SOURCE] [--] [OUTFILE]\n\ Entries in the partial symbol table are dumped to file OUTFILE,\n\ or the terminal if OUTFILE is unspecified.\n\ If ADDRESS is provided, dump only the file for that address.\n\