/* Partial symbol tables.
-
+
Copyright (C) 2009-2015 Free Software Foundation, Inc.
This file is part of GDB.
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.minsym == NULL)
- return (pst);
+ return pst;
/* The code range of partial symtabs sometimes overlap, so, in
the loop below, we need to check all partial symtabs and
object's symbol table. */
p = find_pc_sect_psymbol (objfile, tpst, pc, section);
if (p != NULL
- && SYMBOL_VALUE_ADDRESS (p)
- == BMSYMBOL_VALUE_ADDRESS (msymbol))
+ && (SYMBOL_VALUE_ADDRESS (p)
+ == BMSYMBOL_VALUE_ADDRESS (msymbol)))
return tpst;
/* Also accept the textlow value of a psymtab as a
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,
/* 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.minsym && section)
+ if (overlay_debugging && msymbol.minsym != NULL && section != NULL)
{
struct partial_symbol *p;
true; the debug info might be much richer than the
object's symbol table. */
p = find_pc_sect_psymbol (objfile, pst, pc, section);
- if (!p
- || SYMBOL_VALUE_ADDRESS (p)
- != BMSYMBOL_VALUE_ADDRESS (msymbol))
+ if (p == NULL
+ || (SYMBOL_VALUE_ADDRESS (p)
+ != BMSYMBOL_VALUE_ADDRESS (msymbol)))
goto next;
}
return NULL;
}
-/* Psymtab version of find_pc_sect_compunit_symtab. See its definition in
- the definition of quick_symbol_functions in symfile.h. */
+/* 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 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
}
/* 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 objfile *objfile,
find_pc_partial_function doesn't use a minimal symbol and thus
cache a bad endaddr. */
for (pp = objfile->global_psymbols.list + psymtab->globals_offset;
- (pp - (objfile->global_psymbols.list + psymtab->globals_offset)
- < psymtab->n_global_syms);
+ (pp - (objfile->global_psymbols.list + psymtab->globals_offset)
+ < psymtab->n_global_syms);
pp++)
{
p = *pp;
|| (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, objfile);
if (!matching_obj_sections (SYMBOL_OBJ_SECTION (objfile, p),
}
for (pp = objfile->static_psymbols.list + psymtab->statics_offset;
- (pp - (objfile->static_psymbols.list + psymtab->statics_offset)
- < psymtab->n_static_syms);
+ (pp - (objfile->static_psymbols.list + psymtab->statics_offset)
+ < psymtab->n_static_syms);
pp++)
{
p = *pp;
|| (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, objfile);
if (!matching_obj_sections (SYMBOL_OBJ_SECTION (objfile, p),
{
CORE_ADDR addr;
- if (!psym)
+ if (psym == NULL)
return;
if (SYMBOL_SECTION (psym) >= 0)
fixup_section (&psym->ginfo, addr, objfile);
}
-/* Psymtab version of lookup_symbol. See its definition in
- the definition of quick_symbol_functions in symfile.h. */
+/* 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,
if (!ps->readin && lookup_partial_symbol (objfile, ps, name,
psymtab_index, domain))
{
- struct symbol *sym = NULL;
+ 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
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). */
- sym = block_lookup_symbol (block, name, domain);
- if (sym && strcmp_iw (SYMBOL_SEARCH_NAME (sym), name) == 0)
- {
- if (!TYPE_IS_OPAQUE (SYMBOL_TYPE (sym)))
- return stab;
-
- stab_best = stab;
- }
+ 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. */
}
struct cleanup *cleanup;
if (length == 0)
- {
- return (NULL);
- }
+ return NULL;
search_name = psymtab_search_name (name);
cleanup = make_cleanup (xfree, search_name);
SYMBOL_DOMAIN (*top), domain))
{
do_cleanups (cleanup);
- return (*top);
+ return *top;
}
top++;
}
&& 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.
return pst->compunit_symtab;
}
-/* Psymtab version of relocate. See its definition in
- the definition of quick_symbol_functions in symfile.h. */
+/* Psymtab version of relocate. See its definition in
+ the definition of quick_symbol_functions in symfile.h. */
static void
psym_relocate (struct objfile *objfile,
}
}
-/* Psymtab version of find_last_source_symtab. See its definition in
- the definition of quick_symbol_functions in symfile.h. */
+/* Psymtab version of find_last_source_symtab. See its definition in
+ the definition of quick_symbol_functions in symfile.h. */
static struct symtab *
psym_find_last_source_symtab (struct objfile *ofp)
{
struct partial_symtab *ps;
- struct partial_symtab *cs_pst = 0;
+ struct partial_symtab *cs_pst = NULL;
ALL_OBJFILE_PSYMTABS_REQUIRED (ofp, ps)
{
return NULL;
}
-/* Psymtab version of forget_cached_source_info. See its definition in
- the definition of quick_symbol_functions in symfile.h. */
+/* Psymtab version of forget_cached_source_info. See its definition in
+ the definition of quick_symbol_functions in symfile.h. */
static void
psym_forget_cached_source_info (struct objfile *objfile)
fprintf_filtered (outfile, ")\n");
}
- fprintf_filtered (outfile, " Relocate symbols by ");
- for (i = 0; i < 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, "-");
fprintf_filtered (outfile, "\n");
}
-/* Psymtab version of print_stats. See its definition in
- the definition of quick_symbol_functions in symfile.h. */
+/* Psymtab version of print_stats. See its definition in
+ the definition of quick_symbol_functions in symfile.h. */
static void
psym_print_stats (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. */
+/* Psymtab version of dump. See its definition in
+ the definition of quick_symbol_functions in symfile.h. */
static void
psym_dump (struct objfile *objfile)
}
}
-/* Psymtab version of expand_symtabs_for_function. See its definition in
- the definition of quick_symbol_functions in symfile.h. */
+/* Psymtab version of expand_symtabs_for_function. See its definition in
+ the definition of quick_symbol_functions in symfile.h. */
static void
psym_expand_symtabs_for_function (struct objfile *objfile,
}
}
-/* Psymtab version of expand_all_symtabs. See its definition in
- the definition of quick_symbol_functions in symfile.h. */
+/* Psymtab version of expand_all_symtabs. See its definition in
+ the definition of quick_symbol_functions in symfile.h. */
static void
psym_expand_all_symtabs (struct objfile *objfile)
}
}
-/* Psymtab version of expand_symtabs_with_fullname. See its definition in
- the definition of quick_symbol_functions in symfile.h. */
+/* Psymtab version of expand_symtabs_with_fullname. See its definition in
+ the definition of quick_symbol_functions in symfile.h. */
static void
psym_expand_symtabs_with_fullname (struct objfile *objfile,
}
}
-/* Psymtab version of map_symbol_filenames. See its definition in
- the definition of quick_symbol_functions in symfile.h. */
+/* Psymtab version of map_symbol_filenames. See its definition in
+ the definition of quick_symbol_functions in symfile.h. */
static void
psym_map_symbol_filenames (struct objfile *objfile,
ps->fullname = xstrdup (fullname);
do_cleanups (back_to);
}
- }
+ }
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. */
+/* 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,
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),
+ if (symbol_matches_domain (SYMBOL_LANGUAGE (sym),
SYMBOL_DOMAIN (sym), domain))
{
if (callback (block, sym, data))
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
psym_map_matching_symbols (struct objfile *objfile,
return;
}
}
-}
+}
/* A helper for psym_expand_symtabs_matching that handles
searching included psymtabs. This returns 1 if a symbol is found,
struct partial_symbol **psym;
struct partial_symbol **bound, **gbound, **sbound;
int keep_going = 1;
- int result = PST_SEARCHED_AND_NOT_FOUND;
+ enum psymtab_search_status result = PST_SEARCHED_AND_NOT_FOUND;
int i;
if (ps->searched_flag != PST_NOT_SEARCHED)
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. */
+/* Psymtab version of expand_symtabs_matching. See its definition in
+ the definition of quick_symbol_functions in symfile.h. */
static void
psym_expand_symtabs_matching
ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, ps)
{
+ QUIT;
+
if (ps->readin)
continue;
}
}
-/* Psymtab version of has_symbols. See its definition in
- the definition of quick_symbol_functions in symfile.h. */
+/* Psymtab version of has_symbols. See its definition in
+ the definition of quick_symbol_functions in symfile.h. */
static int
psym_has_symbols (struct objfile *objfile)
SYMBOL_SEARCH_NAME (*s2));
}
-void
+static void
sort_pst_symbols (struct objfile *objfile, struct partial_symtab *pst)
{
/* Sort the global list; don't sort the static list. */
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)
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
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)
{
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
add_psymbol_to_bcache (const char *name, int namelength, int copy_name,
domain_enum domain,
enum address_class theclass,
- long val, /* Value as a long */
- CORE_ADDR coreaddr, /* Value as a CORE_ADDR */
+ CORE_ADDR coreaddr,
enum language language, struct objfile *objfile,
int *added)
{
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_VALUE_ADDRESS (&psymbol) = coreaddr;
SYMBOL_SECTION (&psymbol) = -1;
SYMBOL_SET_LANGUAGE (&psymbol, language, &objfile->objfile_obstack);
PSYMBOL_DOMAIN (&psymbol) = domain;
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
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
{
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,
/* 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. */
void
add_psymbol_to_list (const char *name, int namelength, int copy_name,
domain_enum domain,
enum address_class theclass,
- struct psymbol_allocation_list *list,
- long val, /* Value as a long */
- CORE_ADDR coreaddr, /* Value as a CORE_ADDR */
+ struct psymbol_allocation_list *list,
+ CORE_ADDR coreaddr,
enum language language, struct objfile *objfile)
{
const struct partial_symbol *psym;
/* Stash the partial symbol away in the cache. */
psym = add_psymbol_to_bcache (name, namelength, copy_name, domain, theclass,
- val, coreaddr, language, objfile, &added);
+ coreaddr, language, objfile, &added);
/* Do not duplicate global partial symbols. */
if (list == &objfile->global_psymbols
/* 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
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);
}
}
host_address_to_string (psymtab), filename);
}
- return (psymtab);
+ return psymtab;
}
void
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);
}
/* List all the partial symbol tables whose names match REGEXP (optional). */
+
static void
maintenance_info_psymtabs (char *regexp, int from_tty)
{
{
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",
/* 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");