b5ec771e60
Summary: - This is preparation for supporting wild name matching on C++ too. - This is also preparation for TAB-completion fixes. - Makes symbol name matching (think strcmp_iw) be based on a per-language method. - Merges completion and non-completion name comparison (think language_ops::la_get_symbol_name_cmp generalized). - Avoid re-hashing lookup name multiple times - Centralizes preparing a name for lookup (Ada name encoding / C++ Demangling), both completion and non-completion. - Fixes Ada latent bug with verbatim name matches in expressions - Makes ada-lang.c use common|symtab.c completion code a bit more. Ada's wild matching basically means that "(gdb) break foo" will find all methods named "foo" in all packages. Translating to C++, it's roughly the same as saying that "break klass::method" sets breakpoints on all "klass::method" methods of all classes, no matter the namespace. A following patch will teach GDB about fullname vs wild matching for C++ too. This patch is preparatory work to get there. Another idea here is to do symbol name matching based on the symbol language's algorithm. I.e., avoid dependency on current language set. This allows for example doing (gdb) b foo::bar< int > (<tab> and having gdb name match the C++ symbols correctly even if the current language is C or Assembly (or Rust, or Ada, or ...), which can easily happen if you step into an Assembly/C runtime library frame. By encapsulating all the information related to a lookup name in a class, we can also cache hash computation for a given language in the lookup name object, to avoid recomputing it over and over. Similarly, because we don't really know upfront which languages the lookup name will be matched against, for each language we store the lookup name transformed into a search name. E.g., for C++, that means demangling the name. But for Ada, it means encoding the name. This actually forces us to centralize all the different lookup name encoding in a central place, resulting in clearer code, IMO. See e.g., the new ada_lookup_name_info class. The lookup name -> symbol search name computation is also done only once per language. The old language->la_get_symbol_name_cmp / symbol_name_cmp_ftype are generalized to work with both completion, and normal symbol look up. At some point early on, I had separate completion vs non-completion language vector entry points, but a single method ends up being better IMO for simplifying things -- the more we merge the completion / non-completion name lookup code paths, the less changes for bugs causing completion vs normal lookup finding different symbols. The ada-lex.l change is necessary because when doing (gdb) p <UpperCase> then the name that is passed to write_ write_var_or_type -> ada_lookup_symbol_list misses the "<>", i.e., it's just "UpperCase", and we end up doing a wild match against "UpperCase" lowercased by ada_lookup_name_info's constructor. I.e., "uppercase" wouldn't ever match "UpperCase", and the symbol lookup fails. This wouldn't cause any regression in the testsuite, but I added a new test that would pass before the patch and fail after, if it weren't for that fix. This is latent bug that happens to go unnoticed because that particular path was inconsistent with the rest of Ada symbol lookup by not lowercasing the lookup name. Ada's symbol_completion_add is deleted, replaced by using common code's completion_list_add_name. To make the latter work for Ada, we needed to add a new output parameter, because Ada wants to return back a custom completion candidates that are not the symbol name. With this patch, minimal symbol demangled name hashing is made consistent with regular symbol hashing. I.e., it now goes via the language vector's search_name_hash method too, as I had suggested in a previous patch. dw2_expand_symtabs_matching / .gdb_index symbol names were a challenge. The problem is that we have no way to telling what is the language of each symbol name found in the index, until we expand the corresponding full symbol, which is off course what we're trying to avoid. Language information is simply not considered in the index format... Since the symbol name hashing and comparison routines are per-language, we now have a problem. The patch sorts this out by matching each name against all languages. This is inneficient, and indeed slows down completion several times. E.g., with: $ cat script.cmd set pagination off set $count = 0 while $count < 400 complete b string_prin printf "count = %d\n", $count set $count = $count + 1 end $ time gdb --batch -q ./gdb-with-index -ex "source script-string_printf.cmd" I get, before patch (-O2, x86-64): real 0m1.773s user 0m1.737s sys 0m0.040s While after patch (-O2, x86-64): real 0m9.843s user 0m9.482s sys 0m0.034s However, the following patch will optimize this, and will actually make this use case faster compared to the "before patch" above: real 0m1.321s user 0m1.285s sys 0m0.039s gdb/ChangeLog: 2017-11-08 Pedro Alves <palves@redhat.com> * ada-lang.c (ada_encode): Rename to .. (ada_encode_1): ... this. Add throw_errors parameter and handle it. (ada_encode): Reimplement. (match_name): Delete, folded into full_name. (resolve_subexp): No longer pass the encoded name to ada_lookup_symbol_list. (should_use_wild_match): Delete. (name_match_type_from_name): New. (ada_lookup_simple_minsym): Use lookup_name_info and the language's symbol_name_matcher_ftype. (add_symbols_from_enclosing_procs, ada_add_local_symbols) (ada_add_block_renamings): Adjust to use lookup_name_info. (ada_lookup_name): New. (add_nonlocal_symbols, ada_add_all_symbols) (ada_lookup_symbol_list_worker, ada_lookup_symbol_list) (ada_iterate_over_symbols): Adjust to use lookup_name_info. (ada_name_for_lookup): Delete. (ada_lookup_encoded_symbol): Construct a verbatim name. (wild_match): Reverse sense of return type. Use bool. (full_match): Reverse sense of return type. Inline bits of old match_name here. (ada_add_block_symbols): Adjust to use lookup_name_info. (symbol_completion_match): Delete, folded into... (ada_lookup_name_info::matches): ... .this new method. (symbol_completion_add): Delete. (ada_collect_symbol_completion_matches): Add name_match_type parameter. Adjust to use lookup_name_info and completion_list_add_name. (get_var_value, ada_add_global_exceptions): Adjust to use lookup_name_info. (ada_get_symbol_name_cmp): Delete. (do_wild_match, do_full_match): New functions. (ada_lookup_name_info::ada_lookup_name_info): New method. (ada_symbol_name_matches, ada_get_symbol_name_matcher): New functions. (ada_language_defn): Install ada_get_symbol_name_matcher. * ada-lex.l (processId): If name starts with '<', copy it verbatim. * block.c (block_iter_match_step, block_iter_match_first) (block_iter_match_next, block_lookup_symbol) (block_lookup_symbol_primary, block_find_symbol): Adjust to use lookup_name_info. * block.h (block_iter_match_first, block_iter_match_next) (ALL_BLOCK_SYMBOLS_WITH_NAME): Adjust to use lookup_name_info. * c-lang.c (c_language_defn, cplus_language_defn) (asm_language_defn, minimal_language_defn): Adjust comments to refer to la_get_symbol_name_matcher. * completer.c (complete_files_symbols) (collect_explicit_location_matches, symbol_completer): Pass a symbol_name_match_type down. * completer.h (class completion_match, completion_match_result): New classes. (completion_tracker::reset_completion_match_result): New method. (completion_tracker::m_completion_match_result): New field. * cp-support.c (make_symbol_overload_list_block): Adjust to use lookup_name_info. (cp_fq_symbol_name_matches, cp_get_symbol_name_matcher): New functions. * cp-support.h (cp_get_symbol_name_matcher): New declaration. * d-lang.c: Adjust comments to refer to la_get_symbol_name_matcher. * dictionary.c (dict_vector) <iter_match_first, iter_match_next>: Adjust to use lookup_name_info. (dict_iter_match_first, dict_iter_match_next) (iter_match_first_hashed, iter_match_next_hashed) (iter_match_first_linear, iter_match_next_linear): Adjust to work with a lookup_name_info. * dictionary.h (dict_iter_match_first, dict_iter_match_next): Likewise. * dwarf2read.c (dw2_lookup_symbol): Adjust to use lookup_name_info. (dw2_map_matching_symbols): Adjust to use symbol_name_match_type. (gdb_index_symbol_name_matcher): New class. (dw2_expand_symtabs_matching) Adjust to use lookup_name_info and gdb_index_symbol_name_matcher. Accept a NULL symbol_matcher. * f-lang.c (f_collect_symbol_completion_matches): Adjust to work with a symbol_name_match_type. (f_language_defn): Adjust comments to refer to la_get_symbol_name_matcher. * go-lang.c (go_language_defn): Adjust comments to refer to la_get_symbol_name_matcher. * language.c (default_symbol_name_matcher) (language_get_symbol_name_matcher): New functions. (unknown_language_defn, auto_language_defn): Adjust comments to refer to la_get_symbol_name_matcher. * language.h (symbol_name_cmp_ftype): Delete. (language_defn) <la_collect_symbol_completion_matches>: Add match type parameter. <la_get_symbol_name_cmp>: Delete field. <la_get_symbol_name_matcher>: New field. <la_iterate_over_symbols>: Adjust to use lookup_name_info. (default_symbol_name_matcher, language_get_symbol_name_matcher): Declare. * linespec.c (iterate_over_all_matching_symtabs) (iterate_over_file_blocks): Adjust to use lookup_name_info. (find_methods): Add language parameter, and use lookup_name_info and the language's symbol_name_matcher_ftype. (linespec_complete_function): Adjust. (lookup_prefix_sym): Use lookup_name_info. (add_all_symbol_names_from_pspace): Adjust. (find_superclass_methods): Add language parameter and pass it down. (find_method): Pass symbol language down. (find_linespec_symbols): Don't demangle or Ada encode here. (search_minsyms_for_name): Add lookup_name_info parameter. (add_matching_symbols_to_info): Add name_match_type parameter. Use lookup_name_info. * m2-lang.c (m2_language_defn): Adjust comments to refer to la_get_symbol_name_matcher. * minsyms.c: Include <algorithm>. (add_minsym_to_demangled_hash_table): Remove table parameter and add objfile parameter. Use search_name_hash, and add language to demangled languages vector. (struct found_minimal_symbols): New struct. (lookup_minimal_symbol_mangled, lookup_minimal_symbol_demangled): New functions. (lookup_minimal_symbol): Adjust to use them. Don't canonicalize input names here. Use lookup_name_info instead. Lookup up demangled names once for each language in the demangled names vector. (iterate_over_minimal_symbols): Use lookup_name_info. Lookup up demangled names once for each language in the demangled names vector. (build_minimal_symbol_hash_tables): Adjust. * minsyms.h (iterate_over_minimal_symbols): Adjust to pass down a lookup_name_info. * objc-lang.c (objc_language_defn): Adjust comment to refer to la_get_symbol_name_matcher. * objfiles.h: Include <vector>. (objfile_per_bfd_storage) <demangled_hash_languages>: New field. * opencl-lang.c (opencl_language_defn): Adjust comment to refer to la_get_symbol_name_matcher. * p-lang.c (pascal_language_defn): Adjust comment to refer to la_get_symbol_name_matcher. * psymtab.c (psym_lookup_symbol): Use lookup_name_info. (match_partial_symbol): Use symbol_name_match_type, lookup_name_info and psymbol_name_matches. (lookup_partial_symbol): Use lookup_name_info. (map_block): Use symbol_name_match_type and lookup_name_info. (psym_map_matching_symbols): Use symbol_name_match_type. (psymbol_name_matches): New. (recursively_search_psymtabs): Use lookup_name_info and psymbol_name_matches. Rename 'kind' parameter to 'domain'. (psym_expand_symtabs_matching): Use lookup_name_info. Rename 'kind' parameter to 'domain'. * rust-lang.c (rust_language_defn): Adjust comment to refer to la_get_symbol_name_matcher. * symfile-debug.c (debug_qf_map_matching_symbols) (debug_qf_map_matching_symbols): Use symbol_name_match_type. (debug_qf_expand_symtabs_matching): Use lookup_name_info. * symfile.c (expand_symtabs_matching): Use lookup_name_info. * symfile.h (quick_symbol_functions) <map_matching_symbols>: Adjust to use symbol_name_match_type. <expand_symtabs_matching>: Adjust to use lookup_name_info. (expand_symtabs_matching): Adjust to use lookup_name_info. * symmisc.c (maintenance_expand_symtabs): Use lookup_name_info::match_any (). * symtab.c (symbol_matches_search_name): New. (eq_symbol_entry): Adjust to use lookup_name_info and the language's matcher. (demangle_for_lookup_info::demangle_for_lookup_info): New. (lookup_name_info::match_any): New. (iterate_over_symbols, search_symbols): Use lookup_name_info. (compare_symbol_name): Add language, lookup_name_info and completion_match_result parameters, and use them. (completion_list_add_name): Make extern. Add language and lookup_name_info parameters. Use them. (completion_list_add_symbol, completion_list_add_msymbol) (completion_list_objc_symbol): Add lookup_name_info parameters and adjust. Pass down language. (completion_list_add_fields): Add lookup_name_info parameters and adjust. Pass down language. (add_symtab_completions): Add lookup_name_info parameters and adjust. (default_collect_symbol_completion_matches_break_on): Add name_match_type parameter, and use it. Use lookup_name_info. (default_collect_symbol_completion_matches) (collect_symbol_completion_matches): Add name_match_type parameter, and pass it down. (collect_symbol_completion_matches_type): Adjust. (collect_file_symbol_completion_matches): Add name_match_type parameter, and use lookup_name_info. * symtab.h: Include <string> and "common/gdb_optional.h". (enum class symbol_name_match_type): New. (class ada_lookup_name_info): New. (struct demangle_for_lookup_info): New. (class lookup_name_info): New. (symbol_name_matcher_ftype): New. (SYMBOL_MATCHES_SEARCH_NAME): Use symbol_matches_search_name. (symbol_matches_search_name): Declare. (MSYMBOL_MATCHES_SEARCH_NAME): Delete. (default_collect_symbol_completion_matches) (collect_symbol_completion_matches) (collect_file_symbol_completion_matches): Add name_match_type parameter. (iterate_over_symbols): Use lookup_name_info. (completion_list_add_name): Declare. * utils.c (enum class strncmp_iw_mode): Moved to utils.h. (strncmp_iw_with_mode): Now extern. * utils.h (enum class strncmp_iw_mode): Moved from utils.c. (strncmp_iw_with_mode): Declare. gdb/testsuite/ChangeLog: 2017-11-08 Pedro Alves <palves@redhat.com> * gdb.ada/complete.exp (p <Exported_Capitalized>): New test. (p Exported_Capitalized): New test. (p exported_capitalized): New test.
694 lines
21 KiB
C
694 lines
21 KiB
C
/* Debug logging for the symbol file functions for the GNU debugger, GDB.
|
||
|
||
Copyright (C) 2013-2017 Free Software Foundation, Inc.
|
||
|
||
Contributed by Cygnus Support, using pieces from other GDB modules.
|
||
|
||
This file is part of GDB.
|
||
|
||
This program is free software; you can redistribute it and/or modify
|
||
it under the terms of the GNU General Public License as published by
|
||
the Free Software Foundation; either version 3 of the License, or
|
||
(at your option) any later version.
|
||
|
||
This program is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
GNU General Public License for more details.
|
||
|
||
You should have received a copy of the GNU General Public License
|
||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||
|
||
/* Note: Be careful with functions that can throw errors.
|
||
We want to see a logging message regardless of whether an error was thrown.
|
||
This typically means printing a message before calling the real function
|
||
and then if the function returns a result printing a message after it
|
||
returns. */
|
||
|
||
#include "defs.h"
|
||
#include "gdbcmd.h"
|
||
#include "objfiles.h"
|
||
#include "observer.h"
|
||
#include "source.h"
|
||
#include "symtab.h"
|
||
#include "symfile.h"
|
||
|
||
/* We need to save a pointer to the real symbol functions.
|
||
Plus, the debug versions are malloc'd because we have to NULL out the
|
||
ones that are NULL in the real copy. */
|
||
|
||
struct debug_sym_fns_data
|
||
{
|
||
const struct sym_fns *real_sf;
|
||
struct sym_fns debug_sf;
|
||
};
|
||
|
||
/* We need to record a pointer to the real set of functions for each
|
||
objfile. */
|
||
static const struct objfile_data *symfile_debug_objfile_data_key;
|
||
|
||
/* If non-zero all calls to the symfile functions are logged. */
|
||
static int debug_symfile = 0;
|
||
|
||
/* Return non-zero if symfile debug logging is installed. */
|
||
|
||
static int
|
||
symfile_debug_installed (struct objfile *objfile)
|
||
{
|
||
return (objfile->sf != NULL
|
||
&& objfile_data (objfile, symfile_debug_objfile_data_key) != NULL);
|
||
}
|
||
|
||
/* Utility return the name to print for SYMTAB. */
|
||
|
||
static const char *
|
||
debug_symtab_name (struct symtab *symtab)
|
||
{
|
||
return symtab_to_filename_for_display (symtab);
|
||
}
|
||
|
||
/* Debugging version of struct quick_symbol_functions. */
|
||
|
||
static int
|
||
debug_qf_has_symbols (struct objfile *objfile)
|
||
{
|
||
const struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
int retval;
|
||
|
||
retval = debug_data->real_sf->qf->has_symbols (objfile);
|
||
|
||
fprintf_filtered (gdb_stdlog, "qf->has_symbols (%s) = %d\n",
|
||
objfile_debug_name (objfile), retval);
|
||
|
||
return retval;
|
||
}
|
||
|
||
static struct symtab *
|
||
debug_qf_find_last_source_symtab (struct objfile *objfile)
|
||
{
|
||
const struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
struct symtab *retval;
|
||
|
||
fprintf_filtered (gdb_stdlog, "qf->find_last_source_symtab (%s)\n",
|
||
objfile_debug_name (objfile));
|
||
|
||
retval = debug_data->real_sf->qf->find_last_source_symtab (objfile);
|
||
|
||
fprintf_filtered (gdb_stdlog, "qf->find_last_source_symtab (...) = %s\n",
|
||
retval ? debug_symtab_name (retval) : "NULL");
|
||
|
||
return retval;
|
||
}
|
||
|
||
static void
|
||
debug_qf_forget_cached_source_info (struct objfile *objfile)
|
||
{
|
||
const struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
|
||
fprintf_filtered (gdb_stdlog, "qf->forget_cached_source_info (%s)\n",
|
||
objfile_debug_name (objfile));
|
||
|
||
debug_data->real_sf->qf->forget_cached_source_info (objfile);
|
||
}
|
||
|
||
static bool
|
||
debug_qf_map_symtabs_matching_filename
|
||
(struct objfile *objfile, const char *name, const char *real_path,
|
||
gdb::function_view<bool (symtab *)> callback)
|
||
{
|
||
const struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
|
||
fprintf_filtered (gdb_stdlog,
|
||
"qf->map_symtabs_matching_filename (%s, \"%s\", \"%s\", %s)\n",
|
||
objfile_debug_name (objfile), name,
|
||
real_path ? real_path : NULL,
|
||
host_address_to_string (&callback));
|
||
|
||
bool retval = (debug_data->real_sf->qf->map_symtabs_matching_filename
|
||
(objfile, name, real_path, callback));
|
||
|
||
fprintf_filtered (gdb_stdlog,
|
||
"qf->map_symtabs_matching_filename (...) = %d\n",
|
||
retval);
|
||
|
||
return retval;
|
||
}
|
||
|
||
static struct compunit_symtab *
|
||
debug_qf_lookup_symbol (struct objfile *objfile, int kind, const char *name,
|
||
domain_enum domain)
|
||
{
|
||
const struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
struct compunit_symtab *retval;
|
||
|
||
fprintf_filtered (gdb_stdlog,
|
||
"qf->lookup_symbol (%s, %d, \"%s\", %s)\n",
|
||
objfile_debug_name (objfile), kind, name,
|
||
domain_name (domain));
|
||
|
||
retval = debug_data->real_sf->qf->lookup_symbol (objfile, kind, name,
|
||
domain);
|
||
|
||
fprintf_filtered (gdb_stdlog, "qf->lookup_symbol (...) = %s\n",
|
||
retval
|
||
? debug_symtab_name (compunit_primary_filetab (retval))
|
||
: "NULL");
|
||
|
||
return retval;
|
||
}
|
||
|
||
static void
|
||
debug_qf_print_stats (struct objfile *objfile)
|
||
{
|
||
const struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
|
||
fprintf_filtered (gdb_stdlog, "qf->print_stats (%s)\n",
|
||
objfile_debug_name (objfile));
|
||
|
||
debug_data->real_sf->qf->print_stats (objfile);
|
||
}
|
||
|
||
static void
|
||
debug_qf_dump (struct objfile *objfile)
|
||
{
|
||
const struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
|
||
fprintf_filtered (gdb_stdlog, "qf->dump (%s)\n",
|
||
objfile_debug_name (objfile));
|
||
|
||
debug_data->real_sf->qf->dump (objfile);
|
||
}
|
||
|
||
static void
|
||
debug_qf_relocate (struct objfile *objfile,
|
||
const struct section_offsets *new_offsets,
|
||
const struct section_offsets *delta)
|
||
{
|
||
const struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
|
||
fprintf_filtered (gdb_stdlog, "qf->relocate (%s, %s, %s)\n",
|
||
objfile_debug_name (objfile),
|
||
host_address_to_string (new_offsets),
|
||
host_address_to_string (delta));
|
||
|
||
debug_data->real_sf->qf->relocate (objfile, new_offsets, delta);
|
||
}
|
||
|
||
static void
|
||
debug_qf_expand_symtabs_for_function (struct objfile *objfile,
|
||
const char *func_name)
|
||
{
|
||
const struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
|
||
fprintf_filtered (gdb_stdlog,
|
||
"qf->expand_symtabs_for_function (%s, \"%s\")\n",
|
||
objfile_debug_name (objfile), func_name);
|
||
|
||
debug_data->real_sf->qf->expand_symtabs_for_function (objfile, func_name);
|
||
}
|
||
|
||
static void
|
||
debug_qf_expand_all_symtabs (struct objfile *objfile)
|
||
{
|
||
const struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
|
||
fprintf_filtered (gdb_stdlog, "qf->expand_all_symtabs (%s)\n",
|
||
objfile_debug_name (objfile));
|
||
|
||
debug_data->real_sf->qf->expand_all_symtabs (objfile);
|
||
}
|
||
|
||
static void
|
||
debug_qf_expand_symtabs_with_fullname (struct objfile *objfile,
|
||
const char *fullname)
|
||
{
|
||
const struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
|
||
fprintf_filtered (gdb_stdlog,
|
||
"qf->expand_symtabs_with_fullname (%s, \"%s\")\n",
|
||
objfile_debug_name (objfile), fullname);
|
||
|
||
debug_data->real_sf->qf->expand_symtabs_with_fullname (objfile, fullname);
|
||
}
|
||
|
||
static void
|
||
debug_qf_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 struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
|
||
fprintf_filtered (gdb_stdlog,
|
||
"qf->map_matching_symbols (%s, \"%s\", %s, %d, %s, %s, %s, %s)\n",
|
||
objfile_debug_name (objfile), name,
|
||
domain_name (domain), global,
|
||
host_address_to_string (callback),
|
||
host_address_to_string (data),
|
||
plongest ((LONGEST) match),
|
||
host_address_to_string (ordered_compare));
|
||
|
||
debug_data->real_sf->qf->map_matching_symbols (objfile, name,
|
||
domain, global,
|
||
callback, data,
|
||
match,
|
||
ordered_compare);
|
||
}
|
||
|
||
static void
|
||
debug_qf_expand_symtabs_matching
|
||
(struct objfile *objfile,
|
||
gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
|
||
const lookup_name_info &lookup_name,
|
||
gdb::function_view<expand_symtabs_symbol_matcher_ftype> symbol_matcher,
|
||
gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify,
|
||
enum search_domain kind)
|
||
{
|
||
const struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
|
||
fprintf_filtered (gdb_stdlog,
|
||
"qf->expand_symtabs_matching (%s, %s, %s, %s, %s)\n",
|
||
objfile_debug_name (objfile),
|
||
host_address_to_string (&file_matcher),
|
||
host_address_to_string (&symbol_matcher),
|
||
host_address_to_string (&expansion_notify),
|
||
search_domain_name (kind));
|
||
|
||
debug_data->real_sf->qf->expand_symtabs_matching (objfile,
|
||
file_matcher,
|
||
lookup_name,
|
||
symbol_matcher,
|
||
expansion_notify,
|
||
kind);
|
||
}
|
||
|
||
static struct compunit_symtab *
|
||
debug_qf_find_pc_sect_compunit_symtab (struct objfile *objfile,
|
||
struct bound_minimal_symbol msymbol,
|
||
CORE_ADDR pc,
|
||
struct obj_section *section,
|
||
int warn_if_readin)
|
||
{
|
||
const struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
struct compunit_symtab *retval;
|
||
|
||
fprintf_filtered (gdb_stdlog,
|
||
"qf->find_pc_sect_compunit_symtab (%s, %s, %s, %s, %d)\n",
|
||
objfile_debug_name (objfile),
|
||
host_address_to_string (msymbol.minsym),
|
||
hex_string (pc),
|
||
host_address_to_string (section),
|
||
warn_if_readin);
|
||
|
||
retval
|
||
= debug_data->real_sf->qf->find_pc_sect_compunit_symtab (objfile, msymbol,
|
||
pc, section,
|
||
warn_if_readin);
|
||
|
||
fprintf_filtered (gdb_stdlog,
|
||
"qf->find_pc_sect_compunit_symtab (...) = %s\n",
|
||
retval
|
||
? debug_symtab_name (compunit_primary_filetab (retval))
|
||
: "NULL");
|
||
|
||
return retval;
|
||
}
|
||
|
||
static void
|
||
debug_qf_map_symbol_filenames (struct objfile *objfile,
|
||
symbol_filename_ftype *fun, void *data,
|
||
int need_fullname)
|
||
{
|
||
const struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
fprintf_filtered (gdb_stdlog,
|
||
"qf->map_symbol_filenames (%s, %s, %s, %d)\n",
|
||
objfile_debug_name (objfile),
|
||
host_address_to_string (fun),
|
||
host_address_to_string (data),
|
||
need_fullname);
|
||
|
||
debug_data->real_sf->qf->map_symbol_filenames (objfile, fun, data,
|
||
need_fullname);
|
||
}
|
||
|
||
static const struct quick_symbol_functions debug_sym_quick_functions =
|
||
{
|
||
debug_qf_has_symbols,
|
||
debug_qf_find_last_source_symtab,
|
||
debug_qf_forget_cached_source_info,
|
||
debug_qf_map_symtabs_matching_filename,
|
||
debug_qf_lookup_symbol,
|
||
debug_qf_print_stats,
|
||
debug_qf_dump,
|
||
debug_qf_relocate,
|
||
debug_qf_expand_symtabs_for_function,
|
||
debug_qf_expand_all_symtabs,
|
||
debug_qf_expand_symtabs_with_fullname,
|
||
debug_qf_map_matching_symbols,
|
||
debug_qf_expand_symtabs_matching,
|
||
debug_qf_find_pc_sect_compunit_symtab,
|
||
debug_qf_map_symbol_filenames
|
||
};
|
||
|
||
/* Debugging version of struct sym_probe_fns. */
|
||
|
||
static const std::vector<probe *> &
|
||
debug_sym_get_probes (struct objfile *objfile)
|
||
{
|
||
const struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
|
||
const std::vector<probe *> &retval
|
||
= debug_data->real_sf->sym_probe_fns->sym_get_probes (objfile);
|
||
|
||
fprintf_filtered (gdb_stdlog,
|
||
"probes->sym_get_probes (%s) = %s\n",
|
||
objfile_debug_name (objfile),
|
||
host_address_to_string (retval.data ()));
|
||
|
||
return retval;
|
||
}
|
||
|
||
static const struct sym_probe_fns debug_sym_probe_fns =
|
||
{
|
||
debug_sym_get_probes,
|
||
};
|
||
|
||
/* Debugging version of struct sym_fns. */
|
||
|
||
static void
|
||
debug_sym_new_init (struct objfile *objfile)
|
||
{
|
||
const struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
|
||
fprintf_filtered (gdb_stdlog, "sf->sym_new_init (%s)\n",
|
||
objfile_debug_name (objfile));
|
||
|
||
debug_data->real_sf->sym_new_init (objfile);
|
||
}
|
||
|
||
static void
|
||
debug_sym_init (struct objfile *objfile)
|
||
{
|
||
const struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
|
||
fprintf_filtered (gdb_stdlog, "sf->sym_init (%s)\n",
|
||
objfile_debug_name (objfile));
|
||
|
||
debug_data->real_sf->sym_init (objfile);
|
||
}
|
||
|
||
static void
|
||
debug_sym_read (struct objfile *objfile, symfile_add_flags symfile_flags)
|
||
{
|
||
const struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
|
||
fprintf_filtered (gdb_stdlog, "sf->sym_read (%s, 0x%x)\n",
|
||
objfile_debug_name (objfile), (unsigned) symfile_flags);
|
||
|
||
debug_data->real_sf->sym_read (objfile, symfile_flags);
|
||
}
|
||
|
||
static void
|
||
debug_sym_read_psymbols (struct objfile *objfile)
|
||
{
|
||
const struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
|
||
fprintf_filtered (gdb_stdlog, "sf->sym_read_psymbols (%s)\n",
|
||
objfile_debug_name (objfile));
|
||
|
||
debug_data->real_sf->sym_read_psymbols (objfile);
|
||
}
|
||
|
||
static void
|
||
debug_sym_finish (struct objfile *objfile)
|
||
{
|
||
const struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
|
||
fprintf_filtered (gdb_stdlog, "sf->sym_finish (%s)\n",
|
||
objfile_debug_name (objfile));
|
||
|
||
debug_data->real_sf->sym_finish (objfile);
|
||
}
|
||
|
||
static void
|
||
debug_sym_offsets (struct objfile *objfile,
|
||
const struct section_addr_info *info)
|
||
{
|
||
const struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
|
||
fprintf_filtered (gdb_stdlog, "sf->sym_offsets (%s, %s)\n",
|
||
objfile_debug_name (objfile),
|
||
host_address_to_string (info));
|
||
|
||
debug_data->real_sf->sym_offsets (objfile, info);
|
||
}
|
||
|
||
static struct symfile_segment_data *
|
||
debug_sym_segments (bfd *abfd)
|
||
{
|
||
/* This API function is annoying, it doesn't take a "this" pointer.
|
||
Fortunately it is only used in one place where we (re-)lookup the
|
||
sym_fns table to use. Thus we will never be called. */
|
||
gdb_assert_not_reached ("debug_sym_segments called");
|
||
}
|
||
|
||
static void
|
||
debug_sym_read_linetable (struct objfile *objfile)
|
||
{
|
||
const struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
|
||
fprintf_filtered (gdb_stdlog, "sf->sym_read_linetable (%s)\n",
|
||
objfile_debug_name (objfile));
|
||
|
||
debug_data->real_sf->sym_read_linetable (objfile);
|
||
}
|
||
|
||
static bfd_byte *
|
||
debug_sym_relocate (struct objfile *objfile, asection *sectp, bfd_byte *buf)
|
||
{
|
||
const struct debug_sym_fns_data *debug_data
|
||
= ((const struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
bfd_byte *retval;
|
||
|
||
retval = debug_data->real_sf->sym_relocate (objfile, sectp, buf);
|
||
|
||
fprintf_filtered (gdb_stdlog,
|
||
"sf->sym_relocate (%s, %s, %s) = %s\n",
|
||
objfile_debug_name (objfile),
|
||
host_address_to_string (sectp),
|
||
host_address_to_string (buf),
|
||
host_address_to_string (retval));
|
||
|
||
return retval;
|
||
}
|
||
|
||
/* Template of debugging version of struct sym_fns.
|
||
A copy is made, with sym_flavour updated, and a pointer to the real table
|
||
installed in real_sf, and then a pointer to the copy is installed in the
|
||
objfile. */
|
||
|
||
static const struct sym_fns debug_sym_fns =
|
||
{
|
||
debug_sym_new_init,
|
||
debug_sym_init,
|
||
debug_sym_read,
|
||
debug_sym_read_psymbols,
|
||
debug_sym_finish,
|
||
debug_sym_offsets,
|
||
debug_sym_segments,
|
||
debug_sym_read_linetable,
|
||
debug_sym_relocate,
|
||
&debug_sym_probe_fns,
|
||
&debug_sym_quick_functions
|
||
};
|
||
|
||
/* Free the copy of sym_fns recorded in the registry. */
|
||
|
||
static void
|
||
symfile_debug_free_objfile (struct objfile *objfile, void *datum)
|
||
{
|
||
xfree (datum);
|
||
}
|
||
|
||
/* Install the debugging versions of the symfile functions for OBJFILE.
|
||
Do not call this if the debug versions are already installed. */
|
||
|
||
static void
|
||
install_symfile_debug_logging (struct objfile *objfile)
|
||
{
|
||
const struct sym_fns *real_sf;
|
||
struct debug_sym_fns_data *debug_data;
|
||
|
||
/* The debug versions should not already be installed. */
|
||
gdb_assert (!symfile_debug_installed (objfile));
|
||
|
||
real_sf = objfile->sf;
|
||
|
||
/* Alas we have to preserve NULL entries in REAL_SF. */
|
||
debug_data = XCNEW (struct debug_sym_fns_data);
|
||
|
||
#define COPY_SF_PTR(from, to, name, func) \
|
||
do { \
|
||
if ((from)->name) \
|
||
(to)->debug_sf.name = func; \
|
||
} while (0)
|
||
|
||
COPY_SF_PTR (real_sf, debug_data, sym_new_init, debug_sym_new_init);
|
||
COPY_SF_PTR (real_sf, debug_data, sym_init, debug_sym_init);
|
||
COPY_SF_PTR (real_sf, debug_data, sym_read, debug_sym_read);
|
||
COPY_SF_PTR (real_sf, debug_data, sym_read_psymbols,
|
||
debug_sym_read_psymbols);
|
||
COPY_SF_PTR (real_sf, debug_data, sym_finish, debug_sym_finish);
|
||
COPY_SF_PTR (real_sf, debug_data, sym_offsets, debug_sym_offsets);
|
||
COPY_SF_PTR (real_sf, debug_data, sym_segments, debug_sym_segments);
|
||
COPY_SF_PTR (real_sf, debug_data, sym_read_linetable,
|
||
debug_sym_read_linetable);
|
||
COPY_SF_PTR (real_sf, debug_data, sym_relocate, debug_sym_relocate);
|
||
if (real_sf->sym_probe_fns)
|
||
debug_data->debug_sf.sym_probe_fns = &debug_sym_probe_fns;
|
||
debug_data->debug_sf.qf = &debug_sym_quick_functions;
|
||
|
||
#undef COPY_SF_PTR
|
||
|
||
debug_data->real_sf = real_sf;
|
||
set_objfile_data (objfile, symfile_debug_objfile_data_key, debug_data);
|
||
objfile->sf = &debug_data->debug_sf;
|
||
}
|
||
|
||
/* Uninstall the debugging versions of the symfile functions for OBJFILE.
|
||
Do not call this if the debug versions are not installed. */
|
||
|
||
static void
|
||
uninstall_symfile_debug_logging (struct objfile *objfile)
|
||
{
|
||
struct debug_sym_fns_data *debug_data;
|
||
|
||
/* The debug versions should be currently installed. */
|
||
gdb_assert (symfile_debug_installed (objfile));
|
||
|
||
debug_data = ((struct debug_sym_fns_data *)
|
||
objfile_data (objfile, symfile_debug_objfile_data_key));
|
||
|
||
objfile->sf = debug_data->real_sf;
|
||
xfree (debug_data);
|
||
set_objfile_data (objfile, symfile_debug_objfile_data_key, NULL);
|
||
}
|
||
|
||
/* Call this function to set OBJFILE->SF.
|
||
Do not set OBJFILE->SF directly. */
|
||
|
||
void
|
||
objfile_set_sym_fns (struct objfile *objfile, const struct sym_fns *sf)
|
||
{
|
||
if (symfile_debug_installed (objfile))
|
||
{
|
||
gdb_assert (debug_symfile);
|
||
/* Remove the current one, and reinstall a new one later. */
|
||
uninstall_symfile_debug_logging (objfile);
|
||
}
|
||
|
||
/* Assume debug logging is disabled. */
|
||
objfile->sf = sf;
|
||
|
||
/* Turn debug logging on if enabled. */
|
||
if (debug_symfile)
|
||
install_symfile_debug_logging (objfile);
|
||
}
|
||
|
||
static void
|
||
set_debug_symfile (const char *args, int from_tty, struct cmd_list_element *c)
|
||
{
|
||
struct program_space *pspace;
|
||
struct objfile *objfile;
|
||
|
||
ALL_PSPACES (pspace)
|
||
ALL_PSPACE_OBJFILES (pspace, objfile)
|
||
{
|
||
if (debug_symfile)
|
||
{
|
||
if (!symfile_debug_installed (objfile))
|
||
install_symfile_debug_logging (objfile);
|
||
}
|
||
else
|
||
{
|
||
if (symfile_debug_installed (objfile))
|
||
uninstall_symfile_debug_logging (objfile);
|
||
}
|
||
}
|
||
}
|
||
|
||
static void
|
||
show_debug_symfile (struct ui_file *file, int from_tty,
|
||
struct cmd_list_element *c, const char *value)
|
||
{
|
||
fprintf_filtered (file, _("Symfile debugging is %s.\n"), value);
|
||
}
|
||
|
||
void
|
||
_initialize_symfile_debug (void)
|
||
{
|
||
symfile_debug_objfile_data_key
|
||
= register_objfile_data_with_cleanup (NULL, symfile_debug_free_objfile);
|
||
|
||
add_setshow_boolean_cmd ("symfile", no_class, &debug_symfile, _("\
|
||
Set debugging of the symfile functions."), _("\
|
||
Show debugging of the symfile functions."), _("\
|
||
When enabled, all calls to the symfile functions are logged."),
|
||
set_debug_symfile, show_debug_symfile,
|
||
&setdebuglist, &showdebuglist);
|
||
|
||
/* Note: We don't need a new-objfile observer because debug logging
|
||
will be installed when objfile init'n calls objfile_set_sym_fns. */
|
||
}
|