X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fpsymtab.c;h=a39c6e257a2ad186f385ab5533dc90e67c6c9703;hb=038d48680941f014349256aeb7bab14b3f01d58e;hp=861b30232d757b96533fbf7216836c73374d4ce6;hpb=bb2f58dc41241652af78a29619c0a7986669bcd3;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/psymtab.c b/gdb/psymtab.c index 861b30232d..a39c6e257a 100644 --- a/gdb/psymtab.c +++ b/gdb/psymtab.c @@ -1,6 +1,6 @@ /* Partial symbol tables. - - Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. + + Copyright (C) 2009-2016 Free Software Foundation, Inc. This file is part of GDB. @@ -21,7 +21,6 @@ #include "symtab.h" #include "psympriv.h" #include "objfiles.h" -#include "gdb_assert.h" #include "block.h" #include "filenames.h" #include "source.h" @@ -35,6 +34,7 @@ #include "dictionary.h" #include "language.h" #include "cp-support.h" +#include "gdbcmd.h" #ifndef DEV_TTY #define DEV_TTY "/dev/tty" @@ -45,31 +45,30 @@ struct psymbol_bcache struct bcache *bcache; }; -/* A fast way to get from a psymtab to its symtab (after the first time). */ -#define PSYMTAB_TO_SYMTAB(pst) \ - ((pst) -> symtab != NULL ? (pst) -> symtab : psymtab_to_symtab (pst)) - -static struct partial_symbol *match_partial_symbol (struct partial_symtab *, +static struct partial_symbol *match_partial_symbol (struct objfile *, + struct partial_symtab *, int, const char *, domain_enum, symbol_compare_ftype *, symbol_compare_ftype *); -static struct partial_symbol *lookup_partial_symbol (struct partial_symtab *, +static struct partial_symbol *lookup_partial_symbol (struct objfile *, + struct partial_symtab *, const char *, int, domain_enum); -static char *psymtab_to_fullname (struct partial_symtab *ps); +static const char *psymtab_to_fullname (struct partial_symtab *ps); -static struct partial_symbol *find_pc_sect_psymbol (struct partial_symtab *, +static struct partial_symbol *find_pc_sect_psymbol (struct objfile *, + struct partial_symtab *, CORE_ADDR, struct obj_section *); -static struct partial_symbol *fixup_psymbol_section (struct partial_symbol - *psym, - struct objfile *objfile); +static void fixup_psymbol_section (struct partial_symbol *psym, + struct objfile *objfile); -static struct symtab *psymtab_to_symtab (struct partial_symtab *pst); +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. */ @@ -86,7 +85,7 @@ require_partial_symbols (struct objfile *objfile, int verbose) if (verbose) { printf_unfiltered (_("Reading symbols from %s..."), - objfile->name); + objfile_name (objfile)); gdb_flush (gdb_stdout); } (*objfile->sf->sym_read_psymbols) (objfile); @@ -125,19 +124,22 @@ require_partial_symbols (struct objfile *objfile, int verbose) ALL_OBJFILES (objfile) \ ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, p) -/* Helper function for partial_map_symtabs_matching_filename that +/* Helper function for psym_map_symtabs_matching_filename that expands the symtabs and calls the iterator. */ static int partial_map_expand_apply (struct objfile *objfile, const char *name, - const char *full_path, const char *real_path, struct partial_symtab *pst, int (*callback) (struct symtab *, void *), void *data) { - struct symtab *last_made = objfile->symtabs; + struct compunit_symtab *last_made = objfile->compunit_symtabs; + + /* Shared psymtabs should never be seen here. Instead they should + be handled properly by the caller. */ + gdb_assert (pst->user == NULL); /* Don't visit already-expanded psymtabs. */ if (pst->readin) @@ -145,33 +147,43 @@ partial_map_expand_apply (struct objfile *objfile, /* This may expand more than one symtab, and we want to iterate over all of them. */ - psymtab_to_symtab (pst); + psymtab_to_symtab (objfile, pst); - return iterate_over_some_symtabs (name, full_path, real_path, callback, data, - objfile->symtabs, last_made); + return iterate_over_some_symtabs (name, real_path, callback, data, + objfile->compunit_symtabs, last_made); } -/* Implementation of the map_symtabs_matching_filename method. */ +/* Psymtab version of map_symtabs_matching_filename. See its definition in + the definition of quick_symbol_functions in symfile.h. */ static int -partial_map_symtabs_matching_filename (struct objfile *objfile, - const char *name, - const char *full_path, - const char *real_path, - int (*callback) (struct symtab *, - void *), - void *data) +psym_map_symtabs_matching_filename (struct objfile *objfile, + const char *name, + const char *real_path, + int (*callback) (struct symtab *, + void *), + void *data) { struct partial_symtab *pst; const char *name_basename = lbasename (name); ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, pst) { - if (FILENAME_CMP (name, pst->filename) == 0) + /* 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; + + if (compare_filenames_for_search (pst->filename, name)) { - if (partial_map_expand_apply (objfile, name, full_path, real_path, + if (partial_map_expand_apply (objfile, name, real_path, pst, callback, data)) return 1; + continue; } /* Before we invoke realpath, which can get expensive when many @@ -180,49 +192,30 @@ partial_map_symtabs_matching_filename (struct objfile *objfile, && 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 (full_path != NULL) + if (compare_filenames_for_search (psymtab_to_fullname (pst), name)) { - psymtab_to_fullname (pst); - if (pst->fullname != NULL - && FILENAME_CMP (full_path, pst->fullname) == 0) - { - if (partial_map_expand_apply (objfile, name, full_path, real_path, - pst, callback, data)) - return 1; - } + if (partial_map_expand_apply (objfile, name, real_path, + pst, callback, data)) + return 1; + 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) { - char *rp = NULL; - psymtab_to_fullname (pst); - if (pst->fullname != NULL) - { - rp = gdb_realpath (pst->fullname); - make_cleanup (xfree, rp); - } - if (rp != NULL && FILENAME_CMP (real_path, rp) == 0) + 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, full_path, real_path, + if (partial_map_expand_apply (objfile, name, real_path, pst, callback, data)) return 1; + continue; } } } - /* Now, search for a matching tail (only if name doesn't have any dirs). */ - - if (name_basename == name) - ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, pst) - { - if (FILENAME_CMP (lbasename (pst->filename), name) == 0) - if (partial_map_expand_apply (objfile, name, full_path, real_path, pst, - callback, data)) - return 1; - } - return 0; } @@ -230,11 +223,11 @@ partial_map_symtabs_matching_filename (struct objfile *objfile, We may find a different psymtab than PST. See FIND_PC_SECT_PSYMTAB. */ static struct partial_symtab * -find_pc_sect_psymtab_closer (CORE_ADDR pc, struct obj_section *section, +find_pc_sect_psymtab_closer (struct objfile *objfile, + CORE_ADDR pc, struct obj_section *section, struct partial_symtab *pst, - struct minimal_symbol *msymbol) + struct bound_minimal_symbol msymbol) { - struct objfile *objfile = pst->objfile; struct partial_symtab *tpst; struct partial_symtab *best_pst = pst; CORE_ADDR best_addr = pst->textlow; @@ -245,12 +238,12 @@ find_pc_sect_psymtab_closer (CORE_ADDR pc, struct obj_section *section, many partial symbol tables containing the PC, but we want the partial symbol table that contains the function containing the PC. */ - if (!(objfile->flags & OBJF_REORDERED) && - section == 0) /* Can't validate section this way. */ + if (!(objfile->flags & OBJF_REORDERED) + && section == NULL) /* Can't validate section this way. */ return pst; - if (msymbol == NULL) - return (pst); + if (msymbol.minsym == NULL) + return pst; /* The code range of partial symtabs sometimes overlap, so, in the loop below, we need to check all partial symtabs and @@ -270,10 +263,10 @@ find_pc_sect_psymtab_closer (CORE_ADDR pc, struct obj_section *section, corresponding msymbol, which is not necessarily true; the debug info might be much richer than the object's symbol table. */ - p = find_pc_sect_psymbol (tpst, pc, section); + p = find_pc_sect_psymbol (objfile, tpst, pc, section); if (p != NULL - && SYMBOL_VALUE_ADDRESS (p) - == SYMBOL_VALUE_ADDRESS (msymbol)) + && (SYMBOL_VALUE_ADDRESS (p) + == BMSYMBOL_VALUE_ADDRESS (msymbol))) return tpst; /* Also accept the textlow value of a psymtab as a @@ -305,14 +298,15 @@ find_pc_sect_psymtab_closer (CORE_ADDR pc, struct obj_section *section, return best_pst; } -/* Find which partial symtab contains PC and SECTION. Return 0 if +/* Find which partial symtab contains PC and SECTION. Return NULL if none. We return the psymtab that contains a symbol whose address exactly matches PC, or, if we cannot find an exact match, the psymtab that contains a symbol whose address is closest to PC. */ + static struct partial_symtab * find_pc_sect_psymtab (struct objfile *objfile, CORE_ADDR pc, struct obj_section *section, - struct minimal_symbol *msymbol) + struct bound_minimal_symbol msymbol) { struct partial_symtab *pst; @@ -321,13 +315,14 @@ find_pc_sect_psymtab (struct objfile *objfile, CORE_ADDR pc, if (objfile->psymtabs_addrmap != NULL) { - pst = addrmap_find (objfile->psymtabs_addrmap, pc); + pst = ((struct partial_symtab *) + addrmap_find (objfile->psymtabs_addrmap, pc)); if (pst != NULL) { /* FIXME: addrmaps currently do not handle overlayed sections, so fall back to the non-addrmap case if we're debugging overlays and the addrmap returned the wrong section. */ - if (overlay_debugging && msymbol && section) + if (overlay_debugging && msymbol.minsym != NULL && section != NULL) { struct partial_symbol *p; @@ -335,10 +330,10 @@ find_pc_sect_psymtab (struct objfile *objfile, CORE_ADDR pc, corresponding msymbol, which is not necessarily true; the debug info might be much richer than the object's symbol table. */ - p = find_pc_sect_psymbol (pst, pc, section); - if (!p - || SYMBOL_VALUE_ADDRESS (p) - != SYMBOL_VALUE_ADDRESS (msymbol)) + p = find_pc_sect_psymbol (objfile, pst, pc, section); + if (p == NULL + || (SYMBOL_VALUE_ADDRESS (p) + != BMSYMBOL_VALUE_ADDRESS (msymbol))) goto next; } @@ -369,7 +364,8 @@ find_pc_sect_psymtab (struct objfile *objfile, CORE_ADDR pc, { struct partial_symtab *best_pst; - best_pst = find_pc_sect_psymtab_closer (pc, section, pst, msymbol); + best_pst = find_pc_sect_psymtab_closer (objfile, pc, section, pst, + msymbol); if (best_pst != NULL) return best_pst; } @@ -377,15 +373,19 @@ find_pc_sect_psymtab (struct objfile *objfile, CORE_ADDR pc, return NULL; } -static struct symtab * -find_pc_sect_symtab_from_partial (struct objfile *objfile, - struct minimal_symbol *msymbol, - CORE_ADDR pc, struct obj_section *section, - int warn_if_readin) +/* Psymtab version of find_pc_sect_compunit_symtab. See its definition in + the definition of quick_symbol_functions in symfile.h. */ + +static struct compunit_symtab * +psym_find_pc_sect_compunit_symtab (struct objfile *objfile, + struct bound_minimal_symbol msymbol, + CORE_ADDR pc, + struct obj_section *section, + int warn_if_readin) { struct partial_symtab *ps = find_pc_sect_psymtab (objfile, pc, section, msymbol); - if (ps) + if (ps != NULL) { if (warn_if_readin && ps->readin) /* Might want to error() here (in case symtab is corrupt and @@ -393,17 +393,19 @@ find_pc_sect_symtab_from_partial (struct objfile *objfile, continue, so let's not. */ warning (_("\ (Internal error: pc %s in read in psymtab, but not in symtab.)\n"), - paddress (get_objfile_arch (ps->objfile), pc)); - return PSYMTAB_TO_SYMTAB (ps); + paddress (get_objfile_arch (objfile), pc)); + psymtab_to_symtab (objfile, ps); + return ps->compunit_symtab; } return NULL; } /* Find which partial symbol within a psymtab matches PC and SECTION. - Return 0 if none. */ + Return NULL if none. */ static struct partial_symbol * -find_pc_sect_psymbol (struct partial_symtab *psymtab, CORE_ADDR pc, +find_pc_sect_psymbol (struct objfile *objfile, + struct partial_symtab *psymtab, CORE_ADDR pc, struct obj_section *section) { struct partial_symbol *best = NULL, *p, **pp; @@ -417,23 +419,24 @@ find_pc_sect_psymbol (struct partial_symtab *psymtab, CORE_ADDR pc, /* Search the global symbols as well as the static symbols, so that find_pc_partial_function doesn't use a minimal symbol and thus cache a bad endaddr. */ - for (pp = psymtab->objfile->global_psymbols.list + psymtab->globals_offset; - (pp - (psymtab->objfile->global_psymbols.list + psymtab->globals_offset) - < psymtab->n_global_syms); + for (pp = objfile->global_psymbols.list + psymtab->globals_offset; + (pp - (objfile->global_psymbols.list + psymtab->globals_offset) + < psymtab->n_global_syms); pp++) { p = *pp; if (SYMBOL_DOMAIN (p) == VAR_DOMAIN - && SYMBOL_CLASS (p) == LOC_BLOCK + && PSYMBOL_CLASS (p) == LOC_BLOCK && pc >= SYMBOL_VALUE_ADDRESS (p) && (SYMBOL_VALUE_ADDRESS (p) > best_pc || (psymtab->textlow == 0 && best_pc == 0 && SYMBOL_VALUE_ADDRESS (p) == 0))) { - if (section) /* Match on a specific section. */ + if (section != NULL) /* Match on a specific section. */ { - fixup_psymbol_section (p, psymtab->objfile); - if (!matching_obj_sections (SYMBOL_OBJ_SECTION (p), section)) + fixup_psymbol_section (p, objfile); + if (!matching_obj_sections (SYMBOL_OBJ_SECTION (objfile, p), + section)) continue; } best_pc = SYMBOL_VALUE_ADDRESS (p); @@ -441,23 +444,24 @@ find_pc_sect_psymbol (struct partial_symtab *psymtab, CORE_ADDR pc, } } - for (pp = psymtab->objfile->static_psymbols.list + psymtab->statics_offset; - (pp - (psymtab->objfile->static_psymbols.list + psymtab->statics_offset) - < psymtab->n_static_syms); + for (pp = objfile->static_psymbols.list + psymtab->statics_offset; + (pp - (objfile->static_psymbols.list + psymtab->statics_offset) + < psymtab->n_static_syms); pp++) { p = *pp; if (SYMBOL_DOMAIN (p) == VAR_DOMAIN - && SYMBOL_CLASS (p) == LOC_BLOCK + && PSYMBOL_CLASS (p) == LOC_BLOCK && pc >= SYMBOL_VALUE_ADDRESS (p) && (SYMBOL_VALUE_ADDRESS (p) > best_pc || (psymtab->textlow == 0 && best_pc == 0 && SYMBOL_VALUE_ADDRESS (p) == 0))) { - if (section) /* Match on a specific section. */ + if (section != NULL) /* Match on a specific section. */ { - fixup_psymbol_section (p, psymtab->objfile); - if (!matching_obj_sections (SYMBOL_OBJ_SECTION (p), section)) + fixup_psymbol_section (p, objfile); + if (!matching_obj_sections (SYMBOL_OBJ_SECTION (objfile, p), + section)) continue; } best_pc = SYMBOL_VALUE_ADDRESS (p); @@ -468,20 +472,20 @@ find_pc_sect_psymbol (struct partial_symtab *psymtab, CORE_ADDR pc, return best; } -static struct partial_symbol * +static void fixup_psymbol_section (struct partial_symbol *psym, struct objfile *objfile) { CORE_ADDR addr; - if (!psym) - return NULL; + if (psym == NULL) + return; - if (SYMBOL_OBJ_SECTION (psym)) - return psym; + if (SYMBOL_SECTION (psym) >= 0) + return; gdb_assert (objfile); - switch (SYMBOL_CLASS (psym)) + switch (PSYMBOL_CLASS (psym)) { case LOC_STATIC: case LOC_LABEL: @@ -491,48 +495,57 @@ fixup_psymbol_section (struct partial_symbol *psym, struct objfile *objfile) default: /* Nothing else will be listed in the minsyms -- no use looking it up. */ - return psym; + return; } fixup_section (&psym->ginfo, addr, objfile); - - return psym; } -static struct symtab * -lookup_symbol_aux_psymtabs (struct objfile *objfile, - int block_index, const char *name, - const domain_enum domain) +/* Psymtab version of lookup_symbol. See its definition in + the definition of quick_symbol_functions in symfile.h. */ + +static struct compunit_symtab * +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; ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, ps) { - if (!ps->readin && lookup_partial_symbol (ps, name, psymtab_index, domain)) + if (!ps->readin && lookup_partial_symbol (objfile, ps, name, + psymtab_index, domain)) { - struct symbol *sym = NULL; - struct symtab *stab = PSYMTAB_TO_SYMTAB (ps); + 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 psymtab will not contain any overload + and methods, since the index will not contain any overload information (but NAME might contain it). */ - if (stab->primary) - { - struct blockvector *bv = BLOCKVECTOR (stab); - struct block *block = BLOCKVECTOR_BLOCK (bv, block_index); - - sym = lookup_block_symbol (block, name, domain); - } - if (sym && strcmp_iw (SYMBOL_SEARCH_NAME (sym), name) == 0) + if (sym != NULL + && strcmp_iw (SYMBOL_SEARCH_NAME (sym), name) == 0) return stab; + if (with_opaque != NULL + && strcmp_iw (SYMBOL_SEARCH_NAME (with_opaque), name) == 0) + stab_best = stab; /* Keep looking through other psymtabs. */ } } - return NULL; + return stab_best; } /* Look in PST for a symbol in DOMAIN whose name matches NAME. Search @@ -544,7 +557,8 @@ lookup_symbol_aux_psymtabs (struct objfile *objfile, with MATCH. Returns the symbol, if found, and otherwise NULL. */ static struct partial_symbol * -match_partial_symbol (struct partial_symtab *pst, int global, +match_partial_symbol (struct objfile *objfile, + struct partial_symtab *pst, int global, const char *name, domain_enum domain, symbol_compare_ftype *match, symbol_compare_ftype *ordered_compare) @@ -557,8 +571,8 @@ match_partial_symbol (struct partial_symtab *pst, int global, if (length == 0) return NULL; start = (global ? - pst->objfile->global_psymbols.list + pst->globals_offset : - pst->objfile->static_psymbols.list + pst->statics_offset); + objfile->global_psymbols.list + pst->globals_offset : + objfile->static_psymbols.list + pst->statics_offset); if (global && ordered_compare) /* Can use a binary search. */ { @@ -614,15 +628,6 @@ match_partial_symbol (struct partial_symtab *pst, int global, return NULL; } -static void -pre_expand_symtabs_matching_psymtabs (struct objfile *objfile, - enum block_enum block_kind, - const char *name, - domain_enum domain) -{ - /* Nothing. */ -} - /* Returns the name used to search psymtabs. Unlike symtabs, psymtabs do not contain any method/function instance information (since this would force reading type information while reading psymtabs). Therefore, @@ -639,13 +644,13 @@ psymtab_search_name (const char *name) case language_cplus: case language_java: { - if (strchr (name, '(')) - { - char *ret = cp_remove_params (name); + if (strchr (name, '(')) + { + char *ret = cp_remove_params (name); - if (ret) - return ret; - } + if (ret) + return ret; + } } break; @@ -660,7 +665,8 @@ psymtab_search_name (const char *name) Check the global symbols if GLOBAL, the static symbols if not. */ static struct partial_symbol * -lookup_partial_symbol (struct partial_symtab *pst, const char *name, +lookup_partial_symbol (struct objfile *objfile, + struct partial_symtab *pst, const char *name, int global, domain_enum domain) { struct partial_symbol **start, **psym; @@ -671,15 +677,13 @@ lookup_partial_symbol (struct partial_symtab *pst, const char *name, struct cleanup *cleanup; if (length == 0) - { - return (NULL); - } + return NULL; search_name = psymtab_search_name (name); cleanup = make_cleanup (xfree, search_name); start = (global ? - pst->objfile->global_psymbols.list + pst->globals_offset : - pst->objfile->static_psymbols.list + pst->statics_offset); + objfile->global_psymbols.list + pst->globals_offset : + objfile->static_psymbols.list + pst->statics_offset); if (global) /* This means we can use a binary search. */ { @@ -733,7 +737,7 @@ lookup_partial_symbol (struct partial_symtab *pst, const char *name, SYMBOL_DOMAIN (*top), domain)) { do_cleanups (cleanup); - return (*top); + return *top; } top++; } @@ -751,43 +755,52 @@ lookup_partial_symbol (struct partial_symtab *pst, const char *name, && SYMBOL_MATCHES_SEARCH_NAME (*psym, search_name)) { do_cleanups (cleanup); - return (*psym); + return *psym; } } } do_cleanups (cleanup); - return (NULL); + return NULL; } /* Get the symbol table that corresponds to a partial_symtab. - This is fast after the first time you do it. In fact, there - is an even faster macro PSYMTAB_TO_SYMTAB that does the fast - case inline. */ + This is fast after the first time you do it. + The result will be NULL if the primary symtab has no symbols, + which can happen. Otherwise the result is the primary symtab + that contains PST. */ -static struct symtab * -psymtab_to_symtab (struct partial_symtab *pst) +static struct compunit_symtab * +psymtab_to_symtab (struct objfile *objfile, struct partial_symtab *pst) { + /* If it is a shared psymtab, find an unshared psymtab that includes + it. Any such psymtab will do. */ + while (pst->user != NULL) + pst = pst->user; + /* If it's been looked up before, return it. */ - if (pst->symtab) - return pst->symtab; + if (pst->compunit_symtab) + return pst->compunit_symtab; /* If it has not yet been read in, read it. */ if (!pst->readin) { struct cleanup *back_to = increment_reading_symtab (); - (*pst->read_symtab) (pst); + (*pst->read_symtab) (pst, objfile); do_cleanups (back_to); } - return pst->symtab; + return pst->compunit_symtab; } +/* Psymtab version of relocate. See its definition in + the definition of quick_symbol_functions in symfile.h. */ + static void -relocate_psymtabs (struct objfile *objfile, - struct section_offsets *new_offsets, - struct section_offsets *delta) +psym_relocate (struct objfile *objfile, + const struct section_offsets *new_offsets, + const struct section_offsets *delta) { struct partial_symbol **psym; struct partial_symtab *p; @@ -818,11 +831,14 @@ relocate_psymtabs (struct objfile *objfile, } } +/* Psymtab version of find_last_source_symtab. See its definition in + the definition of quick_symbol_functions in symfile.h. */ + static struct symtab * -find_last_source_symtab_from_partial (struct objfile *ofp) +psym_find_last_source_symtab (struct objfile *ofp) { struct partial_symtab *ps; - struct partial_symtab *cs_pst = 0; + struct partial_symtab *cs_pst = NULL; ALL_OBJFILE_PSYMTABS_REQUIRED (ofp, ps) { @@ -843,13 +859,22 @@ find_last_source_symtab_from_partial (struct objfile *ofp) "readin pst found and no symtabs.")); } else - return PSYMTAB_TO_SYMTAB (cs_pst); + { + struct compunit_symtab *cust = psymtab_to_symtab (ofp, cs_pst); + + if (cust == NULL) + return NULL; + return compunit_primary_filetab (cust); + } } return NULL; } +/* Psymtab version of forget_cached_source_info. See its definition in + the definition of quick_symbol_functions in symfile.h. */ + static void -forget_cached_source_info_partial (struct objfile *objfile) +psym_forget_cached_source_info (struct objfile *objfile) { struct partial_symtab *pst; @@ -871,6 +896,7 @@ print_partial_symbols (struct gdbarch *gdbarch, fprintf_filtered (outfile, " %s partial symbols:\n", what); while (count-- > 0) { + QUIT; fprintf_filtered (outfile, " `%s'", SYMBOL_LINKAGE_NAME (*p)); if (SYMBOL_DEMANGLED_NAME (*p) != NULL) { @@ -895,7 +921,7 @@ print_partial_symbols (struct gdbarch *gdbarch, fputs_filtered (", ", outfile); break; } - switch (SYMBOL_CLASS (*p)) + switch (PSYMBOL_CLASS (*p)) { case LOC_UNDEF: fputs_filtered ("undefined", outfile); @@ -960,13 +986,21 @@ dump_psymtab (struct objfile *objfile, struct partial_symtab *psymtab, struct gdbarch *gdbarch = get_objfile_arch (objfile); int i; - fprintf_filtered (outfile, "\nPartial symtab for source file %s ", - psymtab->filename); + if (psymtab->anonymous) + { + fprintf_filtered (outfile, "\nAnonymous partial symtab (%s) ", + psymtab->filename); + } + else + { + fprintf_filtered (outfile, "\nPartial symtab for source file %s ", + psymtab->filename); + } 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_name (objfile)); gdb_print_host_address (objfile, outfile); fprintf_unfiltered (outfile, ")\n"); @@ -974,24 +1008,12 @@ dump_psymtab (struct objfile *objfile, struct partial_symtab *psymtab, { fprintf_filtered (outfile, " Full symtab was read (at "); - gdb_print_host_address (psymtab->symtab, outfile); + gdb_print_host_address (psymtab->compunit_symtab, outfile); fprintf_filtered (outfile, " by function at "); gdb_print_host_address (psymtab->read_symtab, outfile); fprintf_filtered (outfile, ")\n"); } - fprintf_filtered (outfile, " Relocate symbols by "); - for (i = 0; i < psymtab->objfile->num_sections; ++i) - { - if (i != 0) - fprintf_filtered (outfile, ", "); - wrap_here (" "); - fputs_filtered (paddress (gdbarch, - ANOFFSET (psymtab->section_offsets, i)), - outfile); - } - fprintf_filtered (outfile, "\n"); - fprintf_filtered (outfile, " Symbols cover text addresses "); fputs_filtered (paddress (gdbarch, psymtab->textlow), outfile); fprintf_filtered (outfile, "-"); @@ -1008,6 +1030,12 @@ dump_psymtab (struct objfile *objfile, struct partial_symtab *psymtab, fprintf_filtered (outfile, " %s\n", psymtab->dependencies[i]->filename); } + if (psymtab->user != NULL) + { + fprintf_filtered (outfile, " Shared partial symtab with user "); + gdb_print_host_address (psymtab->user, outfile); + fprintf_filtered (outfile, "\n"); + } if (psymtab->n_global_syms > 0) { print_partial_symbols (gdbarch, @@ -1025,8 +1053,11 @@ dump_psymtab (struct objfile *objfile, struct partial_symtab *psymtab, fprintf_filtered (outfile, "\n"); } +/* Psymtab version of print_stats. See its definition in + the definition of quick_symbol_functions in symfile.h. */ + static void -print_psymtab_stats_for_objfile (struct objfile *objfile) +psym_print_stats (struct objfile *objfile) { int i; struct partial_symtab *ps; @@ -1040,8 +1071,11 @@ print_psymtab_stats_for_objfile (struct objfile *objfile) printf_filtered (_(" Number of psym tables (not yet expanded): %d\n"), i); } +/* Psymtab version of dump. See its definition in + the definition of quick_symbol_functions in symfile.h. */ + static void -dump_psymtabs_for_objfile (struct objfile *objfile) +psym_dump (struct objfile *objfile) { struct partial_symtab *psymtab; @@ -1056,21 +1090,18 @@ dump_psymtabs_for_objfile (struct objfile *objfile) psymtab->filename); gdb_print_host_address (psymtab, gdb_stdout); printf_filtered (", "); - if (psymtab->objfile != objfile) - { - printf_filtered ("NOT ON CHAIN! "); - } wrap_here (" "); } printf_filtered ("\n\n"); } } -/* Look through the partial symtabs for all symbols which begin - by matching FUNC_NAME. Make sure we read that symbol table in. */ +/* Psymtab version of expand_symtabs_for_function. See its definition in + the definition of quick_symbol_functions in symfile.h. */ static void -read_symtabs_for_function (struct objfile *objfile, const char *func_name) +psym_expand_symtabs_for_function (struct objfile *objfile, + const char *func_name) { struct partial_symtab *ps; @@ -1079,41 +1110,59 @@ read_symtabs_for_function (struct objfile *objfile, const char *func_name) if (ps->readin) continue; - if ((lookup_partial_symbol (ps, func_name, 1, VAR_DOMAIN) + if ((lookup_partial_symbol (objfile, ps, func_name, 1, VAR_DOMAIN) != NULL) - || (lookup_partial_symbol (ps, func_name, 0, VAR_DOMAIN) + || (lookup_partial_symbol (objfile, ps, func_name, 0, VAR_DOMAIN) != NULL)) - psymtab_to_symtab (ps); + psymtab_to_symtab (objfile, ps); } } +/* Psymtab version of expand_all_symtabs. See its definition in + the definition of quick_symbol_functions in symfile.h. */ + static void -expand_partial_symbol_tables (struct objfile *objfile) +psym_expand_all_symtabs (struct objfile *objfile) { struct partial_symtab *psymtab; ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, psymtab) { - psymtab_to_symtab (psymtab); + psymtab_to_symtab (objfile, psymtab); } } +/* Psymtab version of expand_symtabs_with_fullname. See its definition in + the definition of quick_symbol_functions in symfile.h. */ + static void -read_psymtabs_with_filename (struct objfile *objfile, const char *filename) +psym_expand_symtabs_with_fullname (struct objfile *objfile, + const char *fullname) { struct partial_symtab *p; ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, p) { - if (filename_cmp (filename, p->filename) == 0) - PSYMTAB_TO_SYMTAB (p); + /* Anonymous psymtabs don't have a name of a source file. */ + if (p->anonymous) + continue; + + /* psymtab_to_fullname tries to open the file which is slow. + Don't call it if we know the basenames don't match. */ + if ((basenames_may_differ + || filename_cmp (lbasename (fullname), lbasename (p->filename)) == 0) + && filename_cmp (fullname, psymtab_to_fullname (p)) == 0) + psymtab_to_symtab (objfile, p); } } +/* Psymtab version of map_symbol_filenames. See its definition in + the definition of quick_symbol_functions in symfile.h. */ + static void -map_symbol_filenames_psymtab (struct objfile *objfile, - symbol_filename_ftype *fun, void *data, - int need_fullname) +psym_map_symbol_filenames (struct objfile *objfile, + symbol_filename_ftype *fun, void *data, + int need_fullname) { struct partial_symtab *ps; @@ -1124,6 +1173,15 @@ map_symbol_filenames_psymtab (struct objfile *objfile, if (ps->readin) continue; + /* We can skip shared psymtabs here, because any file name will be + attached to the unshared psymtab. */ + if (ps->user != NULL) + continue; + + /* Anonymous psymtabs don't have a file name. */ + if (ps->anonymous) + continue; + QUIT; if (need_fullname) fullname = psymtab_to_fullname (ps); @@ -1133,10 +1191,6 @@ map_symbol_filenames_psymtab (struct objfile *objfile, } } -int find_and_open_source (const char *filename, - const char *dirname, - char **fullname); - /* Finds the fullname that a partial_symtab represents. If this functions finds the fullname, it will save it in ps->fullname @@ -1145,63 +1199,64 @@ int find_and_open_source (const char *filename, If this function fails to find the file that this partial_symtab represents, NULL will be returned and ps->fullname will be set to NULL. */ -static char * +static const char * psymtab_to_fullname (struct partial_symtab *ps) { - int r; - - if (!ps) - return NULL; + gdb_assert (!ps->anonymous); /* Use cached copy if we have it. We rely on forget_cached_source_info being called appropriately to handle cases like the file being moved. */ - if (ps->fullname) - return ps->fullname; - - r = find_and_open_source (ps->filename, ps->dirname, &ps->fullname); - - if (r >= 0) + if (ps->fullname == NULL) { - close (r); - return ps->fullname; - } + int fd = find_and_open_source (ps->filename, ps->dirname, &ps->fullname); - return NULL; -} + if (fd >= 0) + close (fd); + else + { + char *fullname; + struct cleanup *back_to; -static const char * -find_symbol_file_from_partial (struct objfile *objfile, const char *name) -{ - struct partial_symtab *pst; + /* rewrite_source_path would be applied by find_and_open_source, we + should report the pathname where GDB tried to find the file. */ - ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, pst) - { - if (lookup_partial_symbol (pst, name, 1, VAR_DOMAIN)) - return pst->filename; + if (ps->dirname == NULL || IS_ABSOLUTE_PATH (ps->filename)) + fullname = xstrdup (ps->filename); + else + fullname = concat (ps->dirname, SLASH_STRING, + ps->filename, (char *) NULL); + + back_to = make_cleanup (xfree, fullname); + ps->fullname = rewrite_source_path (fullname); + if (ps->fullname == NULL) + ps->fullname = xstrdup (fullname); + do_cleanups (back_to); + } } - return NULL; + + return ps->fullname; } -/* For all symbols, s, in BLOCK that are in NAMESPACE 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. */ +/* For all symbols, s, in BLOCK that are in DOMAIN and match NAME + according to the function MATCH, call CALLBACK(BLOCK, s, DATA). + BLOCK is assumed to come from OBJFILE. Returns 1 iff CALLBACK + ever returns non-zero, and otherwise returns 0. */ static int -map_block (const char *name, domain_enum namespace, struct objfile *objfile, +map_block (const char *name, domain_enum domain, struct objfile *objfile, struct block *block, int (*callback) (struct block *, struct symbol *, void *), void *data, symbol_compare_ftype *match) { - struct dict_iterator iter; + struct block_iterator iter; struct symbol *sym; - for (sym = dict_iter_match_first (BLOCK_DICT (block), name, match, &iter); - sym != NULL; sym = dict_iter_match_next (name, match, &iter)) + for (sym = block_iter_match_first (block, name, match, &iter); + sym != NULL; sym = block_iter_match_next (name, match, &iter)) { - if (symbol_matches_domain (SYMBOL_LANGUAGE (sym), - SYMBOL_DOMAIN (sym), namespace)) + if (symbol_matches_domain (SYMBOL_LANGUAGE (sym), + SYMBOL_DOMAIN (sym), domain)) { if (callback (block, sym, data)) return 1; @@ -1211,17 +1266,18 @@ map_block (const char *name, domain_enum namespace, struct objfile *objfile, return 0; } -/* Psymtab version of map_matching_symbols. See its definition in - the definition of quick_symbol_functions in symfile.h. */ +/* Psymtab version of map_matching_symbols. See its definition in + the definition of quick_symbol_functions in symfile.h. */ static void -map_matching_symbols_psymtab (const char *name, domain_enum namespace, - struct objfile *objfile, int global, - int (*callback) (struct block *, - struct symbol *, void *), - void *data, - symbol_compare_ftype *match, - symbol_compare_ftype *ordered_compare) +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_compare_ftype *match, + symbol_compare_ftype *ordered_compare) { const int block_kind = global ? GLOBAL_BLOCK : STATIC_BLOCK; struct partial_symtab *ps; @@ -1230,117 +1286,201 @@ map_matching_symbols_psymtab (const char *name, domain_enum namespace, { QUIT; if (ps->readin - || match_partial_symbol (ps, global, name, namespace, match, + || match_partial_symbol (objfile, ps, global, name, domain, match, ordered_compare)) { - struct symtab *s = PSYMTAB_TO_SYMTAB (ps); + struct compunit_symtab *cust = psymtab_to_symtab (objfile, ps); struct block *block; - if (s == NULL || !s->primary) + if (cust == NULL) continue; - block = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), block_kind); - if (map_block (name, namespace, objfile, block, + block = BLOCKVECTOR_BLOCK (COMPUNIT_BLOCKVECTOR (cust), block_kind); + if (map_block (name, domain, objfile, block, callback, data, match)) return; if (callback (block, NULL, data)) return; } } -} +} + +/* A helper for psym_expand_symtabs_matching that handles + searching included psymtabs. This returns 1 if a symbol is found, + and zero otherwise. It also updates the 'searched_flag' on the + various psymtabs that it searches. */ + +static int +recursively_search_psymtabs (struct partial_symtab *ps, + struct objfile *objfile, + enum search_domain kind, + expand_symtabs_symbol_matcher_ftype *sym_matcher, + void *data) +{ + struct partial_symbol **psym; + struct partial_symbol **bound, **gbound, **sbound; + int keep_going = 1; + enum psymtab_search_status result = PST_SEARCHED_AND_NOT_FOUND; + int i; + + if (ps->searched_flag != PST_NOT_SEARCHED) + return ps->searched_flag == PST_SEARCHED_AND_FOUND; + + /* Recurse into shared psymtabs first, because they may have already + been searched, and this could save some time. */ + for (i = 0; i < ps->number_of_dependencies; ++i) + { + int r; + + /* Skip non-shared dependencies, these are handled elsewhere. */ + if (ps->dependencies[i]->user == NULL) + continue; + + r = recursively_search_psymtabs (ps->dependencies[i], + objfile, kind, sym_matcher, data); + if (r != 0) + { + ps->searched_flag = PST_SEARCHED_AND_FOUND; + return 1; + } + } + + gbound = (objfile->global_psymbols.list + + ps->globals_offset + ps->n_global_syms); + sbound = (objfile->static_psymbols.list + + ps->statics_offset + ps->n_static_syms); + bound = gbound; + + /* Go through all of the symbols stored in a partial + symtab in one loop. */ + psym = objfile->global_psymbols.list + ps->globals_offset; + while (keep_going) + { + if (psym >= bound) + { + if (bound == gbound && ps->n_static_syms != 0) + { + psym = objfile->static_psymbols.list + ps->statics_offset; + bound = sbound; + } + else + keep_going = 0; + continue; + } + else + { + QUIT; + + if ((kind == ALL_DOMAIN + || (kind == VARIABLES_DOMAIN + && PSYMBOL_CLASS (*psym) != LOC_TYPEDEF + && PSYMBOL_CLASS (*psym) != LOC_BLOCK) + || (kind == FUNCTIONS_DOMAIN + && PSYMBOL_CLASS (*psym) == LOC_BLOCK) + || (kind == TYPES_DOMAIN + && PSYMBOL_CLASS (*psym) == LOC_TYPEDEF)) + && (*sym_matcher) (SYMBOL_SEARCH_NAME (*psym), data)) + { + /* Found a match, so notify our caller. */ + result = PST_SEARCHED_AND_FOUND; + keep_going = 0; + } + } + psym++; + } + + ps->searched_flag = result; + return result == PST_SEARCHED_AND_FOUND; +} + +/* Psymtab version of expand_symtabs_matching. See its definition in + the definition of quick_symbol_functions in symfile.h. */ static void -expand_symtabs_matching_via_partial +psym_expand_symtabs_matching (struct objfile *objfile, - int (*file_matcher) (const char *, void *), - int (*name_matcher) (const struct language_defn *, const char *, void *), + expand_symtabs_file_matcher_ftype *file_matcher, + expand_symtabs_symbol_matcher_ftype *symbol_matcher, + expand_symtabs_exp_notify_ftype *expansion_notify, enum search_domain kind, void *data) { struct partial_symtab *ps; + /* Clear the search flags. */ ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, ps) { - struct partial_symbol **psym; - struct partial_symbol **bound, **gbound, **sbound; - int keep_going = 1; + ps->searched_flag = PST_NOT_SEARCHED; + } + + ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, ps) + { + QUIT; if (ps->readin) continue; - if (file_matcher && ! (*file_matcher) (ps->filename, data)) + /* We skip shared psymtabs because file-matching doesn't apply + to them; but we search them later in the loop. */ + if (ps->user != NULL) continue; - gbound = objfile->global_psymbols.list - + ps->globals_offset + ps->n_global_syms; - sbound = objfile->static_psymbols.list - + ps->statics_offset + ps->n_static_syms; - bound = gbound; - - /* Go through all of the symbols stored in a partial - symtab in one loop. */ - psym = objfile->global_psymbols.list + ps->globals_offset; - while (keep_going) + if (file_matcher) { - if (psym >= bound) + int match; + + if (ps->anonymous) + continue; + + match = (*file_matcher) (ps->filename, data, 0); + if (!match) { - if (bound == gbound && ps->n_static_syms != 0) - { - psym = objfile->static_psymbols.list + ps->statics_offset; - bound = sbound; - } - else - keep_going = 0; - 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 + || (*file_matcher) (lbasename (ps->filename), data, 1)) + match = (*file_matcher) (psymtab_to_fullname (ps), data, 0); } - else - { - QUIT; - - if ((kind == ALL_DOMAIN - || (kind == VARIABLES_DOMAIN - && SYMBOL_CLASS (*psym) != LOC_TYPEDEF - && SYMBOL_CLASS (*psym) != LOC_BLOCK) - || (kind == FUNCTIONS_DOMAIN - && SYMBOL_CLASS (*psym) == LOC_BLOCK) - || (kind == TYPES_DOMAIN - && SYMBOL_CLASS (*psym) == LOC_TYPEDEF)) - && (*name_matcher) (current_language, - SYMBOL_SEARCH_NAME (*psym), data)) - { - PSYMTAB_TO_SYMTAB (ps); - keep_going = 0; - } - } - psym++; + if (!match) + continue; + } + + if (recursively_search_psymtabs (ps, objfile, kind, symbol_matcher, data)) + { + struct compunit_symtab *symtab = + psymtab_to_symtab (objfile, ps); + + if (expansion_notify != NULL) + expansion_notify (symtab, data); } } } +/* Psymtab version of has_symbols. See its definition in + the definition of quick_symbol_functions in symfile.h. */ + static int -objfile_has_psyms (struct objfile *objfile) +psym_has_symbols (struct objfile *objfile) { return objfile->psymtabs != NULL; } const struct quick_symbol_functions psym_functions = { - objfile_has_psyms, - find_last_source_symtab_from_partial, - forget_cached_source_info_partial, - partial_map_symtabs_matching_filename, - lookup_symbol_aux_psymtabs, - pre_expand_symtabs_matching_psymtabs, - print_psymtab_stats_for_objfile, - dump_psymtabs_for_objfile, - relocate_psymtabs, - read_symtabs_for_function, - expand_partial_symbol_tables, - read_psymtabs_with_filename, - find_symbol_file_from_partial, - map_matching_symbols_psymtab, - expand_symtabs_matching_via_partial, - find_pc_sect_symtab_from_partial, - map_symbol_filenames_psymtab + psym_has_symbols, + psym_find_last_source_symtab, + psym_forget_cached_source_info, + psym_map_symtabs_matching_filename, + psym_lookup_symbol, + psym_print_stats, + psym_dump, + psym_relocate, + psym_expand_symtabs_for_function, + psym_expand_all_symtabs, + psym_expand_symtabs_with_fullname, + psym_map_matching_symbols, + psym_expand_symtabs_matching, + psym_find_pc_sect_compunit_symtab, + psym_map_symbol_filenames }; @@ -1351,19 +1491,19 @@ const struct quick_symbol_functions psym_functions = static int compare_psymbols (const void *s1p, const void *s2p) { - struct partial_symbol *const *s1 = s1p; - struct partial_symbol *const *s2 = s2p; + struct partial_symbol *const *s1 = (struct partial_symbol * const*) s1p; + struct partial_symbol *const *s2 = (struct partial_symbol * const*) s2p; return strcmp_iw_ordered (SYMBOL_SEARCH_NAME (*s1), SYMBOL_SEARCH_NAME (*s2)); } -void -sort_pst_symbols (struct partial_symtab *pst) +static void +sort_pst_symbols (struct objfile *objfile, struct partial_symtab *pst) { /* Sort the global list; don't sort the static list. */ - qsort (pst->objfile->global_psymbols.list + pst->globals_offset, + qsort (objfile->global_psymbols.list + pst->globals_offset, pst->n_global_syms, sizeof (struct partial_symbol *), compare_psymbols); } @@ -1375,7 +1515,6 @@ sort_pst_symbols (struct partial_symtab *pst) struct partial_symtab * start_psymtab_common (struct objfile *objfile, - struct section_offsets *section_offsets, const char *filename, CORE_ADDR textlow, struct partial_symbol **global_syms, struct partial_symbol **static_syms) @@ -1383,12 +1522,26 @@ start_psymtab_common (struct objfile *objfile, struct partial_symtab *psymtab; psymtab = allocate_psymtab (filename, objfile); - psymtab->section_offsets = section_offsets; psymtab->textlow = textlow; psymtab->texthigh = psymtab->textlow; /* default */ psymtab->globals_offset = global_syms - objfile->global_psymbols.list; psymtab->statics_offset = static_syms - objfile->static_psymbols.list; - return (psymtab); + return psymtab; +} + +/* Perform "finishing up" operations of a partial symtab. */ + +void +end_psymtab_common (struct objfile *objfile, struct partial_symtab *pst) +{ + pst->n_global_syms + = objfile->global_psymbols.next - (objfile->global_psymbols.list + + pst->globals_offset); + pst->n_static_syms + = objfile->static_psymbols.next - (objfile->static_psymbols.list + + pst->statics_offset); + + sort_pst_symbols (objfile, pst); } /* Calculate a hash code for the given partial symbol. The hash is @@ -1403,12 +1556,12 @@ psymbol_hash (const void *addr, int length) struct partial_symbol *psymbol = (struct partial_symbol *) addr; unsigned int lang = psymbol->ginfo.language; unsigned int domain = PSYMBOL_DOMAIN (psymbol); - unsigned int class = PSYMBOL_CLASS (psymbol); + unsigned int theclass = PSYMBOL_CLASS (psymbol); h = hash_continue (&psymbol->ginfo.value, sizeof (psymbol->ginfo.value), h); h = hash_continue (&lang, sizeof (unsigned int), h); h = hash_continue (&domain, sizeof (unsigned int), h); - h = hash_continue (&class, sizeof (unsigned int), h); + h = hash_continue (&theclass, sizeof (unsigned int), h); h = hash_continue (psymbol->ginfo.name, strlen (psymbol->ginfo.name), h); return h; @@ -1437,12 +1590,14 @@ psymbol_compare (const void *addr1, const void *addr2, int length) struct psymbol_bcache * psymbol_bcache_init (void) { - struct psymbol_bcache *bcache = XCALLOC (1, struct psymbol_bcache); + 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) { @@ -1471,13 +1626,12 @@ psymbol_bcache_full (struct partial_symbol *sym, struct psymbol_bcache *bcache, int *added) { - return bcache_full (sym, - sizeof (struct partial_symbol), - bcache->bcache, - added); + return ((const struct partial_symbol *) + bcache_full (sym, sizeof (struct partial_symbol), bcache->bcache, + added)); } -/* Helper function, initialises partial symbol structure and stashes +/* Helper function, initialises partial symbol structure and stashes it into objfile's bcache. Note that our caching mechanism will use all fields of struct partial_symbol to determine hash value of the structure. In other words, having two symbols with the same name but @@ -1486,40 +1640,28 @@ psymbol_bcache_full (struct partial_symbol *sym, static const struct partial_symbol * add_psymbol_to_bcache (const char *name, int namelength, int copy_name, domain_enum domain, - enum address_class class, - long val, /* Value as a long */ - CORE_ADDR coreaddr, /* Value as a CORE_ADDR */ + enum address_class theclass, + CORE_ADDR coreaddr, enum language language, struct objfile *objfile, int *added) { struct partial_symbol psymbol; - /* We must ensure that the entire 'value' field has been zeroed - before assigning to it, because an assignment may not write the - entire field. */ - memset (&psymbol.ginfo.value, 0, sizeof (psymbol.ginfo.value)); + /* We must ensure that the entire struct has been zeroed before + assigning to it, because an assignment may not touch some of the + holes. */ + memset (&psymbol, 0, sizeof (psymbol)); - /* val and coreaddr are mutually exclusive, one of them *will* be zero. */ - if (val != 0) - { - SYMBOL_VALUE (&psymbol) = val; - } - else - { - SYMBOL_VALUE_ADDRESS (&psymbol) = coreaddr; - } - SYMBOL_SECTION (&psymbol) = 0; - SYMBOL_OBJ_SECTION (&psymbol) = NULL; - SYMBOL_SET_LANGUAGE (&psymbol, language); + SYMBOL_VALUE_ADDRESS (&psymbol) = coreaddr; + SYMBOL_SECTION (&psymbol) = -1; + SYMBOL_SET_LANGUAGE (&psymbol, language, &objfile->objfile_obstack); PSYMBOL_DOMAIN (&psymbol) = domain; - PSYMBOL_CLASS (&psymbol) = class; + PSYMBOL_CLASS (&psymbol) = theclass; SYMBOL_SET_NAMES (&psymbol, name, namelength, copy_name, objfile); /* Stash the partial symbol away in the cache. */ - return psymbol_bcache_full (&psymbol, - objfile->psymbol_cache, - added); + return psymbol_bcache_full (&psymbol, objfile->psymbol_cache, added); } /* Increase the space allocated for LISTP, which is probably @@ -1535,8 +1677,7 @@ extend_psymbol_list (struct psymbol_allocation_list *listp, if (listp->size == 0) { new_size = 255; - listp->list = (struct partial_symbol **) - xmalloc (new_size * sizeof (struct partial_symbol *)); + listp->list = XNEWVEC (struct partial_symbol *, new_size); } else { @@ -1551,8 +1692,7 @@ extend_psymbol_list (struct psymbol_allocation_list *listp, listp->size = new_size; } -/* Helper function, adds partial symbol to the given partial symbol - list. */ +/* Helper function, adds partial symbol to the given partial symbol list. */ static void append_psymbol_to_list (struct psymbol_allocation_list *list, @@ -1567,26 +1707,16 @@ append_psymbol_to_list (struct psymbol_allocation_list *list, /* 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. */ -/* NOTE: carlton/2003-09-11: The reason why we return the partial - symbol is so that callers can get access to the symbol's demangled - name, which they don't have any cheap way to determine otherwise. - (Currenly, dwarf2read.c is the only file who uses that information, - though it's possible that other readers might in the future.) - Elena wasn't thrilled about that, and I don't blame her, but we - couldn't come up with a better way to get that information. If - it's needed in other situations, we could consider breaking up - SYMBOL_SET_NAMES to provide access to the demangled name lookup - cache. */ - -const struct partial_symbol * +void add_psymbol_to_list (const char *name, int namelength, int copy_name, domain_enum domain, - enum address_class class, - struct psymbol_allocation_list *list, - long val, /* Value as a long */ - CORE_ADDR coreaddr, /* Value as a CORE_ADDR */ + enum address_class theclass, + struct psymbol_allocation_list *list, + CORE_ADDR coreaddr, enum language language, struct objfile *objfile) { const struct partial_symbol *psym; @@ -1594,17 +1724,16 @@ add_psymbol_to_list (const char *name, int namelength, int copy_name, int added; /* Stash the partial symbol away in the cache. */ - psym = add_psymbol_to_bcache (name, namelength, copy_name, domain, class, - val, coreaddr, language, objfile, &added); + psym = add_psymbol_to_bcache (name, namelength, copy_name, domain, theclass, + coreaddr, language, objfile, &added); /* Do not duplicate global partial symbols. */ if (list == &objfile->global_psymbols && !added) - return psym; + return; /* Save pointer to partial symbol in psymtab, growing symtab if needed. */ append_psymbol_to_list (list, psym, objfile); - return psym; } /* Initialize storage for partial symbols. */ @@ -1615,17 +1744,13 @@ init_psymbol_list (struct objfile *objfile, int total_symbols) /* Free any previously allocated psymbol lists. */ if (objfile->global_psymbols.list) - { - xfree (objfile->global_psymbols.list); - } + xfree (objfile->global_psymbols.list); if (objfile->static_psymbols.list) - { - xfree (objfile->static_psymbols.list); - } + xfree (objfile->static_psymbols.list); /* Current best guess is that approximately a twentieth of the total symbols (in a debugging file) are global or static - oriented symbols. */ + oriented symbols, then multiply that by slop factor of two. */ objfile->global_psymbols.size = total_symbols / 10; objfile->static_psymbols.size = total_symbols / 10; @@ -1633,16 +1758,14 @@ init_psymbol_list (struct objfile *objfile, int total_symbols) if (objfile->global_psymbols.size > 0) { objfile->global_psymbols.next = - objfile->global_psymbols.list = (struct partial_symbol **) - xmalloc ((objfile->global_psymbols.size - * sizeof (struct partial_symbol *))); + objfile->global_psymbols.list = + XNEWVEC (struct partial_symbol *, objfile->global_psymbols.size); } if (objfile->static_psymbols.size > 0) { objfile->static_psymbols.next = - objfile->static_psymbols.list = (struct partial_symbol **) - xmalloc ((objfile->static_psymbols.size - * sizeof (struct partial_symbol *))); + objfile->static_psymbols.list = + XNEWVEC (struct partial_symbol *, objfile->static_psymbols.size); } } @@ -1662,23 +1785,43 @@ allocate_psymtab (const char *filename, struct objfile *objfile) sizeof (struct partial_symtab)); memset (psymtab, 0, sizeof (struct partial_symtab)); - psymtab->filename = obsavestring (filename, strlen (filename), - &objfile->objfile_obstack); - psymtab->symtab = NULL; + psymtab->filename + = (const char *) bcache (filename, strlen (filename) + 1, + objfile->per_bfd->filename_cache); + 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->objfile = objfile; psymtab->next = objfile->psymtabs; objfile->psymtabs = psymtab; - return (psymtab); + if (symtab_create_debug) + { + /* Be a bit clever with debugging messages, and don't print objfile + every time, only when it changes. */ + static char *last_objfile_name = NULL; + + if (last_objfile_name == NULL + || strcmp (last_objfile_name, objfile_name (objfile)) != 0) + { + 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_unfiltered (gdb_stdlog, + "Created psymtab %s for module %s.\n", + host_address_to_string (psymtab), filename); + } + + return psymtab; } void -discard_psymtab (struct partial_symtab *pst) +discard_psymtab (struct objfile *objfile, struct partial_symtab *pst) { struct partial_symtab **prev_pst; @@ -1691,20 +1834,131 @@ discard_psymtab (struct partial_symtab *pst) /* First, snip it out of the psymtab chain. */ - prev_pst = &(pst->objfile->psymtabs); + prev_pst = &(objfile->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 = pst->objfile->free_psymtabs; - pst->objfile->free_psymtabs = pst; + pst->next = objfile->free_psymtabs; + objfile->free_psymtabs = pst; +} + +/* An object of this type is passed to discard_psymtabs_upto. */ + +struct psymtab_state +{ + /* The objfile where psymtabs are discarded. */ + + struct objfile *objfile; + + /* The first psymtab to save. */ + + struct partial_symtab *save; +}; + +/* A cleanup function used by make_cleanup_discard_psymtabs. */ + +static void +discard_psymtabs_upto (void *arg) +{ + struct psymtab_state *state = (struct psymtab_state *) arg; + + while (state->objfile->psymtabs != state->save) + discard_psymtab (state->objfile, state->objfile->psymtabs); +} + +/* Return a new cleanup that discards all psymtabs created in OBJFILE + after this function is called. */ + +struct cleanup * +make_cleanup_discard_psymtabs (struct objfile *objfile) +{ + struct psymtab_state *state = XNEW (struct psymtab_state); + + state->objfile = objfile; + state->save = objfile->psymtabs; + + return make_cleanup_dtor (discard_psymtabs_upto, state, xfree); } -void +/* We need to pass a couple of items to the addrmap_foreach function, + so use a struct. */ + +struct dump_psymtab_addrmap_data +{ + struct objfile *objfile; + struct partial_symtab *psymtab; + struct ui_file *outfile; + + /* Non-zero if the previously printed addrmap entry was for PSYMTAB. + If so, we want to print the next one as well (since the next addrmap + entry defines the end of the range). */ + int previous_matched; +}; + +/* Helper function for dump_psymtab_addrmap to print an addrmap entry. */ + +static int +dump_psymtab_addrmap_1 (void *datap, CORE_ADDR start_addr, void *obj) +{ + struct dump_psymtab_addrmap_data *data + = (struct dump_psymtab_addrmap_data *) datap; + struct gdbarch *gdbarch = get_objfile_arch (data->objfile); + struct partial_symtab *addrmap_psymtab = (struct partial_symtab *) obj; + const char *psymtab_address_or_end = NULL; + + QUIT; + + if (data->psymtab == NULL + || data->psymtab == addrmap_psymtab) + psymtab_address_or_end = host_address_to_string (addrmap_psymtab); + else if (data->previous_matched) + psymtab_address_or_end = ""; + + if (data->psymtab == NULL + || data->psymtab == addrmap_psymtab + || data->previous_matched) + { + fprintf_filtered (data->outfile, " %s%s %s\n", + data->psymtab != NULL ? " " : "", + paddress (gdbarch, start_addr), + psymtab_address_or_end); + } + + data->previous_matched = (data->psymtab == NULL + || data->psymtab == addrmap_psymtab); + + return 0; +} + +/* Helper function for maintenance_print_psymbols to print the addrmap + of PSYMTAB. If PSYMTAB is NULL print the entire addrmap. */ + +static void +dump_psymtab_addrmap (struct objfile *objfile, struct partial_symtab *psymtab, + struct ui_file *outfile) +{ + struct dump_psymtab_addrmap_data addrmap_dump_data; + + if (psymtab == NULL + || psymtab->psymtabs_addrmap_supported) + { + addrmap_dump_data.objfile = objfile; + addrmap_dump_data.psymtab = psymtab; + addrmap_dump_data.outfile = outfile; + 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); + } +} + +static void maintenance_print_psymbols (char *args, int from_tty) { char **argv; @@ -1739,20 +1993,40 @@ print-psymbols takes an output file name and optional symbol file name")); make_cleanup (xfree, filename); outfile = gdb_fopen (filename, FOPEN_WT); - if (outfile == 0) + if (outfile == NULL) perror_with_name (filename); make_cleanup_ui_file_delete (outfile); - immediate_quit++; - ALL_PSYMTABS (objfile, ps) - if (symname == NULL || filename_cmp (symname, ps->filename) == 0) - dump_psymtab (objfile, ps, outfile); - immediate_quit--; + ALL_OBJFILES (objfile) + { + fprintf_filtered (outfile, "\nPartial symtabs for objfile %s\n", + objfile_name (objfile)); + + ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, ps) + { + QUIT; + if (symname == NULL || filename_cmp (symname, ps->filename) == 0) + { + dump_psymtab (objfile, ps, outfile); + dump_psymtab_addrmap (objfile, ps, outfile); + } + } + + /* If we're printing all symbols dump the full addrmap. */ + + if (symname == NULL) + { + fprintf_filtered (outfile, "\n"); + dump_psymtab_addrmap (objfile, NULL, outfile); + } + } + do_cleanups (cleanups); } /* List all the partial symbol tables whose names match REGEXP (optional). */ -void + +static void maintenance_info_psymtabs (char *regexp, int from_tty) { struct program_space *pspace; @@ -1780,16 +2054,16 @@ maintenance_info_psymtabs (char *regexp, int from_tty) { if (! printed_objfile_start) { - printf_filtered ("{ objfile %s ", objfile->name); + printf_filtered ("{ objfile %s ", objfile_name (objfile)); wrap_here (" "); - printf_filtered ("((struct objfile *) %s)\n", + 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", + printf_filtered ("((struct partial_symtab *) %s)\n", host_address_to_string (psymtab)); printf_filtered (" readin %s\n", @@ -1811,7 +2085,7 @@ maintenance_info_psymtabs (char *regexp, int from_tty) if (psymtab->n_global_syms) { printf_filtered ("(* (struct partial_symbol **) %s @ %d)\n", - host_address_to_string (psymtab->objfile->global_psymbols.list + host_address_to_string (objfile->global_psymbols.list + psymtab->globals_offset), psymtab->n_global_syms); } @@ -1821,7 +2095,7 @@ maintenance_info_psymtabs (char *regexp, int from_tty) if (psymtab->n_static_syms) { printf_filtered ("(* (struct partial_symbol **) %s @ %d)\n", - host_address_to_string (psymtab->objfile->static_psymbols.list + host_address_to_string (objfile->static_psymbols.list + psymtab->statics_offset), psymtab->n_static_syms); } @@ -1840,7 +2114,7 @@ maintenance_info_psymtabs (char *regexp, int from_tty) /* Note the string concatenation there --- no comma. */ printf_filtered (" psymtab %s " "((struct partial_symtab *) %s)\n", - dep->filename, + dep->filename, host_address_to_string (dep)); } printf_filtered (" }\n"); @@ -1856,16 +2130,16 @@ maintenance_info_psymtabs (char *regexp, int from_tty) } } -/* Check consistency of psymtabs and symtabs. */ +/* Check consistency of currently expanded psymtabs vs symtabs. */ -void -maintenance_check_symtabs (char *ignore, int from_tty) +static void +maintenance_check_psymtabs (char *ignore, int from_tty) { struct symbol *sym; struct partial_symbol **psym; - struct symtab *s = NULL; + struct compunit_symtab *cust = NULL; struct partial_symtab *ps; - struct blockvector *bv; + const struct blockvector *bv; struct objfile *objfile; struct block *b; int length; @@ -1874,16 +2148,34 @@ maintenance_check_symtabs (char *ignore, int from_tty) { struct gdbarch *gdbarch = get_objfile_arch (objfile); - s = PSYMTAB_TO_SYMTAB (ps); - if (s == NULL) + /* 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->texthigh < ps->textlow) + { + printf_filtered ("Psymtab "); + puts_filtered (ps->filename); + printf_filtered (" covers bad range "); + fputs_filtered (paddress (gdbarch, ps->textlow), gdb_stdout); + printf_filtered (" - "); + fputs_filtered (paddress (gdbarch, ps->texthigh), gdb_stdout); + printf_filtered ("\n"); + continue; + } + + /* Now do checks requiring the associated symtab. */ + if (cust == NULL) continue; - bv = BLOCKVECTOR (s); + bv = COMPUNIT_BLOCKVECTOR (cust); b = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK); - psym = ps->objfile->static_psymbols.list + ps->statics_offset; + psym = objfile->static_psymbols.list + ps->statics_offset; length = ps->n_static_syms; while (length--) { - sym = lookup_block_symbol (b, SYMBOL_LINKAGE_NAME (*psym), + sym = block_lookup_symbol (b, SYMBOL_LINKAGE_NAME (*psym), SYMBOL_DOMAIN (*psym)); if (!sym) { @@ -1896,11 +2188,11 @@ maintenance_check_symtabs (char *ignore, int from_tty) psym++; } b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK); - psym = ps->objfile->global_psymbols.list + ps->globals_offset; + psym = objfile->global_psymbols.list + ps->globals_offset; length = ps->n_global_syms; while (length--) { - sym = lookup_block_symbol (b, SYMBOL_LINKAGE_NAME (*psym), + sym = block_lookup_symbol (b, SYMBOL_LINKAGE_NAME (*psym), SYMBOL_DOMAIN (*psym)); if (!sym) { @@ -1912,20 +2204,8 @@ maintenance_check_symtabs (char *ignore, int from_tty) } psym++; } - if (ps->texthigh < ps->textlow) - { - printf_filtered ("Psymtab "); - puts_filtered (ps->filename); - printf_filtered (" covers bad range "); - fputs_filtered (paddress (gdbarch, ps->textlow), gdb_stdout); - printf_filtered (" - "); - fputs_filtered (paddress (gdbarch, ps->texthigh), gdb_stdout); - printf_filtered ("\n"); - continue; - } - if (ps->texthigh == 0) - continue; - if (ps->textlow < BLOCK_START (b) || ps->texthigh > BLOCK_END (b)) + if (ps->texthigh != 0 + && (ps->textlow < BLOCK_START (b) || ps->texthigh > BLOCK_END (b))) { printf_filtered ("Psymtab "); puts_filtered (ps->filename); @@ -1944,31 +2224,25 @@ maintenance_check_symtabs (char *ignore, int from_tty) -void -expand_partial_symbol_names (int (*fun) (const struct language_defn *, - const char *, void *), - void *data) -{ - struct objfile *objfile; - - ALL_OBJFILES (objfile) - { - if (objfile->sf) - objfile->sf->qf->expand_symtabs_matching (objfile, NULL, fun, - ALL_DOMAIN, data); - } -} +extern initialize_file_ftype _initialize_psymtab; void -map_partial_symbol_filenames (symbol_filename_ftype *fun, void *data, - int need_fullname) +_initialize_psymtab (void) { - struct objfile *objfile; - - ALL_OBJFILES (objfile) - { - if (objfile->sf) - objfile->sf->qf->map_symbol_filenames (objfile, fun, data, - need_fullname); - } + add_cmd ("psymbols", class_maintenance, maintenance_print_psymbols, _("\ +Print dump of current partial symbol definitions.\n\ +Entries in the partial symbol table are dumped to file OUTFILE.\n\ +If a SOURCE file is specified, dump only that file's partial symbols."), + &maintenanceprintlist); + + add_cmd ("psymtabs", class_maintenance, maintenance_info_psymtabs, _("\ +List the partial symbol tables for all object files.\n\ +This does not include information about individual partial symbols,\n\ +just the symbol table structures themselves."), + &maintenanceinfolist); + + add_cmd ("check-psymtabs", class_maintenance, maintenance_check_psymtabs, + _("\ +Check consistency of currently expanded psymtabs versus symtabs."), + &maintenancelist); }