112e8700a6
This patch finalizes the C++ conversion of the ui-out subsystem, by turning the ui_out and ui_out_impl structures into a single class hierarchy. ui_out functions are turned into virtual methods of that new class, so as a result there are a lot of call sites to update. In the previous version of the patchset, there were separate ui_out and ui_out_impl classes, but it wasn't really useful and added boilerplate. In this version there is simply an ui_out base class that is extended for CLI, TUI and MI. It's a bit hard to maintain a ChangeLog for such a big patch, I did my best but I'm sure there are some missing or outdated info in there... gdb/ChangeLog: * ui-out.h (ui_out_begin, ui_out_end, ui_out_table_header, ui_out_table_body, ui_out_field_int, ui_out_field_fmt_int, ui_out_field_core_addr, ui_out_field_string, ui_out_field_stream, ui_out_field_fmt, ui_out_field_skip, ui_out_spaces, ui_out_text, ui_out_message, ui_out_wrap_hint, ui_out_flush, ui_out_test_flags, ui_out_query_field, ui_out_is_mi_like_p, ui_out_redirect): Remove, replace with a method in class ui_out. (table_begin_ftype): Remove, replace with pure virtual method in class ui_out. (table_body_ftype): Likewise. (table_end_ftype): Likewise. (table_header_ftype): Likewise. (ui_out_begin_ftype): Likewise. (ui_out_end_ftype): Likewise. (field_int_ftype): Likewise. (field_skip_ftype): Likewise. (field_string_ftype): Likewise. (field_fmt_ftype): Likewise. (spaces_ftype): Likewise. (text_ftype): Likewise. (message_ftype): Likewise. (wrap_hint_ftype): Likewise. (flush_ftype): Likewise. (redirect_ftype): Likewise. (data_destroy_ftype): Likewise. (struct ui_out_impl): Remove, replace with class ui_out. (ui_out_new): Remove. (class ui_out): New class. * ui-out.c (struct ui_out): Remove, replaced with class ui_out. (current_level): Remove, replace with ui_out method. (push_level): Likewise. (pop_level): Likewise. (uo_table_begin, uo_table_body, uo_table_end, uo_table_header, uo_begin, uo_end, uo_field_int, uo_field_skip, uo_field_fmt, uo_spaces, uo_text, uo_message, uo_wrap_hint, uo_flush, uo_redirect, uo_field_string): Remove. (ui_out_table_begin): Replace with ... (ui_out::table_begin): ... this. (ui_out_table_body): Replace with ... (ui_out::table_body): ... this. (ui_out_table_end): Replace with ... (ui_out::table_end): ... this. (ui_out_table_header): Replace with ... (ui_out::table_header): ... this. (ui_out_begin): Replace with ... (ui_out::begin): ... this. (ui_out_end): Replace with ... (ui_out::end): ... this. (ui_out_field_int): Replace with ... (ui_out::field_int): ... this. (ui_out_field_fmt_int): Replace with ... (ui_out::field_fmt_int): ... this. (ui_out_field_core_addr): Replace with ... (ui_out::field_core_addr): ... this. (ui_out_field_stream): Replace with ... (ui_out::field_stream): ... this. (ui_out_field_skip): Replace with ... (ui_out::field_skip): ... this. (ui_out_field_string): Replace with ... (ui_out::field_string): ... this. (ui_out_field_fmt): Replace with ... (ui_out::field_fmt): ... this. (ui_out_spaces): Replace with ... (ui_out::spaces): ... this. (ui_out_text): Replace with ... (ui_out::text): ... this. (ui_out_message): Replace with ... (ui_out::message): ... this. (ui_out_wrap_hint): Replace with ... (ui_out::wrap_hint): ... this. (ui_out_flush): Replace with ... (ui_out::flush): ... this. (ui_out_redirect): Replace with ... (ui_out::redirect): ... this. (ui_out_test_flags): Replace with ... (ui_out::test_flags): ... this. (ui_out_is_mi_like_p): Replace with ... (ui_out::is_mi_like_p): ... this. (verify_field): Replace with ... (ui_out::verify_field): ... this. (ui_out_query_field): Replace with ... (ui_out::query_table_field): ... this. (ui_out_data): Remove. (ui_out_new): Remove, replace with ... (ui_out::ui_out): ... this constructor. (do_cleanup_table_end, make_cleanup_ui_out_tuple_begin_end, do_cleanup_end, make_cleanup_ui_out_tuple_begin_end, make_cleanup_ui_out_list_begin_end): Update fallouts of struct ui_out -> class ui_out change. * cli-out.c (cli_out_data): Remove. (cli_uiout_dtor): Remove. (cli_table_begin): Replace with ... (cli_ui_out::do_table_begin): ... this new method. (cli_table_body): Replace with ... (cli_ui_out::do_table_body): ... this new method. (cli_table_end): Replace with ... (cli_ui_out::do_table_end): ... this new method. (cli_table_header): Replace with ... (cli_ui_out::do_table_header): ... this new method. (cli_begin): Replace with ... (cli_ui_out::do_begin): ... this new method. (cli_end): Replace with ... (cli_ui_out::do_end): ... this new method. (cli_field_int): Replace with ... (cli_ui_out::do_field_int): ... this new method. (cli_field_skip): Replace with ... (cli_ui_out::do_field_skip): ... this new method. (cli_field_string): Replace with ... (cli_ui_out::do_field_string): ... this new method. (cli_field_fmt): Replace with ... (cli_ui_out::do_field_fmt): ... this new method. (cli_spaces): Replace with ... (cli_ui_out::do_spaces): ... this new method. (cli_text): Replace with ... (cli_ui_out::do_text): ... this new method. (cli_message): Replace with ... (cli_ui_out::do_message): ... this new method. (cli_wrap_hint): Replace with ... (cli_ui_out::do_wrap_hint): ... this new method. (cli_flush): Replace with ... (cli_ui_out::do_flush): ... this new method. (cli_redirect): Replace with ... (cli_ui_out::do_redirect): ... this new method. (out_field_fmt): Replace with ... (cli_ui_out::out_field_fmt): ... this new method. (field_separator): Replace with ... (cli_ui_out::field_separator): ... this new method. (cli_out_set_stream): Replace with ... (cli_ui_out::set_stream): ... this new method. (cli_ui_out_impl): Remove. (cli_out_data_ctor): Remove. (cli_ui_out_impl::cli_ui_out_impl): New constructor. (cli_ui_out_impl::~cli_ui_out_impl): New destructor. (cli_out_new): Change return type to cli_ui_out *, instantiate a cli_ui_out. * cli-out.h (cli_ui_out_data): Remove, replace with class cli_ui_out. (class cli_ui_out): New class. (cli_ui_out_impl): Remove. (cli_out_data_ctor): Remove. (cli_out_new): Change return type to cli_ui_out*. (cli_out_set_stream): Remove. * cli/cli-interp.c (struct cli_interp) <cli_uiout>: Change type to cli_ui_out*. (cli_interpreter_resume): Adapt. (cli_interpreter_exec): Adapt. * mi/mi-out.c (mi_ui_out_data, mi_out_data): Remove. (mi_ui_out_impl): Remove. (mi_table_begin): Replace with ... (mi_ui_out::do_table_begin): ... this. (mi_table_body): Replace with ... (mi_ui_out::do_table_body): ... this. (mi_table_end): Replace with ... (mi_ui_out::do_table_end): ... this. (mi_table_header): Replace with ... (mi_ui_out::do_table_header): ... this. (mi_begin): Replace with ... (mi_ui_out::do_begin): ... this. (mi_end): Replace with ... (mi_ui_out::do_end): ... this. (mi_field_int): Replace with ... (mi_ui_out::do_field_int): ... this. (mi_field_skip): Replace with ... (mi_ui_out::do_field_skip): ... this. (mi_field_string): Replace with ... (mi_ui_out::do_field_string): ... this. (mi_field_fmt): Replace with ... (mi_ui_out::do_field_fmt): ... this. (mi_spaces): Replace with ... (mi_ui_out::do_spaces): ... this. (mi_text): Replace with ... (mi_ui_out::do_text): ... this. (mi_message): Replace with ... (mi_ui_out::do_message): ... this. (mi_wrap_hint): Replace with ... (mi_ui_out::do_wrap_hint): ... this. (mi_flush): Replace with ... (mi_ui_out::do_flush): ... this. (mi_redirect): Replace with ... (mi_ui_out::do_redirect): (field_separator): Replace with ... (mi_ui_out::field_separator): (mi_open): Replace with ... (mi_ui_out::open): ... this. (mi_close): Replace with ... (mi_ui_out::close): ... this. (mi_out_rewind): Replace with ... (mi_ui_out::rewind): ... this. (mi_out_put): Replace with ... (mi_ui_out::put): ... this. (mi_version): Replace with ... (mi_ui_out::version): ... this. (mi_out_data_ctor): Replace with ... (mi_ui_out::mi_ui_out): ... this. (mi_out_data_dtor): Replace with ... (mi_ui_out::~mi_ui_out): ... this. (mi_out_new): Change return type to mi_ui_out*, instantiate an mi_ui_out object. (as_mi_ui_out): New function. (mi_version): Update fallouts of struct ui_out to class ui_out transition. (mi_out_put): Likewise. (mi_out_rewind): Likewise. * mi/mi-out.h (mi_out_new): Change return type to mi_ui_out*. * tui/tui-out.c (tui_ui_out_data, tui_out_data, tui_ui_out_impl): Remove. (tui_field_int): Replace with ... (tui_ui_out::do_field_int): ... this. (tui_field_string): Replace with ... (tui_ui_out::do_field_string): ... this. (tui_field_fmt): Replace with ... (tui_ui_out::do_field_fmt): ... this. (tui_text): Replace with ... (tui_ui_out::do_text): ... this. (tui_out_new): Change return type to tui_ui_out*, instantiate tui_ui_out object. (tui_ui_out::tui_ui_out): New. * tui/tui-out.h: New file. * tui/tui.h (tui_out_new): Move declaration to tui/tui-out.h. * tui/tui-io.c: Include tui/tui-out.h. (tui_old_uiout): Change type to cli_ui_out*. (tui_setup_io): Use dynamic_cast. * tui/tui-io.h (tui_old_uiout): Change type to cli_ui_out*. * tui/tui-interp.c (tui_resume): Adapt. * ada-lang.c (print_it_exception): Update fallouts of struct ui_out to class ui_out transition. (print_one_exception): Likewise. (print_mention_exception): Likewise. * ada-tasks.c (print_ada_task_info): Likewise. (info_task): Likewise. (task_command): Likewise. * auto-load.c (print_script): Likewise. (auto_load_info_scripts): Likewise. (info_auto_load_cmd): Likewise. * break-catch-sig.c (signal_catchpoint_print_one): Likewise. * break-catch-syscall.c (print_it_catch_syscall): Likewise. (print_one_catch_syscall): Likewise. * break-catch-throw.c (print_it_exception_catchpoint): Likewise. (print_one_exception_catchpoint): Likewise. (print_one_detail_exception_catchpoint): Likewise. (print_mention_exception_catchpoint): Likewise. * breakpoint.c (maybe_print_thread_hit_breakpoint): Likewise. (print_solib_event): Likewise. (watchpoint_check): Likewise. (wrap_indent_at_field): Likewise. (print_breakpoint_location): Likewise. (output_thread_groups): Likewise. (print_one_breakpoint_location): Likewise. (breakpoint_1): Likewise. (default_collect_info): Likewise. (watchpoints_info): Likewise. (print_it_catch_fork): Likewise. (print_one_catch_fork): Likewise. (print_it_catch_vfork): Likewise. (print_one_catch_vfork): Likewise. (print_it_catch_solib): Likewise. (print_one_catch_solib): Likewise. (print_it_catch_exec): Likewise. (print_one_catch_exec): Likewise. (mention): Likewise. (print_it_ranged_breakpoint): Likewise. (print_one_ranged_breakpoint): Likewise. (print_one_detail_ranged_breakpoint): Likewise. (print_mention_ranged_breakpoint): Likewise. (print_it_watchpoint): Likewise. (print_mention_watchpoint): Likewise. (print_it_masked_watchpoint): Likewise. (print_one_detail_masked_watchpoint): Likewise. (print_mention_masked_watchpoint): Likewise. (bkpt_print_it): Likewise. (tracepoint_print_one_detail): Likewise. (tracepoint_print_mention): Likewise. (update_static_tracepoint): Likewise. (tracepoints_info): Likewise. (save_breakpoints): Likewise. * cli/cli-cmds.c (complete_command): Likewise. * cli/cli-logging.c (set_logging_redirect): Likewise. (pop_output_files): Likewise. (handle_redirections): Likewise. * cli/cli-script.c (print_command_lines): Likewise. * cli/cli-setshow.c (do_show_command): Likewise. (cmd_show_list): Likewise. * cp-abi.c (list_cp_abis): Likewise. (show_cp_abi_cmd): Likewise. * darwin-nat-info.c (darwin_debug_regions_recurse): Likewise. * disasm.c (gdb_pretty_print_insn): Likewise. (do_mixed_source_and_assembly_deprecated): Likewise. (do_mixed_source_and_assembly): Likewise. * gdb_bfd.c (print_one_bfd): Likewise. (maintenance_info_bfds): Likewise. * guile/scm-breakpoint.c (gdbscm_breakpoint_commands): Likewise. * guile/scm-ports.c (ioscm_with_output_to_port_worker): Likewise. * i386-linux-tdep.c (i386_linux_handle_segmentation_fault): Likewise. * i386-tdep.c (i386_mpx_print_bounds): Likewise. * infcmd.c (run_command_1): Likewise. (print_return_value_1): Likewise. * inferior.c (print_selected_inferior): Likewise. (print_inferior): Likewise. * infrun.c (print_end_stepping_range_reason): Likewise. (print_signal_exited_reason): Likewise. (print_exited_reason): Likewise. (print_signal_received_reason): Likewise. (print_no_history_reason): Likewise. * interps.c (interp_set): Likewise. * linespec.c (decode_line_full): Likewise. * linux-thread-db.c (info_auto_load_libthread_db): Likewise. * mi/mi-cmd-env.c (mi_cmd_env_pwd): Likewise. (mi_cmd_env_path): Likewise. (mi_cmd_env_dir): Likewise. (mi_cmd_inferior_tty_show): Likewise. * mi/mi-cmd-file.c (mi_cmd_file_list_exec_source_file): Likewise. (print_partial_file_name): Likewise. (mi_cmd_file_list_exec_source_files): Likewise. * mi/mi-cmd-info.c (mi_cmd_info_ada_exceptions): Likewise. (mi_cmd_info_gdb_mi_command): Likewise. * mi/mi-cmd-stack.c (mi_cmd_stack_info_depth): Likewise. (mi_cmd_stack_list_args): Likewise. (list_arg_or_local): Likewise. * mi/mi-cmd-var.c (print_varobj): Likewise. (mi_cmd_var_create): Likewise. (mi_cmd_var_delete): Likewise. (mi_cmd_var_set_format): Likewise. (mi_cmd_var_show_format): Likewise. (mi_cmd_var_info_num_children): Likewise. (mi_cmd_var_list_children): Likewise. (mi_cmd_var_info_type): Likewise. (mi_cmd_var_info_path_expression): Likewise. (mi_cmd_var_info_expression): Likewise. (mi_cmd_var_show_attributes): Likewise. (mi_cmd_var_evaluate_expression): Likewise. (mi_cmd_var_assign): Likewise. (varobj_update_one): Likewise. * mi/mi-interp.c (as_mi_interp): Likewise. (mi_on_normal_stop_1): Likewise. (mi_tsv_modified): Likewise. (mi_breakpoint_created): Likewise. (mi_breakpoint_modified): Likewise. (mi_solib_loaded): Likewise. (mi_solib_unloaded): Likewise. (mi_command_param_changed): Likewise. (mi_memory_changed): Likewise. (mi_user_selected_context_changed): Likewise. * mi/mi-main.c (print_one_inferior): Likewise. (output_cores): Likewise. (list_available_thread_groups): Likewise. (mi_cmd_data_list_register_names): Likewise. (mi_cmd_data_list_changed_registers): Likewise. (output_register): Likewise. (mi_cmd_data_evaluate_expression): Likewise. (mi_cmd_data_read_memory): Likewise. (mi_cmd_data_read_memory_bytes): Likewise. (mi_cmd_list_features): Likewise. (mi_cmd_list_target_features): Likewise. (mi_cmd_add_inferior): Likewise. (mi_execute_command): Likewise. (mi_load_progress): Likewise. (print_variable_or_computed): Likewise. (mi_cmd_trace_frame_collected): Likewise. * mi/mi-symbol-cmds.c (mi_cmd_symbol_list_lines): Likewise. * osdata.c (info_osdata_command): Likewise. * probe.c (gen_ui_out_table_header_info): Likewise. (print_ui_out_not_applicables): Likewise. (print_ui_out_info): Likewise. (info_probes_for_ops): Likewise. (enable_probes_command): Likewise. (disable_probes_command): Likewise. * progspace.c (print_program_space): Likewise. * python/py-breakpoint.c (bppy_get_commands): Likewise. * python/py-framefilter.c (py_print_type): Likewise. (py_print_value): Likewise. (py_print_single_arg): Likewise. (enumerate_args): Likewise. (enumerate_locals): Likewise. (py_print_args): Likewise. (py_print_frame): Likewise. * record-btrace.c (btrace_ui_out_decode_error): Likewise. (btrace_call_history_insn_range): Likewise. (btrace_call_history_src_line): Likewise. (btrace_call_history): Likewise. * remote.c (show_remote_cmd): Likewise. * skip.c (skip_info): Likewise. * solib.c (info_sharedlibrary_command): Likewise. * source.c (print_source_lines_base): Likewise. * spu-tdep.c (info_spu_event_command): Likewise. (info_spu_signal_command): Likewise. (info_spu_mailbox_list): Likewise. (info_spu_dma_cmdlist): Likewise. (info_spu_dma_command): Likewise. (info_spu_proxydma_command): Likewise. * stack.c (print_stack_frame): Likewise. (print_frame_arg): Likewise. (read_frame_arg): Likewise. (print_frame_args): Likewise. (print_frame_info): Likewise. (print_frame): Likewise. * symfile.c (load_progress): Likewise. (generic_load): Likewise. (print_transfer_performance): Likewise. * thread.c (do_captured_list_thread_ids): Likewise. (print_thread_info_1): Likewise. (restore_selected_frame): Likewise. (do_captured_thread_select): Likewise. (print_selected_thread_frame): Likewise. * top.c (execute_command_to_string): Likewise. * tracepoint.c (tvariables_info_1): Likewise. (trace_status_mi): Likewise. (tfind_1): Likewise. (print_one_static_tracepoint_marker): Likewise. (info_static_tracepoint_markers_command): Likewise. * utils.c (do_ui_out_redirect_pop): Likewise. (fputs_maybe_filtered): Likewise.
744 lines
20 KiB
C
744 lines
20 KiB
C
/* Skipping uninteresting files and functions while stepping.
|
|
|
|
Copyright (C) 2011-2016 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 "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 "breakpoint.h" /* for get_sal_arch () */
|
|
#include "source.h"
|
|
#include "filenames.h"
|
|
#include "fnmatch.h"
|
|
#include "gdb_regex.h"
|
|
|
|
struct skiplist_entry
|
|
{
|
|
int number;
|
|
|
|
/* Non-zero if FILE is a glob-style pattern.
|
|
Otherewise it is the plain file name (possibly with directories). */
|
|
int file_is_glob;
|
|
|
|
/* The name of the file or NULL.
|
|
The skiplist entry owns this pointer. */
|
|
char *file;
|
|
|
|
/* Non-zero if FUNCTION is a regexp.
|
|
Otherwise it is a plain function name (possibly with arguments,
|
|
for C++). */
|
|
int function_is_regexp;
|
|
|
|
/* The name of the function or NULL.
|
|
The skiplist entry owns this pointer. */
|
|
char *function;
|
|
|
|
/* If this is a function regexp, the compiled form. */
|
|
regex_t compiled_function_regexp;
|
|
|
|
/* Non-zero if the function regexp has been compiled. */
|
|
int compiled_function_regexp_is_valid;
|
|
|
|
int enabled;
|
|
|
|
struct skiplist_entry *next;
|
|
};
|
|
|
|
static void add_skiplist_entry (struct skiplist_entry *e);
|
|
|
|
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)
|
|
|
|
/* Create a skip object. */
|
|
|
|
static struct skiplist_entry *
|
|
make_skip_entry (int file_is_glob, const char *file,
|
|
int function_is_regexp, const char *function)
|
|
{
|
|
struct skiplist_entry *e = XCNEW (struct skiplist_entry);
|
|
|
|
gdb_assert (file != NULL || function != NULL);
|
|
if (file_is_glob)
|
|
gdb_assert (file != NULL);
|
|
if (function_is_regexp)
|
|
gdb_assert (function != NULL);
|
|
|
|
if (file != NULL)
|
|
e->file = xstrdup (file);
|
|
if (function != NULL)
|
|
e->function = xstrdup (function);
|
|
e->file_is_glob = file_is_glob;
|
|
e->function_is_regexp = function_is_regexp;
|
|
e->enabled = 1;
|
|
|
|
return e;
|
|
}
|
|
|
|
/* Free a skiplist entry. */
|
|
|
|
static void
|
|
free_skiplist_entry (struct skiplist_entry *e)
|
|
{
|
|
xfree (e->file);
|
|
xfree (e->function);
|
|
if (e->function_is_regexp && e->compiled_function_regexp_is_valid)
|
|
regfree (&e->compiled_function_regexp);
|
|
xfree (e);
|
|
}
|
|
|
|
/* Wrapper to free_skiplist_entry for use as a cleanup. */
|
|
|
|
static void
|
|
free_skiplist_entry_cleanup (void *e)
|
|
{
|
|
free_skiplist_entry ((struct skiplist_entry *) e);
|
|
}
|
|
|
|
/* Create a cleanup to free skiplist entry E. */
|
|
|
|
static struct cleanup *
|
|
make_free_skiplist_entry_cleanup (struct skiplist_entry *e)
|
|
{
|
|
return make_cleanup (free_skiplist_entry_cleanup, e);
|
|
}
|
|
|
|
static void
|
|
skip_file_command (char *arg, int from_tty)
|
|
{
|
|
struct symtab *symtab;
|
|
const char *filename = NULL;
|
|
|
|
/* If no argument was given, try to default to the last
|
|
displayed codepoint. */
|
|
if (arg == NULL)
|
|
{
|
|
symtab = get_last_displayed_symtab ();
|
|
if (symtab == NULL)
|
|
error (_("No default file now."));
|
|
|
|
/* It is not a typo, symtab_to_filename_for_display woule be needlessly
|
|
ambiguous. */
|
|
filename = symtab_to_fullname (symtab);
|
|
}
|
|
else
|
|
filename = arg;
|
|
|
|
add_skiplist_entry (make_skip_entry (0, filename, 0, NULL));
|
|
|
|
printf_filtered (_("File %s will be skipped when stepping.\n"), filename);
|
|
}
|
|
|
|
/* Create a skiplist entry for the given function NAME and add it to the
|
|
list. */
|
|
|
|
static void
|
|
skip_function (const char *name)
|
|
{
|
|
add_skiplist_entry (make_skip_entry (0, NULL, 0, name));
|
|
|
|
printf_filtered (_("Function %s will be skipped when stepping.\n"), name);
|
|
}
|
|
|
|
static void
|
|
skip_function_command (char *arg, int from_tty)
|
|
{
|
|
/* Default to the current function if no argument is given. */
|
|
if (arg == NULL)
|
|
{
|
|
const char *name = NULL;
|
|
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, NULL, NULL))
|
|
{
|
|
error (_("No function found containing current program point %s."),
|
|
paddress (get_current_arch (), pc));
|
|
}
|
|
skip_function (name);
|
|
return;
|
|
}
|
|
|
|
skip_function (arg);
|
|
}
|
|
|
|
/* Compile the regexp in E.
|
|
An error is thrown if there's an error.
|
|
MESSAGE is used as a prefix of the error message. */
|
|
|
|
static void
|
|
compile_skip_regexp (struct skiplist_entry *e, const char *message)
|
|
{
|
|
int code;
|
|
int flags = REG_NOSUB;
|
|
|
|
#ifdef REG_EXTENDED
|
|
flags |= REG_EXTENDED;
|
|
#endif
|
|
|
|
gdb_assert (e->function_is_regexp && e->function != NULL);
|
|
|
|
code = regcomp (&e->compiled_function_regexp, e->function, flags);
|
|
if (code != 0)
|
|
{
|
|
char *err = get_regcomp_error (code, &e->compiled_function_regexp);
|
|
|
|
make_cleanup (xfree, err);
|
|
error (_("%s: %s"), message, err);
|
|
}
|
|
e->compiled_function_regexp_is_valid = 1;
|
|
}
|
|
|
|
/* Process "skip ..." that does not match "skip file" or "skip function". */
|
|
|
|
static void
|
|
skip_command (char *arg, int from_tty)
|
|
{
|
|
const char *file = NULL;
|
|
const char *gfile = NULL;
|
|
const char *function = NULL;
|
|
const char *rfunction = NULL;
|
|
char **argv;
|
|
struct cleanup *cleanups;
|
|
struct skiplist_entry *e;
|
|
int i;
|
|
|
|
if (arg == NULL)
|
|
{
|
|
skip_function_command (arg, from_tty);
|
|
return;
|
|
}
|
|
|
|
argv = buildargv (arg);
|
|
cleanups = make_cleanup_freeargv (argv);
|
|
|
|
for (i = 0; argv[i] != NULL; ++i)
|
|
{
|
|
const char *p = argv[i];
|
|
const char *value = argv[i + 1];
|
|
|
|
if (strcmp (p, "-fi") == 0
|
|
|| strcmp (p, "-file") == 0)
|
|
{
|
|
if (value == NULL)
|
|
error (_("Missing value for %s option."), p);
|
|
file = value;
|
|
++i;
|
|
}
|
|
else if (strcmp (p, "-gfi") == 0
|
|
|| strcmp (p, "-gfile") == 0)
|
|
{
|
|
if (value == NULL)
|
|
error (_("Missing value for %s option."), p);
|
|
gfile = value;
|
|
++i;
|
|
}
|
|
else if (strcmp (p, "-fu") == 0
|
|
|| strcmp (p, "-function") == 0)
|
|
{
|
|
if (value == NULL)
|
|
error (_("Missing value for %s option."), p);
|
|
function = value;
|
|
++i;
|
|
}
|
|
else if (strcmp (p, "-rfu") == 0
|
|
|| strcmp (p, "-rfunction") == 0)
|
|
{
|
|
if (value == NULL)
|
|
error (_("Missing value for %s option."), p);
|
|
rfunction = value;
|
|
++i;
|
|
}
|
|
else if (*p == '-')
|
|
error (_("Invalid skip option: %s"), p);
|
|
else if (i == 0)
|
|
{
|
|
/* Assume the user entered "skip FUNCTION-NAME".
|
|
FUNCTION-NAME may be `foo (int)', and therefore we pass the
|
|
complete original arg to skip_function command as if the user
|
|
typed "skip function arg". */
|
|
do_cleanups (cleanups);
|
|
skip_function_command (arg, from_tty);
|
|
return;
|
|
}
|
|
else
|
|
error (_("Invalid argument: %s"), p);
|
|
}
|
|
|
|
if (file != NULL && gfile != NULL)
|
|
error (_("Cannot specify both -file and -gfile."));
|
|
|
|
if (function != NULL && rfunction != NULL)
|
|
error (_("Cannot specify both -function and -rfunction."));
|
|
|
|
/* This shouldn't happen as "skip" by itself gets punted to
|
|
skip_function_command. */
|
|
gdb_assert (file != NULL || gfile != NULL
|
|
|| function != NULL || rfunction != NULL);
|
|
|
|
e = make_skip_entry (gfile != NULL, file ? file : gfile,
|
|
rfunction != NULL, function ? function : rfunction);
|
|
if (rfunction != NULL)
|
|
{
|
|
struct cleanup *rf_cleanups = make_free_skiplist_entry_cleanup (e);
|
|
|
|
compile_skip_regexp (e, _("regexp"));
|
|
discard_cleanups (rf_cleanups);
|
|
}
|
|
add_skiplist_entry (e);
|
|
|
|
/* I18N concerns drive some of the choices here (we can't piece together
|
|
the output too much). OTOH we want to keep this simple. Therefore the
|
|
only polish we add to the output is to append "(s)" to "File" or
|
|
"Function" if they're a glob/regexp. */
|
|
{
|
|
const char *file_to_print = file != NULL ? file : gfile;
|
|
const char *function_to_print = function != NULL ? function : rfunction;
|
|
const char *file_text = gfile != NULL ? _("File(s)") : _("File");
|
|
const char *lower_file_text = gfile != NULL ? _("file(s)") : _("file");
|
|
const char *function_text
|
|
= rfunction != NULL ? _("Function(s)") : _("Function");
|
|
|
|
if (function_to_print == NULL)
|
|
{
|
|
printf_filtered (_("%s %s will be skipped when stepping.\n"),
|
|
file_text, file_to_print);
|
|
}
|
|
else if (file_to_print == NULL)
|
|
{
|
|
printf_filtered (_("%s %s will be skipped when stepping.\n"),
|
|
function_text, function_to_print);
|
|
}
|
|
else
|
|
{
|
|
printf_filtered (_("%s %s in %s %s will be skipped"
|
|
" when stepping.\n"),
|
|
function_text, function_to_print,
|
|
lower_file_text, file_to_print);
|
|
}
|
|
}
|
|
|
|
do_cleanups (cleanups);
|
|
}
|
|
|
|
static void
|
|
skip_info (char *arg, int from_tty)
|
|
{
|
|
struct skiplist_entry *e;
|
|
int num_printable_entries = 0;
|
|
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 == NULL || number_is_in_list (arg, e->number))
|
|
num_printable_entries++;
|
|
|
|
if (num_printable_entries == 0)
|
|
{
|
|
if (arg == NULL)
|
|
current_uiout->message (_("Not skipping any files or functions.\n"));
|
|
else
|
|
current_uiout->message (
|
|
_("No skiplist entries found with number %s.\n"), arg);
|
|
|
|
return;
|
|
}
|
|
|
|
tbl_chain = make_cleanup_ui_out_table_begin_end (current_uiout, 6,
|
|
num_printable_entries,
|
|
"SkiplistTable");
|
|
|
|
current_uiout->table_header (5, ui_left, "number", "Num"); /* 1 */
|
|
current_uiout->table_header (3, ui_left, "enabled", "Enb"); /* 2 */
|
|
current_uiout->table_header (4, ui_right, "regexp", "Glob"); /* 3 */
|
|
current_uiout->table_header (20, ui_left, "file", "File"); /* 4 */
|
|
current_uiout->table_header (2, ui_right, "regexp", "RE"); /* 5 */
|
|
current_uiout->table_header (40, ui_noalign, "function", "Function"); /* 6 */
|
|
current_uiout->table_body ();
|
|
|
|
ALL_SKIPLIST_ENTRIES (e)
|
|
{
|
|
struct cleanup *entry_chain;
|
|
|
|
QUIT;
|
|
if (arg != NULL && !number_is_in_list (arg, e->number))
|
|
continue;
|
|
|
|
entry_chain = make_cleanup_ui_out_tuple_begin_end (current_uiout,
|
|
"blklst-entry");
|
|
current_uiout->field_int ("number", e->number); /* 1 */
|
|
|
|
if (e->enabled)
|
|
current_uiout->field_string ("enabled", "y"); /* 2 */
|
|
else
|
|
current_uiout->field_string ("enabled", "n"); /* 2 */
|
|
|
|
if (e->file_is_glob)
|
|
current_uiout->field_string ("regexp", "y"); /* 3 */
|
|
else
|
|
current_uiout->field_string ("regexp", "n"); /* 3 */
|
|
|
|
current_uiout->field_string ("file",
|
|
e->file ? e->file : "<none>"); /* 4 */
|
|
if (e->function_is_regexp)
|
|
current_uiout->field_string ("regexp", "y"); /* 5 */
|
|
else
|
|
current_uiout->field_string ("regexp", "n"); /* 5 */
|
|
|
|
current_uiout->field_string (
|
|
"function", e->function ? e->function : "<none>"); /* 6 */
|
|
|
|
current_uiout->text ("\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 == NULL || 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 == NULL || 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 == NULL || number_is_in_list (arg, e->number))
|
|
{
|
|
if (b_prev != NULL)
|
|
b_prev->next = e->next;
|
|
else
|
|
skiplist_entry_chain = e->next;
|
|
|
|
free_skiplist_entry (e);
|
|
found = 1;
|
|
}
|
|
else
|
|
{
|
|
b_prev = e;
|
|
}
|
|
|
|
if (!found)
|
|
error (_("No skiplist entries found with number %s."), arg);
|
|
}
|
|
|
|
/* 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 == NULL)
|
|
skiplist_entry_chain = e;
|
|
else
|
|
{
|
|
while (e1->next)
|
|
e1 = e1->next;
|
|
e1->next = e;
|
|
}
|
|
}
|
|
|
|
/* Return non-zero if we're stopped at a file to be skipped. */
|
|
|
|
static int
|
|
skip_file_p (struct skiplist_entry *e,
|
|
const struct symtab_and_line *function_sal)
|
|
{
|
|
gdb_assert (e->file != NULL && !e->file_is_glob);
|
|
|
|
if (function_sal->symtab == NULL)
|
|
return 0;
|
|
|
|
/* Check first sole SYMTAB->FILENAME. It may not be a substring of
|
|
symtab_to_fullname as it may contain "./" etc. */
|
|
if (compare_filenames_for_search (function_sal->symtab->filename, e->file))
|
|
return 1;
|
|
|
|
/* Before we invoke realpath, which can get expensive when many
|
|
files are involved, do a quick comparison of the basenames. */
|
|
if (!basenames_may_differ
|
|
&& filename_cmp (lbasename (function_sal->symtab->filename),
|
|
lbasename (e->file)) != 0)
|
|
return 0;
|
|
|
|
/* Note: symtab_to_fullname caches its result, thus we don't have to. */
|
|
{
|
|
const char *fullname = symtab_to_fullname (function_sal->symtab);
|
|
|
|
if (compare_filenames_for_search (fullname, e->file))
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Return non-zero if we're stopped at a globbed file to be skipped. */
|
|
|
|
static int
|
|
skip_gfile_p (struct skiplist_entry *e,
|
|
const struct symtab_and_line *function_sal)
|
|
{
|
|
gdb_assert (e->file != NULL && e->file_is_glob);
|
|
|
|
if (function_sal->symtab == NULL)
|
|
return 0;
|
|
|
|
/* Check first sole SYMTAB->FILENAME. It may not be a substring of
|
|
symtab_to_fullname as it may contain "./" etc. */
|
|
if (gdb_filename_fnmatch (e->file, function_sal->symtab->filename,
|
|
FNM_FILE_NAME | FNM_NOESCAPE) == 0)
|
|
return 1;
|
|
|
|
/* Before we invoke symtab_to_fullname, which is expensive, do a quick
|
|
comparison of the basenames.
|
|
Note that we assume that lbasename works with glob-style patterns.
|
|
If the basename of the glob pattern is something like "*.c" then this
|
|
isn't much of a win. Oh well. */
|
|
if (!basenames_may_differ
|
|
&& gdb_filename_fnmatch (lbasename (e->file),
|
|
lbasename (function_sal->symtab->filename),
|
|
FNM_FILE_NAME | FNM_NOESCAPE) != 0)
|
|
return 0;
|
|
|
|
/* Note: symtab_to_fullname caches its result, thus we don't have to. */
|
|
{
|
|
const char *fullname = symtab_to_fullname (function_sal->symtab);
|
|
|
|
if (compare_glob_filenames_for_search (fullname, e->file))
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Return non-zero if we're stopped at a function to be skipped. */
|
|
|
|
static int
|
|
skip_function_p (struct skiplist_entry *e, const char *function_name)
|
|
{
|
|
gdb_assert (e->function != NULL && !e->function_is_regexp);
|
|
return strcmp_iw (function_name, e->function) == 0;
|
|
}
|
|
|
|
/* Return non-zero if we're stopped at a function regexp to be skipped. */
|
|
|
|
static int
|
|
skip_rfunction_p (struct skiplist_entry *e, const char *function_name)
|
|
{
|
|
gdb_assert (e->function != NULL && e->function_is_regexp
|
|
&& e->compiled_function_regexp_is_valid);
|
|
return (regexec (&e->compiled_function_regexp, function_name, 0, NULL, 0)
|
|
== 0);
|
|
}
|
|
|
|
/* See skip.h. */
|
|
|
|
int
|
|
function_name_is_marked_for_skip (const char *function_name,
|
|
const struct symtab_and_line *function_sal)
|
|
{
|
|
struct skiplist_entry *e;
|
|
|
|
if (function_name == NULL)
|
|
return 0;
|
|
|
|
ALL_SKIPLIST_ENTRIES (e)
|
|
{
|
|
int skip_by_file = 0;
|
|
int skip_by_function = 0;
|
|
|
|
if (!e->enabled)
|
|
continue;
|
|
|
|
if (e->file != NULL)
|
|
{
|
|
if (e->file_is_glob)
|
|
{
|
|
if (skip_gfile_p (e, function_sal))
|
|
skip_by_file = 1;
|
|
}
|
|
else
|
|
{
|
|
if (skip_file_p (e, function_sal))
|
|
skip_by_file = 1;
|
|
}
|
|
}
|
|
if (e->function != NULL)
|
|
{
|
|
if (e->function_is_regexp)
|
|
{
|
|
if (skip_rfunction_p (e, function_name))
|
|
skip_by_function = 1;
|
|
}
|
|
else
|
|
{
|
|
if (skip_function_p (e, function_name))
|
|
skip_by_function = 1;
|
|
}
|
|
}
|
|
|
|
/* If both file and function must match, make sure we don't errantly
|
|
exit if only one of them match. */
|
|
if (e->file != NULL && e->function != NULL)
|
|
{
|
|
if (skip_by_file && skip_by_function)
|
|
return 1;
|
|
}
|
|
/* Only one of file/function is specified. */
|
|
else if (skip_by_file || skip_by_function)
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Provide a prototype to silence -Wmissing-prototypes. */
|
|
extern initialize_file_ftype _initialize_step_skip;
|
|
|
|
void
|
|
_initialize_step_skip (void)
|
|
{
|
|
static struct cmd_list_element *skiplist = NULL;
|
|
struct cmd_list_element *c;
|
|
|
|
skiplist_entry_chain = 0;
|
|
skiplist_entry_count = 0;
|
|
|
|
add_prefix_cmd ("skip", class_breakpoint, skip_command, _("\
|
|
Ignore a function while stepping.\n\
|
|
\n\
|
|
Usage: skip [FUNCTION-NAME]\n\
|
|
skip [<file-spec>] [<function-spec>]\n\
|
|
If no arguments are given, ignore the current function.\n\
|
|
\n\
|
|
<file-spec> is one of:\n\
|
|
-fi|-file FILE-NAME\n\
|
|
-gfi|-gfile GLOB-FILE-PATTERN\n\
|
|
<function-spec> is one of:\n\
|
|
-fu|-function FUNCTION-NAME\n\
|
|
-rfu|-rfunction FUNCTION-NAME-REGULAR-EXPRESSION"),
|
|
&skiplist, "skip ", 1, &cmdlist);
|
|
|
|
c = add_cmd ("file", class_breakpoint, skip_file_command, _("\
|
|
Ignore a file while stepping.\n\
|
|
Usage: skip file [FILE-NAME]\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"));
|
|
}
|