mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-24 18:44:20 +08:00
f8eba3c616
gdb 2011-12-06 Joel Brobecker <brobecker@acacore.com> * language.h (struct language_defn): Add new component la_symbol_name_compare. * symfile.h (struct quick_symbol_functions): Update the profile of parameter "name_matcher" for the expand_symtabs_matching method. Update the documentation accordingly. * ada-lang.h (ada_name_for_lookup): Add declaration. * ada-lang.c (ada_name_for_lookup): New function, extracted out from ada_iterate_over_symbols. (ada_iterate_over_symbols): Do not encode symbol name anymore. (ada_expand_partial_symbol_name): Adjust profile. (ada_language_defn): Add value for la_symbol_name_compare field. * linespec.c: #include "ada-lang.h". (iterate_name_matcher): Add language parameter. Replace call to strcmp_iw by call to language->la_symbol_name_compare. (decode_variable): Encode COPY if current language is Ada. * dwarf2read.c (dw2_expand_symtabs_matching): Adjust profile of name_matcher parameter. Adjust call to name_matcher. * psymtab.c (expand_symtabs_matching_via_partial): Likewise. (expand_partial_symbol_names): Update profile of parameter "fun". * psymtab.h (expand_partial_symbol_names): Update profile of parameter "fun". * symtab.c (demangle_for_lookup): Update function documentation. (search_symbols_name_matches): Add language parameter. (expand_partial_symbol_name): Likewise. * c-lang.c (c_language_defn, cplus_language_defn) (asm_language_defn, minimal_language_defn): Add value for la_symbol_name_compare field. * d-lang.c (d_language_defn): Likewise. * f-lang.c (f_language_defn): Ditto. * jv-lang.c (java_language_defn): Ditto. * m2-lang.c (m2_language_defn): Ditto. * objc-lang.c (objc_language_defn): Ditto. * opencl-lang.c (opencl_language_defn): Ditto. * p-lang.c (pascal_language_defn): Ditto. * language.c (unknown_language_defn, auto_language_defn) (local_language_defn): Ditto. 2011-12-06 Tom Tromey <tromey@redhat.com> * linespec.c (iterate_over_all_matching_symtabs): Use LA_ITERATE_OVER_SYMBOLS. (lookup_prefix_sym, add_matching_symbols_to_info): Likewise. (find_function_symbols, decode_variable): Remove Ada special case. * language.h (struct language_defn) <la_iterate_over_symbols>: New field. (LA_ITERATE_OVER_SYMBOLS): New macro. * language.c (unknown_language_defn, auto_language_defn) (local_language_defn): Update. * c-lang.c (c_language_defn, cplus_language_defn) (asm_language_defn, minimal_language_defn): Update. * d-lang.c (d_language_defn): Update. * f-lang.c (f_language_defn): Update. * jv-lang.c (java_language_defn): Update. * m2-lang.c (m2_language_defn): Update. * objc-lang.c (objc_language_defn): Update. * opencl-lang.c (opencl_language_defn): Update. * p-lang.c (pascal_language_defn): Update. * ada-lang.c (ada_iterate_over_symbols): New function. (ada_language_defn): Update. 2011-12-06 Tom Tromey <tromey@redhat.com> Joel Brobecker <brobecker@acacore.com> PR breakpoints/13105, PR objc/8341, PR objc/8343, PR objc/8366, PR objc/8535, PR breakpoints/11657, PR breakpoints/11970, PR breakpoints/12023, PR breakpoints/12334, PR breakpoints/12856, PR shlibs/8929, PR shlibs/7393: * python/py-type.c (compare_maybe_null_strings): Rename from compare_strings. (check_types_equal): Update. * utils.c (compare_strings): New function. * tui/tui-winsource.c (tui_update_breakpoint_info): Update for location changes. * tracepoint.c (scope_info): Update. (trace_find_line_command): Use DECODE_LINE_FUNFIRSTLINE. * symtab.h (iterate_over_minimal_symbols) (iterate_over_some_symtabs, iterate_over_symtabs) (find_pcs_for_symtab_line, iterate_over_symbols) (demangle_for_lookup): Declare. (expand_line_sal): Remove. * symtab.c (iterate_over_some_symtabs, iterate_over_symtabs) (lookup_symtab_callback): New functions. (lookup_symtab): Rewrite. (demangle_for_lookup): New function, extract from lookup_symbol_in_language. (lookup_symbol_in_language): Use it. (iterate_over_symbols): New function. (find_line_symtab): Update. (find_pcs_for_symtab_line): New functions. (find_line_common): Add 'start' argument. (decode_line_spec): Update. Change argument to 'flags', change interpretation. (append_expanded_sal): Remove. (append_exact_match_to_sals): Remove. (expand_line_sal): Remove. * symfile.h (struct quick_symbol_functions) <lookup_symtab>: Remove. <map_symtabs_matching_filename>: New field. * stack.c (func_command): Only look in the current program space. Use DECODE_LINE_FUNFIRSTLINE. * source.c (line_info): Set pspace on sal. Check program space in the loop. Use DECODE_LINE_LIST_MODE. (select_source_symtab): Use DECODE_LINE_FUNFIRSTLINE. * solib-target.c: Remove DEF_VEC_I(CORE_ADDR). * python/python.c (gdbpy_decode_line): Update. * psymtab.c (partial_map_expand_apply): New function. (partial_map_symtabs_matching_filename): Rename from lookup_partial_symbol. Update arguments. (lookup_symtab_via_partial_symtab): Remove. (psym_functions): Update. * objc-lang.h (parse_selector, parse_method): Don't declare. (find_imps): Update. * objc-lang.c (parse_selector, parse_method): Now static. (find_methods): Change arguments. Fill in a vector of symbol names. (uniquify_strings): New function. (find_imps): Change arguments. * minsyms.c (iterate_over_minimal_symbols): New function. * linespec.h (enum decode_line_flags): New. (struct linespec_sals): New. (struct linespec_result) <canonical>: Remove. <pre_expanded, addr_string, sals>: New fields. (destroy_linespec_result, make_cleanup_destroy_linespec_result) (decode_line_full): Declare. (decode_line_1): Update. * linespec.c (struct address_entry, struct linespec_state, struct collect_info): New types. (add_sal_to_sals_basic, add_sal_to_sals, hash_address_entry) (eq_address_entry, maybe_add_address): New functions. (total_number_of_methods): Remove. (iterate_name_matcher, iterate_over_all_matching_symtabs): New functions. (find_methods): Change arguments. Don't canonicalize input. Simplify logic. (add_matching_methods, add_constructors) (build_canonical_line_spec): Remove. (filter_results, convert_results_to_lsals): New functions. (decode_line_2): Change arguments. Rewrite for new data structures. (decode_line_internal): Rename from decode_line_1. Change arguments. Add cleanups. Update for new data structures. (linespec_state_constructor, linespec_state_destructor) (decode_line_full, decode_line_1): New functions. (decode_indirect): Change arguments. Update. (locate_first_half): Use skip_spaces. (decode_objc): Change arguments. Update for new data structures. Simplify logic. (decode_compound): Change arguments. Add cleanups. Remove fallback code, replace with error. (struct decode_compound_collector): New type. (collect_one_symbol): New function. (lookup_prefix_sym): Change arguments. Update. (compare_symbol_name, add_all_symbol_names_from_pspace) (find_superclass_methods ): New functions. (find_method): Rewrite. (struct symtab_collector): New type. (add_symtabs_to_list, collect_symtabs_from_filename): New functions. (symtabs_from_filename): Change API. Rename from symtab_from_filename. (collect_function_symbols): New function. (find_function_symbols): Change API. Rename from find_function_symbol. Rewrite. (decode_all_digits): Change arguments. Rewrite. (decode_dollar): Change arguments. Use decode_variable. (decode_label): Change arguments. Rewrite. (collect_symbols): New function. (minsym_found): Change arguments. Rewrite. (check_minsym, search_minsyms_for_name) (add_matching_symbols_to_info): New function. (decode_variable): Change arguments. Iterate over all symbols. (symbol_found): Remove. (symbol_to_sal): New function. (init_linespec_result, destroy_linespec_result) (cleanup_linespec_result, make_cleanup_destroy_linespec_result): New functions. (decode_digits_list_mode, decode_digits_ordinary): New functions. * dwarf2read.c (dw2_map_expand_apply): New function. (dw2_map_symtabs_matching_filename): Rename from dw2_lookup_symtab. Change arguments. (dwarf2_gdb_index_functions): Update. * dwarf2loc.c: Remove DEF_VEC_I(CORE_ADDR). * defs.h (compare_strings): Declare. * cli/cli-cmds.c (compare_strings): Move to utils.c. (edit_command, list_command): Use DECODE_LINE_LIST_MODE. Call filter_sals. (compare_symtabs, filter_sals): New functions. * breakpoint.h (struct bp_location) <line_number, source_file>: New fields. (struct breakpoint) <line_number, source_file>: Remove. <filter>: New field. * breakpoint.c (print_breakpoint_location, init_raw_breakpoint) (momentary_breakpoint_from_master, add_location_to_breakpoint): Update for changes to locations. (init_breakpoint_sal): Add 'filter' argument. Set 'filter' on breakpoint. (create_breakpoint_sal): Add 'filter' argument. (remove_sal, expand_line_sal_maybe): Remove. (create_breakpoints_sal): Remove 'sals' argument. Handle pre-expanded sals and the filter. (parse_breakpoint_sals): Use decode_line_full. (check_fast_tracepoint_sals): Use get_sal_arch. (create_breakpoint): Create a linespec_sals. Update. (break_range_command): Use decode_line_full. Update. (until_break_command): Update. (clear_command): Update match conditions for linespec.c changes. Use DECODE_LINE_LIST_MODE. (say_where): Update for changes to locations. (bp_location_dtor): Free 'source_file'. (base_breakpoint_dtor): Free 'filter'. Don't free 'source_file'. (update_static_tracepoint): Update for changes to locations. (update_breakpoint_locations): Disable ranged breakpoint if too many locations match. Update. (addr_string_to_sals): Use decode_line_full. Resolve all sal PCs. (breakpoint_re_set_default): Don't call expand_line_sal_maybe. (decode_line_spec_1): Update. Change argument name to 'flags', change interpretation. * block.h (block_containing_function): Declare. * block.c (block_containing_function): New function. * skip.c (skip_function_command): Update. (skip_re_set): Update. * infcmd.c (jump_command): Use DECODE_LINE_FUNFIRSTLINE. * mi/mi-main.c (mi_cmd_trace_find): Use DECODE_LINE_FUNFIRSTLINE. * NEWS: Add entry. 2011-12-06 Tom Tromey <tromey@redhat.com> * elfread.c (elf_gnu_ifunc_resolver_return_stop): Allow breakpoint's pspace to be NULL. * breakpoint.h (struct breakpoint) <pspace>: Update comment. * breakpoint.c (init_raw_breakpoint): Conditionally set breakpoint's pspace. (init_breakpoint_sal): Don't set breakpoint's pspace. (prepare_re_set_context): Conditionally switch program space. (addr_string_to_sals): Check executing_startup on location's program space. 2011-12-06 Tom Tromey <tromey@redhat.com> * breakpoint.h (enum enable_state) <bp_startup_disabled>: Remove. * breakpoint.c (should_be_inserted): Explicitly check if program space is executing startup. (describe_other_breakpoints): Update. (disable_breakpoints_before_startup): Change executing_startup earlier. Remove loop. (enable_breakpoints_after_startup): Likewise. (init_breakpoint_sal): Don't use bp_startup_disabled. (create_breakpoint): Don't use bp_startup_disabled. (update_global_location_list): Use should_be_inserted. (bkpt_re_set): Update. gdb/testsuite 2011-12-06 Joel Brobecker <brobecker@acacore.com> * gdb.ada/fullname_bp.exp: Add tests for other valid linespecs involving a fully qualified function name. 2011-12-06 Tom Tromey <tromey@redhat.com> * gdb.ada/homonym.exp: Add three breakpoint tests. 2011-12-06 Tom Tromey <tromey@redhat.com> * gdb.base/solib-weak.exp (do_test): Remove kfail. * gdb.trace/tracecmd.exp: Disable pending breakpoints earlier. * gdb.objc/objcdecode.exp: Update for output changes. * gdb.linespec/linespec.exp: New file. * gdb.linespec/lspec.cc: New file. * gdb.linespec/lspec.h: New file. * gdb.linespec/body.h: New file. * gdb.linespec/base/two/thefile.cc: New file. * gdb.linespec/base/one/thefile.cc: New file. * gdb.linespec/Makefile.in: New file. * gdb.cp/templates.exp (test_template_breakpoints): Update for output changes. * gdb.cp/re-set-overloaded.exp: Remove kfail. * gdb.cp/ovldbreak.exp: Update for output changes. "all" test now makes one breakpoint. * gdb.cp/method2.exp (test_break): Update for output changes. * gdb.cp/mb-templates.exp: Update for output changes. * gdb.cp/mb-inline.exp: Update for output changes. * gdb.cp/mb-ctor.exp: Update for output changes. * gdb.cp/ovsrch.exp: Use fully-qualified names. * gdb.base/solib-symbol.exp: Run to main later. Breakpoint now has multiple matches. * gdb.base/sepdebug.exp: Disable pending breakpoints. Update for error message change. * gdb.base/list.exp (test_list_filename_and_number): Update for error message change. * gdb.base/break.exp: Disable pending breakpoints. Update for output changes. * configure.ac: Add gdb.linespec. * configure: Rebuild. * Makefile.in (ALL_SUBDIRS): Add gdb.linespec. gdb/doc 2011-12-06 Tom Tromey <tromey@redhat.com> * gdb.texinfo (Set Breaks): Update for new behavior.
603 lines
16 KiB
C
603 lines
16 KiB
C
/* Skipping uninteresting files and functions while stepping.
|
|
|
|
Copyright (C) 2011 Free Software Foundation, Inc.
|
|
|
|
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/>. */
|
|
|
|
#include "defs.h"
|
|
#include "skip.h"
|
|
#include "value.h"
|
|
#include "valprint.h"
|
|
#include "ui-out.h"
|
|
#include "gdb_string.h"
|
|
#include "symtab.h"
|
|
#include "gdbcmd.h"
|
|
#include "command.h"
|
|
#include "completer.h"
|
|
#include "stack.h"
|
|
#include "cli/cli-utils.h"
|
|
#include "arch-utils.h"
|
|
#include "linespec.h"
|
|
#include "objfiles.h"
|
|
#include "exceptions.h"
|
|
#include "breakpoint.h" /* for get_sal_arch () */
|
|
|
|
struct skiplist_entry
|
|
{
|
|
int number;
|
|
|
|
/* NULL if this isn't a skiplist entry for an entire file.
|
|
The skiplist entry owns this pointer. */
|
|
char *filename;
|
|
|
|
/* The name of the marked-for-skip function, if this is a skiplist
|
|
entry for a function. Note that this might be non-null even if
|
|
the pc is 0 if the entry is pending a shared library load.
|
|
|
|
The skiplist entry owns this pointer. */
|
|
char *function_name;
|
|
|
|
/* 0 if this is a skiplist entry for an entire file, or if this
|
|
entry will be on a function, pending a shared library load. */
|
|
CORE_ADDR pc;
|
|
|
|
/* Architecture we used to create the skiplist entry. May be null
|
|
if the entry is pending a shared library load. */
|
|
struct gdbarch *gdbarch;
|
|
|
|
int enabled;
|
|
int pending;
|
|
|
|
struct skiplist_entry *next;
|
|
};
|
|
|
|
static void skip_function_command (char *arg, int from_tty);
|
|
static void skip_file_command (char *arg, int from_tty);
|
|
static void skip_info (char *arg, int from_tty);
|
|
|
|
static void add_skiplist_entry (struct skiplist_entry *e);
|
|
static void skip_function_pc (CORE_ADDR pc, char *name,
|
|
struct gdbarch *arch,
|
|
int pending);
|
|
|
|
static struct skiplist_entry *skiplist_entry_chain;
|
|
static int skiplist_entry_count;
|
|
|
|
#define ALL_SKIPLIST_ENTRIES(E) \
|
|
for (E = skiplist_entry_chain; E; E = E->next)
|
|
|
|
#define ALL_SKIPLIST_ENTRIES_SAFE(E,TMP) \
|
|
for (E = skiplist_entry_chain; \
|
|
E ? (TMP = E->next, 1) : 0; \
|
|
E = TMP)
|
|
|
|
static void
|
|
skip_file_command (char *arg, int from_tty)
|
|
{
|
|
struct skiplist_entry *e;
|
|
struct symtab *symtab;
|
|
int pending = 0;
|
|
char *filename = 0;
|
|
|
|
/* If no argument was given, try to default to the last
|
|
displayed codepoint. */
|
|
if (arg == 0)
|
|
{
|
|
symtab = get_last_displayed_symtab ();
|
|
if (symtab == 0)
|
|
error (_("No default file now."));
|
|
else
|
|
filename = symtab->filename;
|
|
}
|
|
else
|
|
{
|
|
symtab = lookup_symtab (arg);
|
|
if (symtab == 0)
|
|
{
|
|
fprintf_filtered (gdb_stderr, _("No source file named %s.\n"), arg);
|
|
if (!nquery (_("\
|
|
Ignore file pending future shared library load? ")))
|
|
return;
|
|
|
|
pending = 1;
|
|
filename = arg;
|
|
}
|
|
else
|
|
filename = symtab->filename;
|
|
}
|
|
|
|
e = XZALLOC (struct skiplist_entry);
|
|
e->filename = xstrdup (filename);
|
|
e->enabled = 1;
|
|
e->pending = pending;
|
|
if (symtab != 0)
|
|
e->gdbarch = get_objfile_arch (symtab->objfile);
|
|
|
|
add_skiplist_entry (e);
|
|
|
|
printf_filtered (_("File %s will be skipped when stepping.\n"), filename);
|
|
}
|
|
|
|
static void
|
|
skip_function_command (char *arg, int from_tty)
|
|
{
|
|
CORE_ADDR func_pc;
|
|
char *name = NULL;
|
|
|
|
/* Default to the current function if no argument is given. */
|
|
if (arg == 0)
|
|
{
|
|
CORE_ADDR pc;
|
|
if (!last_displayed_sal_is_valid ())
|
|
error (_("No default function now."));
|
|
|
|
pc = get_last_displayed_addr ();
|
|
if (!find_pc_partial_function (pc, &name, &func_pc, 0))
|
|
{
|
|
error (_("No function found containing current program point %s."),
|
|
paddress (get_current_arch (), pc));
|
|
}
|
|
skip_function_pc (func_pc, name, get_current_arch (), 0);
|
|
}
|
|
else
|
|
{
|
|
/* Decode arg. We set funfirstline=1 so decode_line_1 will give us the
|
|
first line of the function specified, if it can, and so that we'll
|
|
reject variable names and the like. */
|
|
|
|
int i;
|
|
int pending = 0;
|
|
char *orig_arg = arg; /* decode_line_1 modifies the arg pointer. */
|
|
volatile struct gdb_exception decode_exception;
|
|
struct symtabs_and_lines sals = { 0 };
|
|
|
|
TRY_CATCH (decode_exception, RETURN_MASK_ERROR)
|
|
{
|
|
sals = decode_line_1 (&arg, DECODE_LINE_FUNFIRSTLINE, 0, 0);
|
|
}
|
|
|
|
if (decode_exception.reason < 0)
|
|
{
|
|
if (decode_exception.error != NOT_FOUND_ERROR)
|
|
throw_exception (decode_exception);
|
|
|
|
fprintf_filtered (gdb_stderr,
|
|
_("No function found named %s.\n"), orig_arg);
|
|
|
|
if (nquery (_("\
|
|
Ignore function pending future shared library load? ")))
|
|
{
|
|
/* Add the pending skiplist entry. */
|
|
skip_function_pc (0, orig_arg, 0, 1);
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
if (sals.nelts > 1)
|
|
error (_("Specify just one function at a time."));
|
|
if (strlen (arg) != 0)
|
|
error (_("Junk at end of arguments."));
|
|
|
|
/* The pc decode_line_1 gives us is the first line of the function,
|
|
but we actually want the line before that. The call to
|
|
find_pc_partial_function gets us the value we actually want. */
|
|
{
|
|
struct symtab_and_line sal = sals.sals[0];
|
|
CORE_ADDR pc = sal.pc;
|
|
CORE_ADDR func_start = 0;
|
|
struct gdbarch *arch = get_sal_arch (sal);
|
|
|
|
if (!find_pc_partial_function (pc, &name, &func_start, 0))
|
|
{
|
|
error (_("No function found containing program point %s."),
|
|
paddress (arch, pc));
|
|
}
|
|
|
|
skip_function_pc (func_start, name, arch, 0);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
skip_info (char *arg, int from_tty)
|
|
{
|
|
struct skiplist_entry *e;
|
|
int num_printable_entries = 0;
|
|
int address_width = 10;
|
|
struct value_print_options opts;
|
|
struct cleanup *tbl_chain;
|
|
|
|
get_user_print_options (&opts);
|
|
|
|
/* Count the number of rows in the table and see if we need space for a
|
|
64-bit address anywhere. */
|
|
ALL_SKIPLIST_ENTRIES (e)
|
|
if (arg == 0 || number_is_in_list (arg, e->number))
|
|
{
|
|
num_printable_entries++;
|
|
if (e->gdbarch && gdbarch_addr_bit (e->gdbarch) > 32)
|
|
address_width = 18;
|
|
}
|
|
|
|
if (num_printable_entries == 0)
|
|
{
|
|
if (arg == 0)
|
|
ui_out_message (current_uiout, 0, _("\
|
|
Not skipping any files or functions.\n"));
|
|
else
|
|
ui_out_message (current_uiout, 0,
|
|
_("No skiplist entries found with number %s.\n"), arg);
|
|
|
|
return;
|
|
}
|
|
|
|
if (opts.addressprint)
|
|
tbl_chain = make_cleanup_ui_out_table_begin_end (current_uiout, 5,
|
|
num_printable_entries,
|
|
"SkiplistTable");
|
|
else
|
|
tbl_chain
|
|
= make_cleanup_ui_out_table_begin_end (current_uiout, 4,
|
|
num_printable_entries,
|
|
"SkiplistTable");
|
|
|
|
ui_out_table_header (current_uiout, 7, ui_left, "number", "Num"); /* 1 */
|
|
ui_out_table_header (current_uiout, 14, ui_left, "type", "Type"); /* 2 */
|
|
ui_out_table_header (current_uiout, 3, ui_left, "enabled", "Enb"); /* 3 */
|
|
if (opts.addressprint)
|
|
{
|
|
ui_out_table_header (current_uiout, address_width, ui_left,
|
|
"addr", "Address"); /* 4 */
|
|
}
|
|
ui_out_table_header (current_uiout, 40, ui_noalign, "what", "What"); /* 5 */
|
|
ui_out_table_body (current_uiout);
|
|
|
|
ALL_SKIPLIST_ENTRIES (e)
|
|
{
|
|
struct cleanup *entry_chain;
|
|
|
|
QUIT;
|
|
if (arg != 0 && !number_is_in_list (arg, e->number))
|
|
continue;
|
|
|
|
entry_chain = make_cleanup_ui_out_tuple_begin_end (current_uiout,
|
|
"blklst-entry");
|
|
ui_out_field_int (current_uiout, "number", e->number); /* 1 */
|
|
|
|
if (e->function_name != 0)
|
|
ui_out_field_string (current_uiout, "type", "function"); /* 2 */
|
|
else if (e->filename != 0)
|
|
ui_out_field_string (current_uiout, "type", "file"); /* 2 */
|
|
else
|
|
internal_error (__FILE__, __LINE__, _("\
|
|
Skiplist entry should have either a filename or a function name."));
|
|
|
|
if (e->enabled)
|
|
ui_out_field_string (current_uiout, "enabled", "y"); /* 3 */
|
|
else
|
|
ui_out_field_string (current_uiout, "enabled", "n"); /* 3 */
|
|
|
|
if (opts.addressprint)
|
|
{
|
|
if (e->pc != 0)
|
|
ui_out_field_core_addr (current_uiout, "addr",
|
|
e->gdbarch, e->pc); /* 4 */
|
|
else
|
|
ui_out_field_string (current_uiout, "addr", ""); /* 4 */
|
|
}
|
|
|
|
if (!e->pending && e->function_name != 0)
|
|
{
|
|
struct symbol *sym;
|
|
|
|
gdb_assert (e->pc != 0);
|
|
sym = find_pc_function (e->pc);
|
|
if (sym)
|
|
ui_out_field_fmt (current_uiout, "what", "%s at %s:%d",
|
|
sym->ginfo.name,
|
|
sym->symtab->filename,
|
|
sym->line);
|
|
else
|
|
ui_out_field_string (current_uiout, "what", "?");
|
|
}
|
|
else if (e->pending && e->function_name != 0)
|
|
{
|
|
ui_out_field_fmt (current_uiout, "what", "%s (PENDING)",
|
|
e->function_name);
|
|
}
|
|
else if (!e->pending && e->filename != 0)
|
|
ui_out_field_string (current_uiout, "what", e->filename);
|
|
else if (e->pending && e->filename != 0)
|
|
ui_out_field_fmt (current_uiout, "what", "%s (PENDING)",
|
|
e->filename);
|
|
|
|
ui_out_text (current_uiout, "\n");
|
|
do_cleanups (entry_chain);
|
|
}
|
|
|
|
do_cleanups (tbl_chain);
|
|
}
|
|
|
|
static void
|
|
skip_enable_command (char *arg, int from_tty)
|
|
{
|
|
struct skiplist_entry *e;
|
|
int found = 0;
|
|
|
|
ALL_SKIPLIST_ENTRIES (e)
|
|
if (arg == 0 || number_is_in_list (arg, e->number))
|
|
{
|
|
e->enabled = 1;
|
|
found = 1;
|
|
}
|
|
|
|
if (!found)
|
|
error (_("No skiplist entries found with number %s."), arg);
|
|
}
|
|
|
|
static void
|
|
skip_disable_command (char *arg, int from_tty)
|
|
{
|
|
struct skiplist_entry *e;
|
|
int found = 0;
|
|
|
|
ALL_SKIPLIST_ENTRIES (e)
|
|
if (arg == 0 || number_is_in_list (arg, e->number))
|
|
{
|
|
e->enabled = 0;
|
|
found = 1;
|
|
}
|
|
|
|
if (!found)
|
|
error (_("No skiplist entries found with number %s."), arg);
|
|
}
|
|
|
|
static void
|
|
skip_delete_command (char *arg, int from_tty)
|
|
{
|
|
struct skiplist_entry *e, *temp, *b_prev;
|
|
int found = 0;
|
|
|
|
b_prev = 0;
|
|
ALL_SKIPLIST_ENTRIES_SAFE (e, temp)
|
|
if (arg == 0 || number_is_in_list (arg, e->number))
|
|
{
|
|
if (b_prev != 0)
|
|
b_prev->next = e->next;
|
|
else
|
|
skiplist_entry_chain = e->next;
|
|
|
|
xfree (e->function_name);
|
|
xfree (e->filename);
|
|
xfree (e);
|
|
found = 1;
|
|
}
|
|
else
|
|
{
|
|
b_prev = e;
|
|
}
|
|
|
|
if (!found)
|
|
error (_("No skiplist entries found with number %s."), arg);
|
|
}
|
|
|
|
/* Create a skiplist entry for the given pc corresponding to the given
|
|
function name and add it to the list. */
|
|
|
|
static void
|
|
skip_function_pc (CORE_ADDR pc, char *name, struct gdbarch *arch,
|
|
int pending)
|
|
{
|
|
struct skiplist_entry *e = XZALLOC (struct skiplist_entry);
|
|
|
|
e->pc = pc;
|
|
e->gdbarch = arch;
|
|
e->enabled = 1;
|
|
e->pending = pending;
|
|
e->function_name = xstrdup (name);
|
|
|
|
add_skiplist_entry (e);
|
|
|
|
if (!pending)
|
|
printf_filtered (_("Function %s at %s will be skipped when stepping.\n"),
|
|
name, paddress (get_current_arch (), pc));
|
|
else
|
|
printf_filtered (_("Function %s will be skipped when stepping, "
|
|
"pending shared library load.\n"),
|
|
name);
|
|
}
|
|
|
|
/* Add the given skiplist entry to our list, and set the entry's number. */
|
|
|
|
static void
|
|
add_skiplist_entry (struct skiplist_entry *e)
|
|
{
|
|
struct skiplist_entry *e1;
|
|
|
|
e->number = ++skiplist_entry_count;
|
|
|
|
/* Add to the end of the chain so that the list of
|
|
skiplist entries will be in numerical order. */
|
|
|
|
e1 = skiplist_entry_chain;
|
|
if (e1 == 0)
|
|
skiplist_entry_chain = e;
|
|
else
|
|
{
|
|
while (e1->next)
|
|
e1 = e1->next;
|
|
e1->next = e;
|
|
}
|
|
}
|
|
|
|
/* Does the given pc correspond to the beginning of a skipped function? */
|
|
|
|
int
|
|
function_pc_is_marked_for_skip (CORE_ADDR pc)
|
|
{
|
|
int searched_for_sal = 0;
|
|
struct symtab_and_line sal;
|
|
char *filename = NULL;
|
|
struct skiplist_entry *e;
|
|
|
|
ALL_SKIPLIST_ENTRIES (e)
|
|
{
|
|
if (!e->enabled || e->pending)
|
|
continue;
|
|
|
|
/* Does the pc we're stepping into match e's stored pc? */
|
|
if (e->pc != 0 && pc == e->pc)
|
|
return 1;
|
|
|
|
if (e->filename != 0)
|
|
{
|
|
/* Get the filename corresponding to this pc, if we haven't
|
|
* yet. */
|
|
if (!searched_for_sal)
|
|
{
|
|
sal = find_pc_line (pc, 0);
|
|
if (sal.symtab != 0)
|
|
filename = sal.symtab->filename;
|
|
searched_for_sal = 1;
|
|
}
|
|
if (filename != 0 && strcmp (filename, e->filename) == 0)
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Re-set the skip list after symbols have been re-loaded. */
|
|
void
|
|
skip_re_set (void)
|
|
{
|
|
struct skiplist_entry *e;
|
|
|
|
ALL_SKIPLIST_ENTRIES (e)
|
|
{
|
|
if (e->filename != 0)
|
|
{
|
|
/* If it's an entry telling us to skip a file, but the entry is
|
|
currently pending a solib load, let's see if we now know
|
|
about the file. */
|
|
struct symtab *symtab = lookup_symtab (e->filename);
|
|
if (symtab != 0)
|
|
{
|
|
xfree (e->filename);
|
|
e->filename = xstrdup (symtab->filename);
|
|
e->gdbarch = get_objfile_arch (symtab->objfile);
|
|
e->pending = 0;
|
|
}
|
|
else
|
|
{
|
|
e->pending = 1;
|
|
}
|
|
}
|
|
else if (e->function_name != 0)
|
|
{
|
|
char *func_name = e->function_name;
|
|
struct symtabs_and_lines sals = { 0 };
|
|
volatile struct gdb_exception decode_exception;
|
|
|
|
TRY_CATCH (decode_exception, RETURN_MASK_ERROR)
|
|
{
|
|
sals = decode_line_1 (&func_name, DECODE_LINE_FUNFIRSTLINE, 0, 0);
|
|
}
|
|
|
|
if (decode_exception.reason >= 0
|
|
&& sals.nelts == 1 && strlen (func_name) == 0)
|
|
{
|
|
struct symtab_and_line sal = sals.sals[0];
|
|
CORE_ADDR pc = sal.pc;
|
|
CORE_ADDR func_start = 0;
|
|
struct gdbarch *arch = get_sal_arch (sal);
|
|
char *func_name;
|
|
|
|
if (find_pc_partial_function (pc, &func_name, &func_start, 0))
|
|
{
|
|
e->pending = 0;
|
|
e->function_name = xstrdup (func_name);
|
|
e->pc = func_start;
|
|
e->gdbarch = arch;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
e->pending = 1;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
_initialize_step_skip (void)
|
|
{
|
|
struct cmd_list_element *c;
|
|
|
|
skiplist_entry_chain = 0;
|
|
skiplist_entry_count = 0;
|
|
|
|
add_prefix_cmd ("skip", class_breakpoint, skip_function_command, _("\
|
|
Ignore a function while stepping.\n\
|
|
Usage: skip [FUNCTION NAME]\n\
|
|
If no function name is given, ignore the current function."),
|
|
&skiplist, "skip ", 1, &cmdlist);
|
|
|
|
c = add_cmd ("file", class_breakpoint, skip_file_command, _("\
|
|
Ignore a file while stepping.\n\
|
|
Usage: skip file [FILENAME]\n\
|
|
If no filename is given, ignore the current file."),
|
|
&skiplist);
|
|
set_cmd_completer (c, filename_completer);
|
|
|
|
c = add_cmd ("function", class_breakpoint, skip_function_command, _("\
|
|
Ignore a function while stepping.\n\
|
|
Usage: skip function [FUNCTION NAME]\n\
|
|
If no function name is given, skip the current function."),
|
|
&skiplist);
|
|
set_cmd_completer (c, location_completer);
|
|
|
|
add_cmd ("enable", class_breakpoint, skip_enable_command, _("\
|
|
Enable skip entries. You can specify numbers (e.g. \"skip enable 1 3\"), \
|
|
ranges (e.g. \"skip enable 4-8\"), or both (e.g. \"skip enable 1 3 4-8\").\n\n\
|
|
If you don't specify any numbers or ranges, we'll enable all skip entries.\n\n\
|
|
Usage: skip enable [NUMBERS AND/OR RANGES]"),
|
|
&skiplist);
|
|
|
|
add_cmd ("disable", class_breakpoint, skip_disable_command, _("\
|
|
Disable skip entries. You can specify numbers (e.g. \"skip disable 1 3\"), \
|
|
ranges (e.g. \"skip disable 4-8\"), or both (e.g. \"skip disable 1 3 4-8\").\n\n\
|
|
If you don't specify any numbers or ranges, we'll disable all skip entries.\n\n\
|
|
Usage: skip disable [NUMBERS AND/OR RANGES]"),
|
|
&skiplist);
|
|
|
|
add_cmd ("delete", class_breakpoint, skip_delete_command, _("\
|
|
Delete skip entries. You can specify numbers (e.g. \"skip delete 1 3\"), \
|
|
ranges (e.g. \"skip delete 4-8\"), or both (e.g. \"skip delete 1 3 4-8\").\n\n\
|
|
If you don't specify any numbers or ranges, we'll delete all skip entries.\n\n\
|
|
Usage: skip delete [NUMBERS AND/OR RANGES]"),
|
|
&skiplist);
|
|
|
|
add_info ("skip", skip_info, _("\
|
|
Display the status of skips. You can specify numbers (e.g. \"skip info 1 3\"), \
|
|
ranges (e.g. \"skip info 4-8\"), or both (e.g. \"skip info 1 3 4-8\").\n\n\
|
|
If you don't specify any numbers or ranges, we'll show all skips.\n\n\
|
|
Usage: skip info [NUMBERS AND/OR RANGES]\n\
|
|
The \"Type\" column indicates one of:\n\
|
|
\tfile - ignored file\n\
|
|
\tfunction - ignored function"));
|
|
}
|