/* Partial symbol tables.
-
- Copyright (C) 2009-2014 Free Software Foundation, Inc.
+
+ Copyright (C) 2009-2018 Free Software Foundation, Inc.
This file is part of GDB.
#include "language.h"
#include "cp-support.h"
#include "gdbcmd.h"
-
-#ifndef DEV_TTY
-#define DEV_TTY "/dev/tty"
-#endif
+#include <algorithm>
+#include <set>
struct psymbol_bcache
{
struct partial_symtab *,
int,
const char *, domain_enum,
- symbol_compare_ftype *,
+ symbol_name_match_type,
symbol_compare_ftype *);
static struct partial_symbol *lookup_partial_symbol (struct objfile *,
gdb_flush (gdb_stdout);
}
(*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))
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
+static bool
partial_map_expand_apply (struct objfile *objfile,
const char *name,
const char *real_path,
struct partial_symtab *pst,
- int (*callback) (struct symtab *, void *),
- void *data)
+ gdb::function_view<bool (symtab *)> callback)
{
struct compunit_symtab *last_made = objfile->compunit_symtabs;
all of them. */
psymtab_to_symtab (objfile, pst);
- return iterate_over_some_symtabs (name, real_path, callback, data,
- objfile->compunit_symtabs, last_made);
+ return iterate_over_some_symtabs (name, real_path, objfile->compunit_symtabs,
+ last_made, callback);
}
-/* 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 *real_path,
- int (*callback) (struct symtab *,
- void *),
- void *data)
+static bool
+psym_map_symtabs_matching_filename
+ (struct objfile *objfile,
+ const char *name,
+ const char *real_path,
+ gdb::function_view<bool (symtab *)> callback)
{
struct partial_symtab *pst;
const char *name_basename = lbasename (name);
if (compare_filenames_for_search (pst->filename, name))
{
if (partial_map_expand_apply (objfile, name, real_path,
- pst, callback, data))
- return 1;
+ 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, data))
- return 1;
+ pst, callback))
+ return true;
continue;
}
if (filename_cmp (psymtab_to_fullname (pst), real_path) == 0)
{
if (partial_map_expand_apply (objfile, name, real_path,
- pst, callback, data))
- return 1;
+ pst, callback))
+ return true;
continue;
}
}
}
- return 0;
+ return false;
}
/* Find which partial symtab contains PC and SECTION starting at psymtab PST.
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,
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.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. */
+
static struct compunit_symtab *
-find_pc_sect_compunit_symtab_from_partial (struct objfile *objfile,
- struct bound_minimal_symbol msymbol,
- CORE_ADDR pc,
- struct obj_section *section,
- int warn_if_readin)
+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
}
/* 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,
struct partial_symtab *psymtab, CORE_ADDR pc,
struct obj_section *section)
{
- struct partial_symbol *best = NULL, *p, **pp;
+ struct partial_symbol *best = NULL;
CORE_ADDR best_pc;
gdb_assert (psymtab != NULL);
/* 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 = objfile->global_psymbols.list + psymtab->globals_offset;
- (pp - (objfile->global_psymbols.list + psymtab->globals_offset)
- < psymtab->n_global_syms);
- pp++)
+ for (int i = 0; i < psymtab->n_global_syms; i++)
{
- p = *pp;
+ partial_symbol *p = objfile->global_psymbols[psymtab->globals_offset + i];
+
if (SYMBOL_DOMAIN (p) == VAR_DOMAIN
&& PSYMBOL_CLASS (p) == LOC_BLOCK
&& pc >= SYMBOL_VALUE_ADDRESS (p)
|| (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++)
+ for (int i = 0; i < psymtab->n_static_syms; i++)
{
- p = *pp;
+ partial_symbol *p = objfile->static_psymbols[psymtab->statics_offset + i];
+
if (SYMBOL_DOMAIN (p) == VAR_DOMAIN
&& PSYMBOL_CLASS (p) == LOC_BLOCK
&& pc >= SYMBOL_VALUE_ADDRESS (p)
|| (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. */
+
static struct compunit_symtab *
-lookup_symbol_aux_psymtabs (struct objfile *objfile,
- int block_index, const char *name,
- const domain_enum domain)
+psym_lookup_symbol (struct objfile *objfile,
+ int block_index, const char *name,
+ const domain_enum domain)
{
struct partial_symtab *ps;
const int psymtab_index = (block_index == GLOBAL_BLOCK ? 1 : 0);
struct compunit_symtab *stab_best = NULL;
+ lookup_name_info lookup_name (name, symbol_name_match_type::FULL);
+
ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, ps)
{
if (!ps->readin && lookup_partial_symbol (objfile, ps, name,
psymtab_index, domain))
{
- struct symbol *sym = 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
+ && 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;
}
+/* Returns true if PSYM matches LOOKUP_NAME. */
+
+static bool
+psymbol_name_matches (partial_symbol *psym,
+ const lookup_name_info &lookup_name)
+{
+ const language_defn *lang = language_def (SYMBOL_LANGUAGE (psym));
+ symbol_name_matcher_ftype *name_match
+ = get_symbol_name_matcher (lang, lookup_name);
+ return name_match (SYMBOL_SEARCH_NAME (psym), lookup_name, NULL);
+}
+
/* Look in PST for a symbol in DOMAIN whose name matches NAME. Search
the global block of PST if GLOBAL, and otherwise the static block.
MATCH is the comparison operation that returns true iff MATCH (s,
match_partial_symbol (struct objfile *objfile,
struct partial_symtab *pst, int global,
const char *name, domain_enum domain,
- symbol_compare_ftype *match,
+ symbol_name_match_type match_type,
symbol_compare_ftype *ordered_compare)
{
struct partial_symbol **start, **psym;
int do_linear_search = 1;
if (length == 0)
- return NULL;
+ return NULL;
+
+ lookup_name_info lookup_name (name, match_type);
+
start = (global ?
- objfile->global_psymbols.list + pst->globals_offset :
- objfile->static_psymbols.list + pst->statics_offset);
+ &objfile->global_psymbols[pst->globals_offset] :
+ &objfile->static_psymbols[pst->statics_offset]);
if (global && ordered_compare) /* Can use a binary search. */
{
{
center = bottom + (top - bottom) / 2;
gdb_assert (center < top);
- if (!do_linear_search
- && (SYMBOL_LANGUAGE (*center) == language_java))
- do_linear_search = 1;
- if (ordered_compare (SYMBOL_SEARCH_NAME (*center), name) >= 0)
+
+ enum language lang = SYMBOL_LANGUAGE (*center);
+ const char *lang_ln
+ = lookup_name.language_lookup_name (lang).c_str ();
+
+ if (ordered_compare (SYMBOL_SEARCH_NAME (*center), lang_ln) >= 0)
top = center;
else
bottom = center + 1;
gdb_assert (top == bottom);
while (top <= real_top
- && match (SYMBOL_SEARCH_NAME (*top), name) == 0)
+ && psymbol_name_matches (*top, lookup_name))
{
if (symbol_matches_domain (SYMBOL_LANGUAGE (*top),
SYMBOL_DOMAIN (*top), domain))
{
if (symbol_matches_domain (SYMBOL_LANGUAGE (*psym),
SYMBOL_DOMAIN (*psym), domain)
- && match (SYMBOL_SEARCH_NAME (*psym), name) == 0)
+ && psymbol_name_matches (*psym, lookup_name))
return *psym;
}
}
not contain any method/function instance information (since this would
force reading type information while reading psymtabs). Therefore,
if NAME contains overload information, it must be stripped before searching
- psymtabs.
-
- The caller is responsible for freeing the return result. */
+ psymtabs. */
-static char *
+static gdb::unique_xmalloc_ptr<char>
psymtab_search_name (const char *name)
{
switch (current_language->la_language)
{
case language_cplus:
- case language_java:
{
if (strchr (name, '('))
{
- char *ret = cp_remove_params (name);
+ gdb::unique_xmalloc_ptr<char> ret = cp_remove_params (name);
if (ret)
return ret;
break;
}
- return xstrdup (name);
+ return gdb::unique_xmalloc_ptr<char> (xstrdup (name));
}
/* Look, in partial_symtab PST, for symbol whose natural name is NAME.
struct partial_symbol **top, **real_top, **bottom, **center;
int length = (global ? pst->n_global_syms : pst->n_static_syms);
int do_linear_search = 1;
- char *search_name;
- struct cleanup *cleanup;
if (length == 0)
- {
- return (NULL);
- }
+ return NULL;
+
+ gdb::unique_xmalloc_ptr<char> search_name = psymtab_search_name (name);
+
+ lookup_name_info lookup_name (search_name.get (), symbol_name_match_type::FULL);
- search_name = psymtab_search_name (name);
- cleanup = make_cleanup (xfree, search_name);
start = (global ?
- objfile->global_psymbols.list + pst->globals_offset :
- objfile->static_psymbols.list + pst->statics_offset);
+ &objfile->global_psymbols[pst->globals_offset] :
+ &objfile->static_psymbols[pst->statics_offset]);
if (global) /* This means we can use a binary search. */
{
if (!(center < top))
internal_error (__FILE__, __LINE__,
_("failed internal consistency check"));
- if (!do_linear_search
- && SYMBOL_LANGUAGE (*center) == language_java)
- {
- do_linear_search = 1;
- }
if (strcmp_iw_ordered (SYMBOL_SEARCH_NAME (*center),
- search_name) >= 0)
+ search_name.get ()) >= 0)
{
top = center;
}
/* 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, search_name))
+ while (top >= start && SYMBOL_MATCHES_SEARCH_NAME (*top, lookup_name))
top--;
/* Fixup to have a symbol which matches SYMBOL_MATCHES_SEARCH_NAME. */
top++;
- while (top <= real_top && SYMBOL_MATCHES_SEARCH_NAME (*top, search_name))
+ while (top <= real_top && SYMBOL_MATCHES_SEARCH_NAME (*top, lookup_name))
{
if (symbol_matches_domain (SYMBOL_LANGUAGE (*top),
SYMBOL_DOMAIN (*top), domain))
- {
- do_cleanups (cleanup);
- return (*top);
- }
+ return *top;
top++;
}
}
{
if (symbol_matches_domain (SYMBOL_LANGUAGE (*psym),
SYMBOL_DOMAIN (*psym), domain)
- && SYMBOL_MATCHES_SEARCH_NAME (*psym, search_name))
- {
- do_cleanups (cleanup);
- return (*psym);
- }
+ && SYMBOL_MATCHES_SEARCH_NAME (*psym, lookup_name))
+ return *psym;
}
}
- do_cleanups (cleanup);
- return (NULL);
+ return NULL;
}
/* Get the symbol table that corresponds to a partial_symtab.
/* If it has not yet been read in, read it. */
if (!pst->readin)
{
- struct cleanup *back_to = increment_reading_symtab ();
+ scoped_restore decrementer = increment_reading_symtab ();
(*pst->read_symtab) (pst, objfile);
- do_cleanups (back_to);
}
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,
- const struct section_offsets *new_offsets,
- const 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;
ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, p)
p->texthigh += ANOFFSET (delta, SECT_OFF_TEXT (objfile));
}
- for (psym = objfile->global_psymbols.list;
- psym < objfile->global_psymbols.next;
- psym++)
+ for (partial_symbol *psym : objfile->global_psymbols)
{
- fixup_psymbol_section (*psym, objfile);
- if (SYMBOL_SECTION (*psym) >= 0)
- SYMBOL_VALUE_ADDRESS (*psym) += ANOFFSET (delta,
- SYMBOL_SECTION (*psym));
+ fixup_psymbol_section (psym, objfile);
+ if (SYMBOL_SECTION (psym) >= 0)
+ SYMBOL_VALUE_ADDRESS (psym) += ANOFFSET (delta, SYMBOL_SECTION (psym));
}
- for (psym = objfile->static_psymbols.list;
- psym < objfile->static_psymbols.next;
- psym++)
+ for (partial_symbol *psym : objfile->static_psymbols)
{
- fixup_psymbol_section (*psym, objfile);
- if (SYMBOL_SECTION (*psym) >= 0)
- SYMBOL_VALUE_ADDRESS (*psym) += ANOFFSET (delta,
- SYMBOL_SECTION (*psym));
+ fixup_psymbol_section (psym, objfile);
+ if (SYMBOL_SECTION (psym) >= 0)
+ SYMBOL_VALUE_ADDRESS (psym) += ANOFFSET (delta, SYMBOL_SECTION (psym));
}
+
+ objfile->psymbol_map.clear ();
}
+/* Psymtab version of find_last_source_symtab. See its definition in
+ the definition of quick_symbol_functions in symfile.h. */
+
static struct symtab *
-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)
{
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;
static void
print_partial_symbols (struct gdbarch *gdbarch,
- struct partial_symbol **p, int count, char *what,
+ struct partial_symbol **p, int count, const char *what,
struct ui_file *outfile)
{
fprintf_filtered (outfile, " %s partial symbols:\n", what);
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, "-");
if (psymtab->n_global_syms > 0)
{
print_partial_symbols (gdbarch,
- objfile->global_psymbols.list
- + psymtab->globals_offset,
+ &objfile->global_psymbols[psymtab->globals_offset],
psymtab->n_global_syms, "Global", outfile);
}
if (psymtab->n_static_syms > 0)
{
print_partial_symbols (gdbarch,
- objfile->static_psymbols.list
- + psymtab->statics_offset,
+ &objfile->static_psymbols[psymtab->statics_offset],
psymtab->n_static_syms, "Static", outfile);
}
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;
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;
}
}
-/* 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;
}
}
+/* 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;
}
}
+/* 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_fullname (struct objfile *objfile, const char *fullname)
+psym_expand_symtabs_with_fullname (struct objfile *objfile,
+ const char *fullname)
{
struct partial_symtab *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;
to handle cases like the file being moved. */
if (ps->fullname == NULL)
{
- int fd = find_and_open_source (ps->filename, ps->dirname, &ps->fullname);
+ gdb::unique_xmalloc_ptr<char> fullname;
+ int fd = find_and_open_source (ps->filename, ps->dirname, &fullname);
+ ps->fullname = fullname.release ();
if (fd >= 0)
close (fd);
else
{
- char *fullname;
- struct cleanup *back_to;
-
/* rewrite_source_path would be applied by find_and_open_source, we
should report the pathname where GDB tried to find the file. */
if (ps->dirname == NULL || IS_ABSOLUTE_PATH (ps->filename))
- fullname = xstrdup (ps->filename);
+ fullname.reset (xstrdup (ps->filename));
else
- fullname = concat (ps->dirname, SLASH_STRING, ps->filename, NULL);
+ fullname.reset (concat (ps->dirname, SLASH_STRING,
+ ps->filename, (char *) NULL));
- back_to = make_cleanup (xfree, fullname);
- ps->fullname = rewrite_source_path (fullname);
+ ps->fullname = rewrite_source_path (fullname.get ()).release ();
if (ps->fullname == NULL)
- ps->fullname = xstrdup (fullname);
- do_cleanups (back_to);
+ ps->fullname = fullname.release ();
}
- }
+ }
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)
+ void *data, symbol_name_match_type match)
{
struct block_iterator iter;
struct symbol *sym;
- for (sym = block_iter_match_first (block, name, match, &iter);
- sym != NULL; sym = block_iter_match_next (name, match, &iter))
+ 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), namespace))
+ 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. */
+/* 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 (struct objfile *objfile,
- const char *name, domain_enum namespace,
- 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_name_match_type match,
+ symbol_compare_ftype *ordered_compare)
{
const int block_kind = global ? GLOBAL_BLOCK : STATIC_BLOCK;
struct partial_symtab *ps;
{
QUIT;
if (ps->readin
- || match_partial_symbol (objfile, ps, global, name, namespace, match,
+ || match_partial_symbol (objfile, ps, global, name, domain, match,
ordered_compare))
{
struct compunit_symtab *cust = psymtab_to_symtab (objfile, ps);
if (cust == NULL)
continue;
block = BLOCKVECTOR_BLOCK (COMPUNIT_BLOCKVECTOR (cust), block_kind);
- if (map_block (name, namespace, objfile, block,
+ if (map_block (name, domain, objfile, block,
callback, data, match))
return;
if (callback (block, NULL, data))
return;
}
}
-}
+}
-/* A helper for expand_symtabs_matching_via_partial that handles
- searching included psymtabs. This returns 1 if a symbol is found,
- and zero otherwise. It also updates the 'searched_flag' on the
+/* A helper for psym_expand_symtabs_matching that handles searching
+ included psymtabs. This returns true if a symbol is found, and
+ false 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)
+static bool
+recursively_search_psymtabs
+ (struct partial_symtab *ps, struct objfile *objfile, enum search_domain domain,
+ const lookup_name_info &lookup_name,
+ gdb::function_view<expand_symtabs_symbol_matcher_ftype> sym_matcher)
{
- 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)
continue;
r = recursively_search_psymtabs (ps->dependencies[i],
- objfile, kind, sym_matcher, data);
+ objfile, domain, lookup_name,
+ sym_matcher);
if (r != 0)
{
ps->searched_flag = PST_SEARCHED_AND_FOUND;
- return 1;
+ return true;
}
}
- 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;
+ partial_symbol **gbound
+ = objfile->global_psymbols.data () + ps->globals_offset + ps->n_global_syms;
+ partial_symbol **sbound
+ = objfile->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. */
- psym = objfile->global_psymbols.list + ps->globals_offset;
+ partial_symbol **psym = objfile->global_psymbols.data () + 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;
+ psym = objfile->static_psymbols.data () + ps->statics_offset;
bound = sbound;
}
else
{
QUIT;
- if ((kind == ALL_DOMAIN
- || (kind == VARIABLES_DOMAIN
+ if ((domain == ALL_DOMAIN
+ || (domain == VARIABLES_DOMAIN
&& PSYMBOL_CLASS (*psym) != LOC_TYPEDEF
&& PSYMBOL_CLASS (*psym) != LOC_BLOCK)
- || (kind == FUNCTIONS_DOMAIN
+ || (domain == FUNCTIONS_DOMAIN
&& PSYMBOL_CLASS (*psym) == LOC_BLOCK)
- || (kind == TYPES_DOMAIN
+ || (domain == TYPES_DOMAIN
&& PSYMBOL_CLASS (*psym) == LOC_TYPEDEF))
- && (*sym_matcher) (SYMBOL_SEARCH_NAME (*psym), data))
+ && psymbol_name_matches (*psym, lookup_name)
+ && (sym_matcher == NULL || sym_matcher (SYMBOL_SEARCH_NAME (*psym))))
{
/* Found a match, so notify our caller. */
result = PST_SEARCHED_AND_FOUND;
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,
- expand_symtabs_file_matcher_ftype *file_matcher,
- expand_symtabs_symbol_matcher_ftype *symbol_matcher,
- enum search_domain kind,
- void *data)
+ gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
+ const lookup_name_info &lookup_name_in,
+ gdb::function_view<expand_symtabs_symbol_matcher_ftype> symbol_matcher,
+ gdb::function_view<expand_symtabs_exp_notify_ftype> 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)
{
ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, ps)
{
+ QUIT;
+
if (ps->readin)
continue;
if (file_matcher)
{
- int match;
+ bool match;
if (ps->anonymous)
continue;
- match = (*file_matcher) (ps->filename, data, 0);
+ match = file_matcher (ps->filename, false);
if (!match)
{
/* 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);
+ || file_matcher (lbasename (ps->filename), true))
+ match = file_matcher (psymtab_to_fullname (ps), false);
}
if (!match)
continue;
}
- if (recursively_search_psymtabs (ps, objfile, kind, symbol_matcher, data))
- psymtab_to_symtab (objfile, ps);
+ if (recursively_search_psymtabs (ps, objfile, domain,
+ lookup_name, symbol_matcher))
+ {
+ struct compunit_symtab *symtab =
+ psymtab_to_symtab (objfile, ps);
+
+ if (expansion_notify != NULL)
+ expansion_notify (symtab);
+ }
}
}
+/* 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 =
+/* Helper function for psym_find_compunit_symtab_by_address that fills
+ in psymbol_map for a given range of psymbols. */
+
+static void
+psym_fill_psymbol_map (struct objfile *objfile,
+ struct partial_symtab *psymtab,
+ std::set<CORE_ADDR> *seen_addrs,
+ const std::vector<partial_symbol *> &symbols,
+ int start,
+ int length)
{
- objfile_has_psyms,
- find_last_source_symtab_from_partial,
- forget_cached_source_info_partial,
- partial_map_symtabs_matching_filename,
- lookup_symbol_aux_psymtabs,
- print_psymtab_stats_for_objfile,
- dump_psymtabs_for_objfile,
- relocate_psymtabs,
- read_symtabs_for_function,
- expand_partial_symbol_tables,
- read_psymtabs_with_fullname,
- map_matching_symbols_psymtab,
- expand_symtabs_matching_via_partial,
- find_pc_sect_compunit_symtab_from_partial,
- map_symbol_filenames_psymtab
-};
+ for (int i = 0; i < length; ++i)
+ {
+ struct partial_symbol *psym = symbols[start + i];
-\f
+ if (PSYMBOL_CLASS (psym) == LOC_STATIC)
+ {
+ CORE_ADDR addr = SYMBOL_VALUE_ADDRESS (psym);
+ if (seen_addrs->find (addr) == seen_addrs->end ())
+ {
+ seen_addrs->insert (addr);
+ objfile->psymbol_map.emplace_back (addr, psymtab);
+ }
+ }
+ }
+}
-/* This compares two partial symbols by names, using strcmp_iw_ordered
- for the comparison. */
+/* See find_compunit_symtab_by_address in quick_symbol_functions, in
+ symfile.h. */
-static int
-compare_psymbols (const void *s1p, const void *s2p)
+static compunit_symtab *
+psym_find_compunit_symtab_by_address (struct objfile *objfile,
+ CORE_ADDR address)
{
- struct partial_symbol *const *s1 = s1p;
- struct partial_symbol *const *s2 = s2p;
+ if (objfile->psymbol_map.empty ())
+ {
+ struct partial_symtab *pst;
+
+ std::set<CORE_ADDR> 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);
+ }
- return strcmp_iw_ordered (SYMBOL_SEARCH_NAME (*s1),
- SYMBOL_SEARCH_NAME (*s2));
+ objfile->psymbol_map.shrink_to_fit ();
+
+ std::sort (objfile->psymbol_map.begin (), objfile->psymbol_map.end (),
+ [] (const std::pair<CORE_ADDR, partial_symtab *> &a,
+ const std::pair<CORE_ADDR, partial_symtab *> &b)
+ {
+ return a.first < b.first;
+ });
+ }
+
+ auto iter = std::lower_bound
+ (objfile->psymbol_map.begin (), objfile->psymbol_map.end (), address,
+ [] (const std::pair<CORE_ADDR, partial_symtab *> &a,
+ CORE_ADDR b)
+ {
+ return a.first < b;
+ });
+
+ if (iter == objfile->psymbol_map.end () || iter->first != address)
+ return NULL;
+
+ return psymtab_to_symtab (objfile, iter->second);
}
-void
+const struct quick_symbol_functions psym_functions =
+{
+ 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_find_compunit_symtab_by_address,
+ psym_map_symbol_filenames
+};
+
+\f
+
+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 ();
+ std::advance (begin, pst->globals_offset);
- qsort (objfile->global_psymbols.list + pst->globals_offset,
- pst->n_global_syms, sizeof (struct partial_symbol *),
- compare_psymbols);
+ /* The psymbols for this partial_symtab are currently at the end of the
+ vector. */
+ auto end = objfile->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;
+ });
}
/* Allocate and partially fill a partial symtab. It will be
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)
+ CORE_ADDR textlow,
+ std::vector<partial_symbol *> &global_psymbols,
+ std::vector<partial_symbol *> &static_psymbols)
{
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);
+ psymtab->globals_offset = global_psymbols.size ();
+ psymtab->statics_offset = static_psymbols.size ();
+ 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.size () - pst->globals_offset;
+ pst->n_static_syms = objfile->static_psymbols.size () - pst->statics_offset;
+
+ sort_pst_symbols (objfile, pst);
}
/* Calculate a hash code for the given partial symbol. The hash is
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 (psymbol->ginfo.name, strlen (psymbol->ginfo.name), 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->ginfo.name, sizeof (psymbol->ginfo.name), h);
return h;
}
struct partial_symbol *sym1 = (struct partial_symbol *) addr1;
struct partial_symbol *sym2 = (struct partial_symbol *) addr2;
- return (memcmp (&sym1->ginfo.value, &sym1->ginfo.value,
+ return (memcmp (&sym1->ginfo.value, &sym2->ginfo.value,
sizeof (sym1->ginfo.value)) == 0
&& sym1->ginfo.language == sym2->ginfo.language
&& PSYMBOL_DOMAIN (sym1) == PSYMBOL_DOMAIN (sym2)
&& PSYMBOL_CLASS (sym1) == PSYMBOL_CLASS (sym2)
+ /* Note that psymbol names are interned via
+ symbol_set_names, so there's no need to compare the
+ contents of the name here. */
&& sym1->ginfo.name == sym2->ginfo.name);
}
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)
{
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 const struct partial_symbol *
+static struct partial_symbol *
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 ((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
different domain (or address) is possible and correct. */
-static const struct partial_symbol *
+static 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)
{
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;
- 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
- global_psymbols or static_psymbols. This space will eventually
- be freed in free_objfile(). */
+/* Helper function, adds partial symbol to the given partial symbol list. */
static void
-extend_psymbol_list (struct psymbol_allocation_list *listp,
- struct objfile *objfile)
-{
- int new_size;
-
- if (listp->size == 0)
- {
- new_size = 255;
- listp->list = (struct partial_symbol **)
- xmalloc (new_size * sizeof (struct partial_symbol *));
- }
- else
- {
- new_size = listp->size * 2;
- listp->list = (struct partial_symbol **)
- xrealloc ((char *) listp->list,
- new_size * sizeof (struct partial_symbol *));
- }
- /* Next assumes we only went one over. Should be good if
- program works correctly. */
- listp->next = listp->list + listp->size;
- listp->size = new_size;
-}
-
-/* Helper function, adds partial symbol to the given partial symbol
- list. */
-
-static void
-append_psymbol_to_list (struct psymbol_allocation_list *list,
- const struct partial_symbol *psym,
+append_psymbol_to_list (std::vector<partial_symbol *> *list,
+ struct partial_symbol *psym,
struct objfile *objfile)
{
- if (list->next >= list->list + list->size)
- extend_psymbol_list (list, objfile);
- *list->next++ = (struct partial_symbol *) psym;
+ list->push_back (psym);
OBJSTAT (objfile, n_psyms++);
}
/* Add a symbol with a long value to a psymtab.
Since one arg is a struct, we pass in a ptr and deref it (sigh).
+ The only value we need to store for psyms is an address.
+ For all other psyms pass zero for COREADDR.
Return the partial symbol that has been added. */
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,
+ std::vector<partial_symbol *> *list,
+ CORE_ADDR coreaddr,
enum language language, struct objfile *objfile)
{
- const struct partial_symbol *psym;
+ struct partial_symbol *psym;
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
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);
- }
- if (objfile->static_psymbols.list)
- {
- xfree (objfile->static_psymbols.list);
- }
+ 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.size = total_symbols / 10;
- objfile->static_psymbols.size = total_symbols / 10;
-
- 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 *)));
- }
- 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->global_psymbols.reserve (total_symbols / 10);
+ objfile->static_psymbols.reserve (total_symbols / 10);
}
struct partial_symtab *
objfile->free_psymtabs = psymtab->next;
}
else
- psymtab = (struct partial_symtab *)
- obstack_alloc (&objfile->objfile_obstack,
- sizeof (struct partial_symtab));
+ psymtab = XOBNEW (&objfile->objfile_obstack, partial_symtab);
memset (psymtab, 0, sizeof (struct partial_symtab));
- psymtab->filename = bcache (filename, strlen (filename) + 1,
- objfile->per_bfd->filename_cache);
+ 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.
host_address_to_string (psymtab), filename);
}
- return (psymtab);
+ return psymtab;
}
void
objfile->free_psymtabs = pst;
}
-/* An object of this type is passed to discard_psymtabs_upto. */
+\f
-struct psymtab_state
-{
- /* The objfile where psymtabs are discarded. */
+/* 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;
- /* The first psymtab to save. */
-
- struct partial_symtab *save;
+ /* 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;
};
-/* A cleanup function used by make_cleanup_discard_psymtabs. */
+/* Helper function for dump_psymtab_addrmap to print an addrmap entry. */
-static void
-discard_psymtabs_upto (void *arg)
+static int
+dump_psymtab_addrmap_1 (void *datap, CORE_ADDR start_addr, void *obj)
{
- struct psymtab_state *state = arg;
+ 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 = "<ends here>";
+
+ 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);
- while (state->objfile->psymtabs != state->save)
- discard_psymtab (state->objfile, state->objfile->psymtabs);
+ return 0;
}
-/* Return a new cleanup that discards all psymtabs created in OBJFILE
- after this function is called. */
+/* Helper function for maintenance_print_psymbols to print the addrmap
+ of PSYMTAB. If PSYMTAB is NULL print the entire addrmap. */
-struct cleanup *
-make_cleanup_discard_psymtabs (struct objfile *objfile)
+static void
+dump_psymtab_addrmap (struct objfile *objfile, struct partial_symtab *psymtab,
+ struct ui_file *outfile)
{
- struct psymtab_state *state = XNEW (struct psymtab_state);
-
- state->objfile = objfile;
- state->save = objfile->psymtabs;
+ struct dump_psymtab_addrmap_data addrmap_dump_data;
- return make_cleanup_dtor (discard_psymtabs_upto, state, xfree);
+ if ((psymtab == NULL
+ || psymtab->psymtabs_addrmap_supported)
+ && objfile->psymtabs_addrmap != NULL)
+ {
+ 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);
+ }
}
-\f
-
static void
-maintenance_print_psymbols (char *args, int from_tty)
+maintenance_print_psymbols (const char *args, int from_tty)
{
- char **argv;
- struct ui_file *outfile;
- struct cleanup *cleanups;
- char *symname = NULL;
- char *filename = DEV_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;
dont_repeat ();
- if (args == NULL)
- {
- error (_("\
-print-psymbols takes an output file name and optional symbol file name"));
- }
- argv = gdb_buildargv (args);
- cleanups = make_cleanup_freeargv (argv);
+ gdb_argv argv (args);
- if (argv[0] != NULL)
+ for (i = 0; argv != NULL && argv[i] != NULL; ++i)
{
- filename = argv[0];
- /* If a second arg is supplied, it is a source file name to match on. */
- if (argv[1] != NULL)
+ if (strcmp (argv[i], "-pc") == 0)
+ {
+ if (argv[i + 1] == NULL)
+ error (_("Missing pc value"));
+ address_arg = argv[++i];
+ }
+ else if (strcmp (argv[i], "-source") == 0)
+ {
+ if (argv[i + 1] == NULL)
+ error (_("Missing source file"));
+ source_arg = argv[++i];
+ }
+ else if (strcmp (argv[i], "-objfile") == 0)
+ {
+ if (argv[i + 1] == NULL)
+ error (_("Missing objfile name"));
+ objfile_arg = argv[++i];
+ }
+ else if (strcmp (argv[i], "--") == 0)
{
- symname = argv[1];
+ /* End of options. */
+ ++i;
+ break;
+ }
+ else if (argv[i][0] == '-')
+ {
+ /* Future proofing: Don't allow OUTFILE to begin with "-". */
+ error (_("Unknown option: %s"), argv[i]);
}
+ else
+ break;
}
+ outfile_idx = i;
- filename = tilde_expand (filename);
- make_cleanup (xfree, filename);
+ if (address_arg != NULL && source_arg != NULL)
+ error (_("Must specify at most one of -pc and -source"));
- outfile = gdb_fopen (filename, FOPEN_WT);
- if (outfile == 0)
- perror_with_name (filename);
- make_cleanup_ui_file_delete (outfile);
+ stdio_file arg_outfile;
- ALL_PSYMTABS (objfile, ps)
+ if (argv != NULL && argv[outfile_idx] != NULL)
{
+ if (argv[outfile_idx + 1] != NULL)
+ error (_("Junk at end of command"));
+ gdb::unique_xmalloc_ptr<char> outfile_name
+ (tilde_expand (argv[outfile_idx]));
+ if (!arg_outfile.open (outfile_name.get (), FOPEN_WT))
+ perror_with_name (outfile_name.get ());
+ outfile = &arg_outfile;
+ }
+
+ if (address_arg != NULL)
+ {
+ pc = parse_and_eval_address (address_arg);
+ /* If we fail to find a section, that's ok, try the lookup anyway. */
+ section = find_pc_section (pc);
+ }
+
+ found = 0;
+ ALL_OBJFILES (objfile)
+ {
+ int printed_objfile_header = 0;
+ int print_for_objfile = 1;
+
QUIT;
- if (symname == NULL || filename_cmp (symname, ps->filename) == 0)
- dump_psymtab (objfile, ps, outfile);
+ if (objfile_arg != NULL)
+ print_for_objfile
+ = compare_filenames_for_search (objfile_name (objfile),
+ objfile_arg);
+ if (!print_for_objfile)
+ continue;
+
+ if (address_arg != NULL)
+ {
+ struct bound_minimal_symbol msymbol = { NULL, NULL };
+
+ /* We don't assume each pc has a unique objfile (this is for
+ debugging). */
+ ps = find_pc_sect_psymtab (objfile, pc, section, msymbol);
+ if (ps != NULL)
+ {
+ if (!printed_objfile_header)
+ {
+ outfile->printf ("\nPartial symtabs for objfile %s\n",
+ objfile_name (objfile));
+ printed_objfile_header = 1;
+ }
+ dump_psymtab (objfile, ps, outfile);
+ dump_psymtab_addrmap (objfile, ps, outfile);
+ found = 1;
+ }
+ }
+ else
+ {
+ ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, ps)
+ {
+ int print_for_source = 0;
+
+ QUIT;
+ if (source_arg != NULL)
+ {
+ print_for_source
+ = compare_filenames_for_search (ps->filename, source_arg);
+ found = 1;
+ }
+ if (source_arg == NULL
+ || print_for_source)
+ {
+ if (!printed_objfile_header)
+ {
+ outfile->printf ("\nPartial symtabs for objfile %s\n",
+ objfile_name (objfile));
+ printed_objfile_header = 1;
+ }
+ dump_psymtab (objfile, ps, outfile);
+ dump_psymtab_addrmap (objfile, ps, outfile);
+ }
+ }
+ }
+
+ /* If we're printing all the objfile's symbols dump the full addrmap. */
+
+ if (address_arg == NULL
+ && source_arg == NULL
+ && objfile->psymtabs_addrmap != NULL)
+ {
+ outfile->puts ("\n");
+ dump_psymtab_addrmap (objfile, NULL, outfile);
+ }
+ }
+
+ if (!found)
+ {
+ if (address_arg != NULL)
+ error (_("No partial symtab for address: %s"), address_arg);
+ if (source_arg != NULL)
+ error (_("No partial symtab for source file: %s"), source_arg);
}
- do_cleanups (cleanups);
}
/* List all the partial symbol tables whose names match REGEXP (optional). */
+
static void
-maintenance_info_psymtabs (char *regexp, int from_tty)
+maintenance_info_psymtabs (const char *regexp, int from_tty)
{
struct program_space *pspace;
struct objfile *objfile;
{
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",
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 (objfile->global_psymbols.list
- + psymtab->globals_offset),
+ host_address_to_string (p),
psymtab->n_global_syms);
}
else
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 (objfile->static_psymbols.list
- + psymtab->statics_offset),
+ host_address_to_string (p),
psymtab->n_static_syms);
}
else
/* 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");
/* Check consistency of currently expanded psymtabs vs symtabs. */
static void
-maintenance_check_psymtabs (char *ignore, int from_tty)
+maintenance_check_psymtabs (const char *ignore, int from_tty)
{
struct symbol *sym;
- struct partial_symbol **psym;
struct compunit_symtab *cust = NULL;
struct partial_symtab *ps;
const struct blockvector *bv;
continue;
bv = COMPUNIT_BLOCKVECTOR (cust);
b = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
- psym = objfile->static_psymbols.list + ps->statics_offset;
+ partial_symbol **psym = &objfile->static_psymbols[ps->statics_offset];
length = ps->n_static_syms;
while (length--)
{
- sym = block_lookup_symbol (b, SYMBOL_LINKAGE_NAME (*psym),
+ sym = block_lookup_symbol (b, SYMBOL_SEARCH_NAME (*psym),
+ symbol_name_match_type::SEARCH_NAME,
SYMBOL_DOMAIN (*psym));
if (!sym)
{
psym++;
}
b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
- psym = objfile->global_psymbols.list + ps->globals_offset;
+ psym = &objfile->global_psymbols[ps->globals_offset];
length = ps->n_global_syms;
while (length--)
{
- sym = block_lookup_symbol (b, SYMBOL_LINKAGE_NAME (*psym),
+ sym = block_lookup_symbol (b, SYMBOL_SEARCH_NAME (*psym),
+ symbol_name_match_type::SEARCH_NAME,
SYMBOL_DOMAIN (*psym));
if (!sym)
{
}
}
-\f
-
-extern initialize_file_ftype _initialize_psymtab;
-
void
_initialize_psymtab (void)
{
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."),
+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\
+If SOURCE is provided, dump only that file's symbols.\n\
+If OBJFILE is provided, dump only that file's minimal symbols."),
&maintenanceprintlist);
add_cmd ("psymtabs", class_maintenance, maintenance_info_psymtabs, _("\
projects / deliverable / binutils-gdb.git / blobdiff