forked from Imagelibrary/binutils-gdb
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.
651 lines
17 KiB
C
651 lines
17 KiB
C
/* Manages interpreters for GDB, the GNU debugger.
|
|
|
|
Copyright (C) 2000-2016 Free Software Foundation, Inc.
|
|
|
|
Written by Jim Ingham <jingham@apple.com> of Apple Computer, Inc.
|
|
|
|
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/>. */
|
|
|
|
/* This is just a first cut at separating out the "interpreter"
|
|
functions of gdb into self-contained modules. There are a couple
|
|
of open areas that need to be sorted out:
|
|
|
|
1) The interpreter explicitly contains a UI_OUT, and can insert itself
|
|
into the event loop, but it doesn't explicitly contain hooks for readline.
|
|
I did this because it seems to me many interpreters won't want to use
|
|
the readline command interface, and it is probably simpler to just let
|
|
them take over the input in their resume proc. */
|
|
|
|
#include "defs.h"
|
|
#include "gdbcmd.h"
|
|
#include "ui-out.h"
|
|
#include "event-loop.h"
|
|
#include "event-top.h"
|
|
#include "interps.h"
|
|
#include "completer.h"
|
|
#include "top.h" /* For command_loop. */
|
|
#include "continuations.h"
|
|
|
|
/* Each UI has its own independent set of interpreters. */
|
|
|
|
struct ui_interp_info
|
|
{
|
|
/* Each top level has its own independent set of interpreters. */
|
|
struct interp *interp_list;
|
|
struct interp *current_interpreter;
|
|
struct interp *top_level_interpreter;
|
|
|
|
/* The interpreter that is active while `interp_exec' is active, NULL
|
|
at all other times. */
|
|
struct interp *command_interpreter;
|
|
};
|
|
|
|
/* Get UI's ui_interp_info object. Never returns NULL. */
|
|
|
|
static struct ui_interp_info *
|
|
get_interp_info (struct ui *ui)
|
|
{
|
|
if (ui->interp_info == NULL)
|
|
ui->interp_info = XCNEW (struct ui_interp_info);
|
|
return ui->interp_info;
|
|
}
|
|
|
|
/* Get the current UI's ui_interp_info object. Never returns
|
|
NULL. */
|
|
|
|
static struct ui_interp_info *
|
|
get_current_interp_info (void)
|
|
{
|
|
return get_interp_info (current_ui);
|
|
}
|
|
|
|
struct interp
|
|
{
|
|
/* This is the name in "-i=" and set interpreter. */
|
|
const char *name;
|
|
|
|
/* Interpreters are stored in a linked list, this is the next
|
|
one... */
|
|
struct interp *next;
|
|
|
|
/* This is a cookie that an instance of the interpreter can use.
|
|
This is a bit confused right now as the exact initialization
|
|
sequence for it, and how it relates to the interpreter's uiout
|
|
object is a bit confused. */
|
|
void *data;
|
|
|
|
/* Has the init_proc been run? */
|
|
int inited;
|
|
|
|
const struct interp_procs *procs;
|
|
int quiet_p;
|
|
};
|
|
|
|
/* The magic initialization routine for this module. */
|
|
|
|
void _initialize_interpreter (void);
|
|
|
|
static struct interp *interp_lookup_existing (struct ui *ui,
|
|
const char *name);
|
|
|
|
/* interp_new - This allocates space for a new interpreter,
|
|
fills the fields from the inputs, and returns a pointer to the
|
|
interpreter. */
|
|
struct interp *
|
|
interp_new (const char *name, const struct interp_procs *procs, void *data)
|
|
{
|
|
struct interp *new_interp;
|
|
|
|
new_interp = XNEW (struct interp);
|
|
|
|
new_interp->name = xstrdup (name);
|
|
new_interp->data = data;
|
|
new_interp->quiet_p = 0;
|
|
new_interp->procs = procs;
|
|
new_interp->inited = 0;
|
|
|
|
return new_interp;
|
|
}
|
|
|
|
/* An interpreter factory. Maps an interpreter name to the factory
|
|
function that instantiates an interpreter by that name. */
|
|
|
|
struct interp_factory
|
|
{
|
|
/* This is the name in "-i=INTERP" and "interpreter-exec INTERP". */
|
|
const char *name;
|
|
|
|
/* The function that creates the interpreter. */
|
|
interp_factory_func func;
|
|
};
|
|
|
|
typedef struct interp_factory *interp_factory_p;
|
|
DEF_VEC_P(interp_factory_p);
|
|
|
|
/* The registered interpreter factories. */
|
|
static VEC(interp_factory_p) *interpreter_factories = NULL;
|
|
|
|
/* See interps.h. */
|
|
|
|
void
|
|
interp_factory_register (const char *name, interp_factory_func func)
|
|
{
|
|
struct interp_factory *f;
|
|
int ix;
|
|
|
|
/* Assert that no factory for NAME is already registered. */
|
|
for (ix = 0;
|
|
VEC_iterate (interp_factory_p, interpreter_factories, ix, f);
|
|
++ix)
|
|
if (strcmp (f->name, name) == 0)
|
|
{
|
|
internal_error (__FILE__, __LINE__,
|
|
_("interpreter factory already registered: \"%s\"\n"),
|
|
name);
|
|
}
|
|
|
|
f = XNEW (struct interp_factory);
|
|
f->name = name;
|
|
f->func = func;
|
|
VEC_safe_push (interp_factory_p, interpreter_factories, f);
|
|
}
|
|
|
|
/* Add interpreter INTERP to the gdb interpreter list. The
|
|
interpreter must not have previously been added. */
|
|
void
|
|
interp_add (struct ui *ui, struct interp *interp)
|
|
{
|
|
struct ui_interp_info *ui_interp = get_interp_info (ui);
|
|
|
|
gdb_assert (interp_lookup_existing (ui, interp->name) == NULL);
|
|
|
|
interp->next = ui_interp->interp_list;
|
|
ui_interp->interp_list = interp;
|
|
}
|
|
|
|
/* This sets the current interpreter to be INTERP. If INTERP has not
|
|
been initialized, then this will also run the init proc. If the
|
|
init proc is successful, return 1, if it fails, set the old
|
|
interpreter back in place and return 0. If we can't restore the
|
|
old interpreter, then raise an internal error, since we are in
|
|
pretty bad shape at this point.
|
|
|
|
The TOP_LEVEL parameter tells if this new interpreter is
|
|
the top-level one. The top-level is what is requested
|
|
on the command line, and is responsible for reporting general
|
|
notification about target state changes. For example, if
|
|
MI is the top-level interpreter, then it will always report
|
|
events such as target stops and new thread creation, even if they
|
|
are caused by CLI commands. */
|
|
int
|
|
interp_set (struct interp *interp, int top_level)
|
|
{
|
|
struct ui_interp_info *ui_interp = get_current_interp_info ();
|
|
struct interp *old_interp = ui_interp->current_interpreter;
|
|
int first_time = 0;
|
|
char buffer[64];
|
|
|
|
/* If we already have an interpreter, then trying to
|
|
set top level interpreter is kinda pointless. */
|
|
gdb_assert (!top_level || !ui_interp->current_interpreter);
|
|
gdb_assert (!top_level || !ui_interp->top_level_interpreter);
|
|
|
|
if (old_interp != NULL)
|
|
{
|
|
current_uiout->flush ();
|
|
if (old_interp->procs->suspend_proc
|
|
&& !old_interp->procs->suspend_proc (old_interp->data))
|
|
{
|
|
error (_("Could not suspend interpreter \"%s\"."),
|
|
old_interp->name);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
first_time = 1;
|
|
}
|
|
|
|
ui_interp->current_interpreter = interp;
|
|
if (top_level)
|
|
ui_interp->top_level_interpreter = interp;
|
|
|
|
/* We use interpreter_p for the "set interpreter" variable, so we need
|
|
to make sure we have a malloc'ed copy for the set command to free. */
|
|
if (interpreter_p != NULL
|
|
&& strcmp (interp->name, interpreter_p) != 0)
|
|
{
|
|
xfree (interpreter_p);
|
|
|
|
interpreter_p = xstrdup (interp->name);
|
|
}
|
|
|
|
/* Run the init proc. If it fails, try to restore the old interp. */
|
|
|
|
if (!interp->inited)
|
|
{
|
|
if (interp->procs->init_proc != NULL)
|
|
{
|
|
interp->data = interp->procs->init_proc (interp, top_level);
|
|
}
|
|
interp->inited = 1;
|
|
}
|
|
|
|
/* Do this only after the interpreter is initialized. */
|
|
current_uiout = interp->procs->ui_out_proc (interp);
|
|
|
|
/* Clear out any installed interpreter hooks/event handlers. */
|
|
clear_interpreter_hooks ();
|
|
|
|
if (interp->procs->resume_proc != NULL
|
|
&& (!interp->procs->resume_proc (interp->data)))
|
|
{
|
|
if (old_interp == NULL || !interp_set (old_interp, 0))
|
|
internal_error (__FILE__, __LINE__,
|
|
_("Failed to initialize new interp \"%s\" %s"),
|
|
interp->name, "and could not restore old interp!\n");
|
|
return 0;
|
|
}
|
|
|
|
if (!first_time && !interp_quiet_p (interp))
|
|
{
|
|
xsnprintf (buffer, sizeof (buffer),
|
|
"Switching to interpreter \"%.24s\".\n", interp->name);
|
|
current_uiout->text (buffer);
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
/* Look up the interpreter for NAME. If no such interpreter exists,
|
|
return NULL, otherwise return a pointer to the interpreter. */
|
|
|
|
static struct interp *
|
|
interp_lookup_existing (struct ui *ui, const char *name)
|
|
{
|
|
struct ui_interp_info *ui_interp = get_interp_info (ui);
|
|
struct interp *interp;
|
|
|
|
for (interp = ui_interp->interp_list;
|
|
interp != NULL;
|
|
interp = interp->next)
|
|
{
|
|
if (strcmp (interp->name, name) == 0)
|
|
return interp;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/* See interps.h. */
|
|
|
|
struct interp *
|
|
interp_lookup (struct ui *ui, const char *name)
|
|
{
|
|
struct interp_factory *factory;
|
|
struct interp *interp;
|
|
int ix;
|
|
|
|
if (name == NULL || strlen (name) == 0)
|
|
return NULL;
|
|
|
|
/* Only create each interpreter once per top level. */
|
|
interp = interp_lookup_existing (ui, name);
|
|
if (interp != NULL)
|
|
return interp;
|
|
|
|
for (ix = 0;
|
|
VEC_iterate (interp_factory_p, interpreter_factories, ix, factory);
|
|
++ix)
|
|
if (strcmp (factory->name, name) == 0)
|
|
{
|
|
interp = factory->func (name);
|
|
interp_add (ui, interp);
|
|
return interp;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/* See interps.h. */
|
|
|
|
void
|
|
set_top_level_interpreter (const char *name)
|
|
{
|
|
/* Find it. */
|
|
struct interp *interp = interp_lookup (current_ui, name);
|
|
|
|
if (interp == NULL)
|
|
error (_("Interpreter `%s' unrecognized"), name);
|
|
/* Install it. */
|
|
if (!interp_set (interp, 1))
|
|
error (_("Interpreter `%s' failed to initialize."), name);
|
|
}
|
|
|
|
/* Returns the current interpreter. */
|
|
|
|
struct ui_out *
|
|
interp_ui_out (struct interp *interp)
|
|
{
|
|
struct ui_interp_info *ui_interp = get_current_interp_info ();
|
|
|
|
if (interp == NULL)
|
|
interp = ui_interp->current_interpreter;
|
|
return interp->procs->ui_out_proc (interp);
|
|
}
|
|
|
|
int
|
|
current_interp_set_logging (int start_log, struct ui_file *out,
|
|
struct ui_file *logfile)
|
|
{
|
|
struct ui_interp_info *ui_interp = get_current_interp_info ();
|
|
struct interp *interp = ui_interp->current_interpreter;
|
|
|
|
if (interp == NULL
|
|
|| interp->procs->set_logging_proc == NULL)
|
|
return 0;
|
|
|
|
return interp->procs->set_logging_proc (interp, start_log, out, logfile);
|
|
}
|
|
|
|
/* Temporarily overrides the current interpreter. */
|
|
struct interp *
|
|
interp_set_temp (const char *name)
|
|
{
|
|
struct ui_interp_info *ui_interp = get_current_interp_info ();
|
|
struct interp *interp = interp_lookup (current_ui, name);
|
|
struct interp *old_interp = ui_interp->current_interpreter;
|
|
|
|
if (interp)
|
|
ui_interp->current_interpreter = interp;
|
|
return old_interp;
|
|
}
|
|
|
|
/* Returns the interpreter's cookie. */
|
|
|
|
void *
|
|
interp_data (struct interp *interp)
|
|
{
|
|
return interp->data;
|
|
}
|
|
|
|
/* Returns the interpreter's name. */
|
|
|
|
const char *
|
|
interp_name (struct interp *interp)
|
|
{
|
|
return interp->name;
|
|
}
|
|
|
|
/* Returns true if the current interp is the passed in name. */
|
|
int
|
|
current_interp_named_p (const char *interp_name)
|
|
{
|
|
struct ui_interp_info *ui_interp = get_current_interp_info ();
|
|
struct interp *interp = ui_interp->current_interpreter;
|
|
|
|
if (interp != NULL)
|
|
return (strcmp (interp->name, interp_name) == 0);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* The interpreter that was active when a command was executed.
|
|
Normally that'd always be CURRENT_INTERPRETER, except that MI's
|
|
-interpreter-exec command doesn't actually flip the current
|
|
interpreter when running its sub-command. The
|
|
`command_interpreter' global tracks when interp_exec is called
|
|
(IOW, when -interpreter-exec is called). If that is set, it is
|
|
INTERP in '-interpreter-exec INTERP "CMD"' or in 'interpreter-exec
|
|
INTERP "CMD". Otherwise, interp_exec isn't active, and so the
|
|
interpreter running the command is the current interpreter. */
|
|
|
|
struct interp *
|
|
command_interp (void)
|
|
{
|
|
struct ui_interp_info *ui_interp = get_current_interp_info ();
|
|
|
|
if (ui_interp->command_interpreter != NULL)
|
|
return ui_interp->command_interpreter;
|
|
else
|
|
return ui_interp->current_interpreter;
|
|
}
|
|
|
|
/* See interps.h. */
|
|
|
|
void
|
|
interp_pre_command_loop (struct interp *interp)
|
|
{
|
|
gdb_assert (interp != NULL);
|
|
|
|
if (interp->procs->pre_command_loop_proc != NULL)
|
|
interp->procs->pre_command_loop_proc (interp);
|
|
}
|
|
|
|
/* See interp.h */
|
|
|
|
int
|
|
interp_supports_command_editing (struct interp *interp)
|
|
{
|
|
if (interp->procs->supports_command_editing_proc != NULL)
|
|
return interp->procs->supports_command_editing_proc (interp);
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
interp_quiet_p (struct interp *interp)
|
|
{
|
|
struct ui_interp_info *ui_interp = get_current_interp_info ();
|
|
|
|
if (interp != NULL)
|
|
return interp->quiet_p;
|
|
else
|
|
return ui_interp->current_interpreter->quiet_p;
|
|
}
|
|
|
|
static int
|
|
interp_set_quiet (struct interp *interp, int quiet)
|
|
{
|
|
int old_val = interp->quiet_p;
|
|
|
|
interp->quiet_p = quiet;
|
|
return old_val;
|
|
}
|
|
|
|
/* interp_exec - This executes COMMAND_STR in the current
|
|
interpreter. */
|
|
|
|
struct gdb_exception
|
|
interp_exec (struct interp *interp, const char *command_str)
|
|
{
|
|
struct ui_interp_info *ui_interp = get_current_interp_info ();
|
|
|
|
struct gdb_exception ex;
|
|
struct interp *save_command_interp;
|
|
|
|
gdb_assert (interp->procs->exec_proc != NULL);
|
|
|
|
/* See `command_interp' for why we do this. */
|
|
save_command_interp = ui_interp->command_interpreter;
|
|
ui_interp->command_interpreter = interp;
|
|
|
|
ex = interp->procs->exec_proc (interp->data, command_str);
|
|
|
|
ui_interp->command_interpreter = save_command_interp;
|
|
|
|
return ex;
|
|
}
|
|
|
|
/* A convenience routine that nulls out all the common command hooks.
|
|
Use it when removing your interpreter in its suspend proc. */
|
|
void
|
|
clear_interpreter_hooks (void)
|
|
{
|
|
deprecated_print_frame_info_listing_hook = 0;
|
|
/*print_frame_more_info_hook = 0; */
|
|
deprecated_query_hook = 0;
|
|
deprecated_warning_hook = 0;
|
|
deprecated_interactive_hook = 0;
|
|
deprecated_readline_begin_hook = 0;
|
|
deprecated_readline_hook = 0;
|
|
deprecated_readline_end_hook = 0;
|
|
deprecated_context_hook = 0;
|
|
deprecated_target_wait_hook = 0;
|
|
deprecated_call_command_hook = 0;
|
|
deprecated_error_begin_hook = 0;
|
|
}
|
|
|
|
static void
|
|
interpreter_exec_cmd (char *args, int from_tty)
|
|
{
|
|
struct ui_interp_info *ui_interp = get_current_interp_info ();
|
|
struct interp *old_interp, *interp_to_use;
|
|
char **prules = NULL;
|
|
char **trule = NULL;
|
|
unsigned int nrules;
|
|
unsigned int i;
|
|
int old_quiet, use_quiet;
|
|
struct cleanup *cleanup;
|
|
|
|
if (args == NULL)
|
|
error_no_arg (_("interpreter-exec command"));
|
|
|
|
prules = gdb_buildargv (args);
|
|
cleanup = make_cleanup_freeargv (prules);
|
|
|
|
nrules = 0;
|
|
for (trule = prules; *trule != NULL; trule++)
|
|
nrules++;
|
|
|
|
if (nrules < 2)
|
|
error (_("usage: interpreter-exec <interpreter> [ <command> ... ]"));
|
|
|
|
old_interp = ui_interp->current_interpreter;
|
|
|
|
interp_to_use = interp_lookup (current_ui, prules[0]);
|
|
if (interp_to_use == NULL)
|
|
error (_("Could not find interpreter \"%s\"."), prules[0]);
|
|
|
|
/* Temporarily set interpreters quiet. */
|
|
old_quiet = interp_set_quiet (old_interp, 1);
|
|
use_quiet = interp_set_quiet (interp_to_use, 1);
|
|
|
|
if (!interp_set (interp_to_use, 0))
|
|
error (_("Could not switch to interpreter \"%s\"."), prules[0]);
|
|
|
|
for (i = 1; i < nrules; i++)
|
|
{
|
|
struct gdb_exception e = interp_exec (interp_to_use, prules[i]);
|
|
|
|
if (e.reason < 0)
|
|
{
|
|
interp_set (old_interp, 0);
|
|
interp_set_quiet (interp_to_use, use_quiet);
|
|
interp_set_quiet (old_interp, old_quiet);
|
|
error (_("error in command: \"%s\"."), prules[i]);
|
|
}
|
|
}
|
|
|
|
interp_set (old_interp, 0);
|
|
interp_set_quiet (interp_to_use, use_quiet);
|
|
interp_set_quiet (old_interp, old_quiet);
|
|
|
|
do_cleanups (cleanup);
|
|
}
|
|
|
|
/* See interps.h. */
|
|
|
|
VEC (char_ptr) *
|
|
interpreter_completer (struct cmd_list_element *ignore,
|
|
const char *text, const char *word)
|
|
{
|
|
struct interp_factory *interp;
|
|
int textlen;
|
|
VEC (char_ptr) *matches = NULL;
|
|
int ix;
|
|
|
|
textlen = strlen (text);
|
|
for (ix = 0;
|
|
VEC_iterate (interp_factory_p, interpreter_factories, ix, interp);
|
|
++ix)
|
|
{
|
|
if (strncmp (interp->name, text, textlen) == 0)
|
|
{
|
|
char *match;
|
|
|
|
match = (char *) xmalloc (strlen (word) + strlen (interp->name) + 1);
|
|
if (word == text)
|
|
strcpy (match, interp->name);
|
|
else if (word > text)
|
|
{
|
|
/* Return some portion of interp->name. */
|
|
strcpy (match, interp->name + (word - text));
|
|
}
|
|
else
|
|
{
|
|
/* Return some of text plus interp->name. */
|
|
strncpy (match, word, text - word);
|
|
match[text - word] = '\0';
|
|
strcat (match, interp->name);
|
|
}
|
|
VEC_safe_push (char_ptr, matches, match);
|
|
}
|
|
}
|
|
|
|
return matches;
|
|
}
|
|
|
|
struct interp *
|
|
top_level_interpreter (void)
|
|
{
|
|
struct ui_interp_info *ui_interp = get_current_interp_info ();
|
|
|
|
return ui_interp->top_level_interpreter;
|
|
}
|
|
|
|
void *
|
|
top_level_interpreter_data (void)
|
|
{
|
|
struct interp *interp;
|
|
|
|
interp = top_level_interpreter ();
|
|
gdb_assert (interp != NULL);
|
|
return interp->data;
|
|
}
|
|
|
|
/* See interps.h. */
|
|
|
|
struct interp *
|
|
current_interpreter (void)
|
|
{
|
|
struct ui_interp_info *ui_interp = get_interp_info (current_ui);
|
|
|
|
return ui_interp->current_interpreter;
|
|
}
|
|
|
|
/* This just adds the "interpreter-exec" command. */
|
|
void
|
|
_initialize_interpreter (void)
|
|
{
|
|
struct cmd_list_element *c;
|
|
|
|
c = add_cmd ("interpreter-exec", class_support,
|
|
interpreter_exec_cmd, _("\
|
|
Execute a command in an interpreter. It takes two arguments:\n\
|
|
The first argument is the name of the interpreter to use.\n\
|
|
The second argument is the command to execute.\n"), &cmdlist);
|
|
set_cmd_completer (c, interpreter_completer);
|
|
}
|