X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fpsymtab.c;h=e9cc8c3bc6d3173c09bcff246177f9dde9f0dd36;hb=67547d896b0593b0fa62e23ac68c483a7e8566e2;hp=219357e586bd1e441e52a32ca06145c7ad1fec82;hpb=22068491adac735905948fd4c2e9aaacf9e22e06;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/psymtab.c b/gdb/psymtab.c index 219357e586..e9cc8c3bc6 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,14 +19,13 @@ #include "defs.h" #include "symtab.h" -#include "psympriv.h" #include "objfiles.h" +#include "psympriv.h" #include "block.h" #include "filenames.h" #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, @@ -65,10 +52,48 @@ static struct partial_symbol *find_pc_sect_psymbol (struct 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. */ + + +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 () +{ +} + +/* 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. */ -struct objfile * +psymtab_storage::partial_symtab_range require_partial_symbols (struct objfile *objfile, int verbose) { if ((objfile->flags & OBJF_PSYMTABS_READ) == 0) @@ -78,53 +103,24 @@ require_partial_symbols (struct objfile *objfile, int verbose) if (objfile->sf->sym_read_psymbols) { if (verbose) - { - printf_filtered (_("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 point. */ - objfile->global_psymbols.shrink_to_fit (); - objfile->static_psymbols.shrink_to_fit (); - - if (verbose) - { - if (!objfile_has_symbols (objfile)) - { - wrap_here (""); - printf_filtered (_("(no debugging symbols found)...")); - wrap_here (""); - } + objfile->partial_symtabs->global_psymbols.shrink_to_fit (); + objfile->partial_symtabs->static_psymbols.shrink_to_fit (); - printf_filtered (_("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 (); } -/* 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. */ @@ -163,57 +159,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; } @@ -306,17 +301,18 @@ 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) + if (objfile->partial_symtabs->psymtabs_addrmap != NULL) { - pst = ((struct partial_symtab *) - addrmap_find (objfile->psymtabs_addrmap, pc - baseaddr)); + struct partial_symtab *pst + = ((struct partial_symtab *) + addrmap_find (objfile->partial_symtabs->psymtabs_addrmap, + pc - baseaddr)); if (pst != NULL) { /* FIXME: addrmaps currently do not handle overlayed sections, @@ -358,7 +354,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. */ - ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, pst) + for (partial_symtab *pst : require_partial_symbols (objfile, 1)) if (!pst->psymtabs_addrmap_supported && pc >= pst->text_low (objfile) && pc < pst->text_high (objfile)) { @@ -422,7 +418,9 @@ find_pc_sect_psymbol (struct objfile *objfile, cache a bad endaddr. */ for (int i = 0; i < psymtab->n_global_syms; i++) { - partial_symbol *p = objfile->global_psymbols[psymtab->globals_offset + i]; + partial_symbol *p + = objfile->partial_symtabs->global_psymbols[psymtab->globals_offset + + i]; if (p->domain == VAR_DOMAIN && p->aclass == LOC_BLOCK @@ -444,7 +442,9 @@ find_pc_sect_psymbol (struct objfile *objfile, for (int i = 0; i < psymtab->n_static_syms; i++) { - partial_symbol *p = objfile->static_psymbols[psymtab->statics_offset + i]; + partial_symbol *p + = objfile->partial_symtabs->static_psymbols[psymtab->statics_offset + + i]; if (p->domain == VAR_DOMAIN && p->aclass == LOC_BLOCK @@ -472,46 +472,45 @@ 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) { - 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); + const 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; } @@ -522,10 +521,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 @@ -539,8 +538,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; @@ -551,11 +549,9 @@ match_partial_symbol (struct objfile *objfile, if (length == 0) return NULL; - lookup_name_info lookup_name (name, match_type); - start = (global ? - &objfile->global_psymbols[pst->globals_offset] : - &objfile->static_psymbols[pst->statics_offset]); + &objfile->partial_symtabs->global_psymbols[pst->globals_offset] : + &objfile->partial_symtabs->static_psymbols[pst->statics_offset]); if (global && ordered_compare) /* Can use a binary search. */ { @@ -575,11 +571,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; @@ -587,9 +584,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++; @@ -603,9 +600,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; } } @@ -640,7 +637,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. @@ -664,8 +661,8 @@ lookup_partial_symbol (struct objfile *objfile, lookup_name_info lookup_name (search_name.get (), symbol_name_match_type::FULL); start = (global ? - &objfile->global_psymbols[pst->globals_offset] : - &objfile->static_psymbols[pst->statics_offset]); + &objfile->partial_symtabs->global_psymbols[pst->globals_offset] : + &objfile->partial_symtabs->static_psymbols[pst->statics_offset]); if (global) /* This means we can use a binary search. */ { @@ -686,7 +683,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; @@ -702,15 +699,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++; @@ -724,9 +723,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; } } @@ -769,10 +768,9 @@ psymtab_to_symtab (struct objfile *objfile, struct partial_symtab *pst) 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); @@ -808,9 +806,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) { @@ -829,10 +825,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) @@ -846,9 +843,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; @@ -970,15 +973,17 @@ dump_psymtab (struct objfile *objfile, struct partial_symtab *psymtab, } if (psymtab->n_global_syms > 0) { - print_partial_symbols (gdbarch, objfile, - &objfile->global_psymbols[psymtab->globals_offset], - psymtab->n_global_syms, "Global", outfile); + print_partial_symbols + (gdbarch, objfile, + &objfile->partial_symtabs->global_psymbols[psymtab->globals_offset], + psymtab->n_global_syms, "Global", outfile); } if (psymtab->n_static_syms > 0) { - print_partial_symbols (gdbarch, objfile, - &objfile->static_psymbols[psymtab->statics_offset], - psymtab->n_static_syms, "Static", outfile); + print_partial_symbols + (gdbarch, objfile, + &objfile->partial_symtabs->static_psymbols[psymtab->statics_offset], + psymtab->n_static_syms, "Static", outfile); } fprintf_filtered (outfile, "\n"); } @@ -990,10 +995,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++; @@ -1009,10 +1013,10 @@ psym_dump (struct objfile *objfile) { struct partial_symtab *psymtab; - if (objfile->psymtabs) + if (objfile->partial_symtabs->psymtabs) { printf_filtered ("Psymtabs:\n"); - for (psymtab = objfile->psymtabs; + for (psymtab = objfile->partial_symtabs->psymtabs; psymtab != NULL; psymtab = psymtab->next) { @@ -1033,19 +1037,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 @@ -1054,12 +1056,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 @@ -1069,9 +1067,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) @@ -1094,9 +1090,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; @@ -1140,12 +1134,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. */ @@ -1165,70 +1158,34 @@ 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; - struct partial_symtab *ps; - ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, ps) + for (partial_symtab *ps : require_partial_symbols (objfile, 1)) { 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; } } @@ -1241,7 +1198,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) { @@ -1273,21 +1232,25 @@ recursively_search_psymtabs } partial_symbol **gbound - = objfile->global_psymbols.data () + ps->globals_offset + ps->n_global_syms; + = (objfile->partial_symtabs->global_psymbols.data () + + ps->globals_offset + ps->n_global_syms); partial_symbol **sbound - = objfile->static_psymbols.data () + ps->statics_offset + ps->n_static_syms; + = (objfile->partial_symtabs->static_psymbols.data () + + ps->statics_offset + ps->n_static_syms); partial_symbol **bound = gbound; /* Go through all of the symbols stored in a partial symtab in one loop. */ - partial_symbol **psym = objfile->global_psymbols.data () + ps->globals_offset; + partial_symbol **psym = (objfile->partial_symtabs->global_psymbols.data () + + ps->globals_offset); while (keep_going) { if (psym >= bound) { if (bound == gbound && ps->n_static_syms != 0) { - psym = objfile->static_psymbols.data () + ps->statics_offset; + psym = (objfile->partial_symtabs->static_psymbols.data () + + ps->statics_offset); bound = sbound; } else @@ -1307,7 +1270,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; @@ -1333,17 +1297,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 ()) { QUIT; @@ -1393,7 +1353,7 @@ psym_expand_symtabs_matching static int psym_has_symbols (struct objfile *objfile) { - return objfile->psymtabs != NULL; + return objfile->partial_symtabs->psymtabs != NULL; } /* Helper function for psym_find_compunit_symtab_by_address that fills @@ -1432,23 +1392,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->partial_symtabs->global_psymbols, + pst->globals_offset, + pst->n_global_syms); + psym_fill_psymbol_map (objfile, pst, + &seen_addrs, + objfile->partial_symtabs->static_psymbols, + pst->statics_offset, + pst->n_static_syms); + } objfile->psymbol_map.shrink_to_fit (); @@ -1499,17 +1457,17 @@ static void sort_pst_symbols (struct objfile *objfile, struct partial_symtab *pst) { /* Sort the global list; don't sort the static list. */ - auto begin = objfile->global_psymbols.begin (); + auto begin = objfile->partial_symtabs->global_psymbols.begin (); std::advance (begin, pst->globals_offset); /* The psymbols for this partial_symtab are currently at the end of the vector. */ - auto end = objfile->global_psymbols.end (); + auto end = objfile->partial_symtabs->global_psymbols.end (); 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; }); } @@ -1521,17 +1479,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->raw_text_low ()); /* default */ - psymtab->globals_offset = global_psymbols.size (); - psymtab->statics_offset = static_psymbols.size (); + psymtab->globals_offset = objfile->partial_symtabs->global_psymbols.size (); + psymtab->statics_offset = objfile->partial_symtabs->static_psymbols.size (); return psymtab; } @@ -1540,8 +1496,10 @@ start_psymtab_common (struct objfile *objfile, void end_psymtab_common (struct objfile *objfile, struct partial_symtab *pst) { - pst->n_global_syms = objfile->global_psymbols.size () - pst->globals_offset; - pst->n_static_syms = objfile->static_psymbols.size () - pst->statics_offset; + pst->n_global_syms = (objfile->partial_symtabs->global_psymbols.size () + - pst->globals_offset); + pst->n_static_syms = (objfile->partial_symtabs->static_psymbols.size () + - pst->statics_offset); sort_pst_symbols (objfile, pst); } @@ -1556,18 +1514,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; } @@ -1582,61 +1540,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 @@ -1646,7 +1558,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 (const char *name, int namelength, bool copy_name, domain_enum domain, enum address_class theclass, short section, @@ -1655,19 +1567,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); + symbol_set_language (&psymbol.ginfo, language, + objfile->partial_symtabs->obstack ()); + symbol_set_names (&psymbol.ginfo, name, namelength, copy_name, + objfile->per_bfd); /* Stash the partial symbol away in the cache. */ - return psymbol_bcache_full (&psymbol, objfile->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. */ @@ -1688,11 +1602,11 @@ append_psymbol_to_list (std::vector *list, Return the partial symbol that has been added. */ void -add_psymbol_to_list (const char *name, int namelength, int copy_name, +add_psymbol_to_list (const char *name, int namelength, bool copy_name, domain_enum domain, enum address_class theclass, short section, - std::vector *list, + psymbol_placement where, CORE_ADDR coreaddr, enum language language, struct objfile *objfile) { @@ -1705,56 +1619,47 @@ add_psymbol_to_list (const char *name, int namelength, int copy_name, 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->partial_symtabs->static_psymbols + : &objfile->partial_symtabs->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->partial_symtabs->global_psymbols.capacity () == 0 + && objfile->partial_symtabs->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->partial_symtabs->global_psymbols.reserve (total_symbols / 10); + objfile->partial_symtabs->static_psymbols.reserve (total_symbols / 10); + } } +/* See psympriv.h. */ + struct partial_symtab * allocate_psymtab (const char *filename, struct objfile *objfile) { - struct partial_symtab *psymtab; - - if (objfile->free_psymtabs) - { - psymtab = objfile->free_psymtabs; - objfile->free_psymtabs = psymtab->next; - } - else - psymtab = XOBNEW (&objfile->objfile_obstack, partial_symtab); + struct partial_symtab *psymtab + = objfile->partial_symtabs->allocate_psymtab (); - 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->psymtabs; - objfile->psymtabs = psymtab; - if (symtab_create_debug) { /* Be a bit clever with debugging messages, and don't print objfile @@ -1779,7 +1684,7 @@ allocate_psymtab (const char *filename, struct objfile *objfile) } void -discard_psymtab (struct objfile *objfile, struct partial_symtab *pst) +psymtab_storage::discard_psymtab (struct partial_symtab *pst) { struct partial_symtab **prev_pst; @@ -1792,15 +1697,15 @@ discard_psymtab (struct objfile *objfile, struct partial_symtab *pst) /* First, snip it out of the psymtab chain. */ - prev_pst = &(objfile->psymtabs); + prev_pst = &psymtabs; while ((*prev_pst) != pst) prev_pst = &((*prev_pst)->next); (*prev_pst) = pst->next; /* Next, put it on a free list for recycling. */ - pst->next = objfile->free_psymtabs; - objfile->free_psymtabs = pst; + pst->next = free_psymtabs; + free_psymtabs = pst; } @@ -1866,7 +1771,7 @@ dump_psymtab_addrmap (struct objfile *objfile, struct partial_symtab *psymtab, if ((psymtab == NULL || psymtab->psymtabs_addrmap_supported) - && objfile->psymtabs_addrmap != NULL) + && objfile->partial_symtabs->psymtabs_addrmap != NULL) { addrmap_dump_data.objfile = objfile; addrmap_dump_data.psymtab = psymtab; @@ -1874,8 +1779,8 @@ dump_psymtab_addrmap (struct objfile *objfile, struct partial_symtab *psymtab, addrmap_dump_data.previous_matched = 0; fprintf_filtered (outfile, "%sddress map:\n", psymtab == NULL ? "Entire a" : " A"); - addrmap_foreach (objfile->psymtabs_addrmap, dump_psymtab_addrmap_1, - &addrmap_dump_data); + addrmap_foreach (objfile->partial_symtabs->psymtabs_addrmap, + dump_psymtab_addrmap_1, &addrmap_dump_data); } } @@ -1884,8 +1789,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; @@ -1954,7 +1857,7 @@ maintenance_print_psymbols (const char *args, int from_tty) } found = 0; - ALL_OBJFILES (objfile) + for (objfile *objfile : current_program_space->objfiles ()) { int printed_objfile_header = 0; int print_for_objfile = 1; @@ -1973,7 +1876,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) @@ -1989,7 +1893,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; @@ -2019,7 +1923,7 @@ maintenance_print_psymbols (const char *args, int from_tty) if (address_arg == NULL && source_arg == NULL - && objfile->psymtabs_addrmap != NULL) + && objfile->partial_symtabs->psymtabs_addrmap != NULL) { outfile->puts ("\n"); dump_psymtab_addrmap (objfile, NULL, outfile); @@ -2041,106 +1945,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 (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; + for (objfile *objfile : pspace->objfiles ()) + { + 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->partial_symtabs + ->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->partial_symtabs + ->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. */ @@ -2150,95 +2059,95 @@ 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; + const 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 (objfile) < ps->text_low (objfile)) + for (objfile *objfile : current_program_space->objfiles ()) + 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 (objfile)), - gdb_stdout); - printf_filtered (" - "); - fputs_filtered (paddress (gdbarch, ps->text_high (objfile)), - 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->partial_symtabs->static_psymbols[ps->statics_offset]; + length = ps->n_static_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)->ginfo), + symbol_name_match_type::SEARCH_NAME, + (*psym)->domain); + if (!sym) + { + printf_filtered ("Static symbol `"); + puts_filtered ((*psym)->ginfo.name); + printf_filtered ("' only found in "); + puts_filtered (ps->filename); + printf_filtered (" psymtab\n"); + } + psym++; + } + b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK); + psym = &objfile->partial_symtabs->global_psymbols[ps->globals_offset]; + length = ps->n_global_syms; + while (length--) + { + 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)->ginfo.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->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 (" 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"); } - } } void @@ -2246,8 +2155,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\