diff options
author | Pedro Alves <palves@redhat.com> | 2017-02-03 16:30:04 +0000 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2017-02-03 16:30:04 +0000 |
commit | d6f9b0fbc7998909712cbc1b194f1cbd4ae8b6fa (patch) | |
tree | 2c0ddedef2b9335ea7364479480a69799393afbe /gdb/mi/mi-interp.c | |
parent | e666304ec603bb3249f80bac97200f2b4520ab0f (diff) | |
download | gdb-d6f9b0fbc7998909712cbc1b194f1cbd4ae8b6fa.zip gdb-d6f9b0fbc7998909712cbc1b194f1cbd4ae8b6fa.tar.gz gdb-d6f9b0fbc7998909712cbc1b194f1cbd4ae8b6fa.tar.bz2 |
C++-fy struct interp/cli_interp/tui_interp/mi_interp
- The interp->data field disappears, since we can put data in the
interpreter directly now. The "init" method remains in place, but
it now returns void.
- A few places check if the interpreter method is NULL before calling
it, and also check whether the method returns true/false. For some
of those methods, all current implementations always return true.
In those cases, this commit makes the C++-fied method return void
instead and cleans up the callers.
Tested on x86_64 Fedora 23.
gdb/ChangeLog:
2017-02-03 Pedro Alves <palves@redhat.com>
* cli/cli-interp.c (cli_interp_base::cli_interp_base)
(cli_interp_base::~cli_interp_base): New.
(cli_interp): New struct.
(as_cli_interp): Cast the interp itself to cli_interp.
(cli_interpreter_pre_command_loop): Rename to ...
(cli_interp_base::pre_command_loop): ... this. Remove 'self'
parameter.
(cli_interpreter_init): Rename to ...
(cli_interp::init): ... this. Remove 'self' parameter. Use
boolean. Make extern.
(cli_interpreter_resume): Rename to ...
(cli_interp::resume): ... this. Remove 'data' parameter. Make
extern.
(cli_interpreter_suspend): Rename to ...
(cli_interp::suspend): ... this. Remove 'data' parameter. Make
extern.
(cli_interpreter_exec): Rename to ...
(cli_interp::exec): ... this. Remove 'data' parameter. Make
extern.
(cli_interpreter_supports_command_editing): Rename to ...
(cli_interp_base::supports_command_editing): ... this. Remove
'interp' parameter. Make extern.
(cli_ui_out): Rename to ...
(cli_interp::interp_ui_out): ... this. Remove 'interp' parameter.
Make extern.
(cli_set_logging): Rename to ...
(cli_interp_base::set_logging): ... this. Remove 'interp'
parameter. Make extern.
(cli_interp_procs): Delete.
(cli_interp_factory): Adjust to use "new".
* cli/cli-interp.h: Include "interps.h".
(struct cli_interp_base): New struct.
* interps.c (struct interp): Delete. Fields moved to interps.h.
(interp_new): Delete.
(interp::interp, interp::~interp): New.
(interp_set): Use bool, and return void. Assume the interpreter
has suspend, init and resume methods, and that the all return
void.
(set_top_level_interpreter): interp_set returns void.
(interp_ui_out): Adapt.
(current_interp_set_logging): Adapt.
(interp_data): Delete.
(interp_pre_command_loop, interp_supports_command_editing): Adapt.
(interp_exec): Adapt.
(top_level_interpreter_data): Delete.
* interps.h (interp_init_ftype, interp_resume_ftype)
(interp_suspend_ftype, interp_exec_ftype)
(interp_pre_command_loop_ftype, interp_ui_out_ftype): Delete.
(class interp): New.
(interp_new): Delete.
(interp_set): Now returns void. Use bool.
(interp_data, top_level_interpreter_data): Delete.
* mi/mi-common.h: Include interps.h.
(class mi_interp): Inherit from interp. Define a ctor. Declare
init, resume, suspect, exec, interp_ui_out, set_logging and
pre_command_loop methods.
* mi/mi-interp.c (as_mi_interp): Cast the interp itself.
(mi_interpreter_init): Rename to ...
(mi_interp::init): ... this. Remove the 'interp' parameter, use
bool, return void and make extern. Adjust.
(mi_interpreter_resume): ... Rename to ...
(mi_interp::resume): ... this. Remove the 'data' parameter,
return void and make extern. Adjust.
(mi_interpreter_suspend): ... Rename to ...
(mi_interp::suspend): ... this. Remove the 'data' parameter,
return void and make extern. Adjust.
(mi_interpreter_exec): ... Rename to ...
(mi_interp::exec): ... this. Remove the 'data' parameter and make
extern. Adjust.
(mi_interpreter_pre_command_loop): ... Rename to ...
(mi_interp::pre_command_loop): ... this. Remove the 'self'
parameter and make extern.
(mi_on_normal_stop_1): Adjust.
(mi_ui_out): Rename to ...
(mi_interp::interp_ui_out): ... this. Remove the 'interp'
parameter and make extern. Adjust.
(mi_set_logging): Rename to ...
(mi_interp::set_logging): ... this. Remove the 'interp'
parameter and make extern. Adjust.
(mi_interp_procs): Delete.
(mi_interp_factory): Adjust to use 'new'.
* mi/mi-main.c (mi_cmd_gdb_exit, captured_mi_execute_command)
(mi_print_exception, mi_execute_command, mi_load_progress):
Adjust.
* tui/tui-interp.c (tui_interp): New class.
(as_tui_interp): Return a tui_interp pointer.
(tui_on_normal_stop, tui_on_signal_received)
(tui_on_end_stepping_range, tui_on_signal_exited, tui_on_exited)
(tui_on_no_history, tui_on_user_selected_context_changed): Adjust
to use interp::interp_ui_out.
(tui_init): Rename to ...
(tui_interp::init): ... this. Remove the 'self' parameter, use
bool, return void and make extern. Adjust.
(tui_resume): Rename to ...
(tui_interp::resume): ... this. Remove the 'data' parameter,
return void and make extern. Adjust.
(tui_suspend): Rename to ...
(tui_interp::suspend): ... this. Remove the 'data' parameter,
return void and make extern. Adjust.
(tui_ui_out): Rename to ...
(tui_interp::interp_ui_out): ... this. Remove the 'self'
parameter, and make extern. Adjust.
(tui_exec): Rename to ...
(tui_interp::exec): ... this. Remove the 'data' parameter and
make extern.
(tui_interp_procs): Delete.
(tui_interp_factory): Use "new".
Diffstat (limited to 'gdb/mi/mi-interp.c')
-rw-r--r-- | gdb/mi/mi-interp.c | 69 |
1 files changed, 23 insertions, 46 deletions
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index aa76989..86340e4 100644 --- a/gdb/mi/mi-interp.c +++ b/gdb/mi/mi-interp.c @@ -108,14 +108,14 @@ static struct mi_interp * as_mi_interp (struct interp *interp) { if (interp_ui_out (interp)->is_mi_like_p ()) - return (struct mi_interp *) interp_data (interp); + return (struct mi_interp *) interp; return NULL; } -static void * -mi_interpreter_init (struct interp *interp, int top_level) +void +mi_interp::init (bool top_level) { - struct mi_interp *mi = XNEW (struct mi_interp); + mi_interp *mi = this; const char *name; int mi_version; @@ -132,7 +132,7 @@ mi_interpreter_init (struct interp *interp, int top_level) mi->targ = new mi_console_file (mi->raw_stdout, "@", '"'); mi->event_channel = new mi_console_file (mi->raw_stdout, "=", 0); - name = interp_name (interp); + name = interp_name (this); /* INTERP_MI selects the most recent released version. "mi2" was released as part of GDB 6.0. */ if (strcmp (name, INTERP_MI) == 0) @@ -157,14 +157,12 @@ mi_interpreter_init (struct interp *interp, int top_level) up-front. */ iterate_over_inferiors (report_initial_inferior, mi); } - - return mi; } -static int -mi_interpreter_resume (void *data) +void +mi_interp::resume () { - struct mi_interp *mi = (struct mi_interp *) data; + struct mi_interp *mi = this; struct ui *ui = current_ui; /* As per hack note in mi_interpreter_init, swap in the output @@ -188,19 +186,16 @@ mi_interpreter_resume (void *data) clear_interpreter_hooks (); deprecated_show_load_progress = mi_load_progress; - - return 1; } -static int -mi_interpreter_suspend (void *data) +void +mi_interp::suspend () { gdb_disable_readline (); - return 1; } -static struct gdb_exception -mi_interpreter_exec (void *data, const char *command) +gdb_exception +mi_interp::exec (const char *command) { mi_execute_command_wrapper (command); return exception_none; @@ -327,10 +322,10 @@ mi_execute_command_input_handler (char *cmd) display_mi_prompt (mi); } -static void -mi_interpreter_pre_command_loop (struct interp *self) +void +mi_interp::pre_command_loop () { - struct mi_interp *mi = (struct mi_interp *) interp_data (self); + struct mi_interp *mi = this; /* Turn off 8 bit strings in quoted output. Any character with the high bit set is printed using C's octal format. */ @@ -658,7 +653,7 @@ mi_on_normal_stop_1 (struct bpstats *bs, int print_frame) using cli interpreter, be sure to use MI uiout for output, not the current one. */ struct ui_out *mi_uiout = interp_ui_out (top_level_interpreter ()); - struct mi_interp *mi = (struct mi_interp *) top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter (); if (print_frame) { @@ -1362,24 +1357,19 @@ report_initial_inferior (struct inferior *inf, void *closure) return 0; } -static struct ui_out * -mi_ui_out (struct interp *interp) +ui_out * +mi_interp::interp_ui_out () { - struct mi_interp *mi = (struct mi_interp *) interp_data (interp); - - return mi->mi_uiout; + return this->mi_uiout; } /* Do MI-specific logging actions; save raw_stdout, and change all the consoles to use the supplied ui-file(s). */ -static void -mi_set_logging (struct interp *interp, - ui_file_up logfile, bool logging_redirect) +void +mi_interp::set_logging (ui_file_up logfile, bool logging_redirect) { - struct mi_interp *mi = (struct mi_interp *) interp_data (interp); - - gdb_assert (mi != NULL); + struct mi_interp *mi = this; if (logfile != NULL) { @@ -1403,25 +1393,12 @@ mi_set_logging (struct interp *interp, mi->event_channel->set_raw (mi->raw_stdout); } -/* The MI interpreter's vtable. */ - -static const struct interp_procs mi_interp_procs = -{ - mi_interpreter_init, /* init_proc */ - mi_interpreter_resume, /* resume_proc */ - mi_interpreter_suspend, /* suspend_proc */ - mi_interpreter_exec, /* exec_proc */ - mi_ui_out, /* ui_out_proc */ - mi_set_logging, /* set_logging_proc */ - mi_interpreter_pre_command_loop /* pre_command_loop_proc */ -}; - /* Factory for MI interpreters. */ static struct interp * mi_interp_factory (const char *name) { - return interp_new (name, &mi_interp_procs, NULL); + return new mi_interp (name); } extern initialize_file_ftype _initialize_mi_interp; /* -Wmissing-prototypes */ |