diff options
Diffstat (limited to 'gdb/mi')
| -rw-r--r-- | gdb/mi/mi-common.h | 19 | ||||
| -rw-r--r-- | gdb/mi/mi-interp.c | 69 | ||||
| -rw-r--r-- | gdb/mi/mi-main.c | 14 |
3 files changed, 46 insertions, 56 deletions
diff --git a/gdb/mi/mi-common.h b/gdb/mi/mi-common.h index 9ee38b0..8fa9c9d 100644 --- a/gdb/mi/mi-common.h +++ b/gdb/mi/mi-common.h @@ -19,6 +19,8 @@ #ifndef MI_COMMON_H #define MI_COMMON_H +#include "interps.h" + struct mi_console_file; /* Represents the reason why GDB is sending an asynchronous command to @@ -50,8 +52,23 @@ enum async_reply_reason const char *async_reason_lookup (enum async_reply_reason reason); -struct mi_interp +/* An MI interpreter. */ + +class mi_interp final : public interp { +public: + mi_interp (const char *name) + : interp (name) + {} + + void init (bool top_level) override; + void resume () override; + void suspend () override; + gdb_exception exec (const char *command_str) override; + ui_out *interp_ui_out () override; + void set_logging (ui_file_up logfile, bool logging_redirect) override; + void pre_command_loop () override; + /* MI's output channels */ mi_console_file *out; mi_console_file *err; 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 */ diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index b249f2d..cf4e45a 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -147,8 +147,7 @@ static void print_diff (struct ui_file *file, struct mi_timestamp *start, void mi_cmd_gdb_exit (char *command, char **argv, int argc) { - struct mi_interp *mi - = (struct mi_interp *) interp_data (current_interpreter ()); + struct mi_interp *mi = (struct mi_interp *) current_interpreter (); /* We have to print everything right here because we never return. */ if (current_token) @@ -1974,7 +1973,7 @@ mi_cmd_remove_inferior (char *command, char **argv, int argc) static void captured_mi_execute_command (struct ui_out *uiout, struct mi_parse *context) { - struct mi_interp *mi = (struct mi_interp *) interp_data (command_interp ()); + struct mi_interp *mi = (struct mi_interp *) command_interp (); struct cleanup *cleanup; if (do_timings) @@ -2066,8 +2065,7 @@ captured_mi_execute_command (struct ui_out *uiout, struct mi_parse *context) static void mi_print_exception (const char *token, struct gdb_exception exception) { - struct mi_interp *mi - = (struct mi_interp *) interp_data (current_interpreter ()); + struct mi_interp *mi = (struct mi_interp *) current_interpreter (); fputs_unfiltered (token, mi->raw_stdout); fputs_unfiltered ("^error,msg=\"", mi->raw_stdout); @@ -2190,8 +2188,7 @@ mi_execute_command (const char *cmd, int from_tty) again. */ && !command_notifies_uscc_observer (command)) { - struct mi_interp *mi - = (struct mi_interp *) top_level_interpreter_data (); + struct mi_interp *mi = (struct mi_interp *) top_level_interpreter (); int report_change = 0; if (command->thread == -1) @@ -2378,8 +2375,7 @@ mi_load_progress (const char *section_name, int new_section; struct ui_out *saved_uiout; struct ui_out *uiout; - struct mi_interp *mi - = (struct mi_interp *) interp_data (current_interpreter ()); + struct mi_interp *mi = (struct mi_interp *) current_interpreter (); /* This function is called through deprecated_show_load_progress which means uiout may not be correct. Fix it for the duration |