diff options
Diffstat (limited to 'gdb/cli')
| -rw-r--r-- | gdb/cli/cli-interp.c | 87 |
1 files changed, 55 insertions, 32 deletions
diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c index dfbd808..8eae0ac 100644 --- a/gdb/cli/cli-interp.c +++ b/gdb/cli/cli-interp.c @@ -26,9 +26,14 @@ #include "infrun.h" #include "observer.h" -/* These are the ui_out and the interpreter for the console - interpreter. */ -struct ui_out *cli_uiout; +/* The console interpreter. */ +struct cli_interp +{ + /* The ui_out for the console interpreter. */ + struct ui_out *cli_uiout; +}; + +/* The interpreter for the console interpreter. */ static struct interp *cli_interp; /* Longjmp-safe wrapper for "execute_command". */ @@ -48,7 +53,7 @@ cli_on_normal_stop (struct bpstats *bs, int print_frame) if (!interp_quiet_p (cli_interp)) { if (print_frame) - print_stop_event (cli_uiout); + print_stop_event (interp_ui_out (cli_interp)); } } @@ -58,7 +63,7 @@ static void cli_on_signal_received (enum gdb_signal siggnal) { if (!interp_quiet_p (cli_interp)) - print_signal_received_reason (cli_uiout, siggnal); + print_signal_received_reason (interp_ui_out (cli_interp), siggnal); } /* Observer for the end_stepping_range notification. */ @@ -67,7 +72,7 @@ static void cli_on_end_stepping_range (void) { if (!interp_quiet_p (cli_interp)) - print_end_stepping_range_reason (cli_uiout); + print_end_stepping_range_reason (interp_ui_out (cli_interp)); } /* Observer for the signalled notification. */ @@ -76,7 +81,7 @@ static void cli_on_signal_exited (enum gdb_signal siggnal) { if (!interp_quiet_p (cli_interp)) - print_signal_exited_reason (cli_uiout, siggnal); + print_signal_exited_reason (interp_ui_out (cli_interp), siggnal); } /* Observer for the exited notification. */ @@ -85,7 +90,7 @@ static void cli_on_exited (int exitstatus) { if (!interp_quiet_p (cli_interp)) - print_exited_reason (cli_uiout, exitstatus); + print_exited_reason (interp_ui_out (cli_interp), exitstatus); } /* Observer for the no_history notification. */ @@ -94,7 +99,7 @@ static void cli_on_no_history (void) { if (!interp_quiet_p (cli_interp)) - print_no_history_reason (cli_uiout); + print_no_history_reason (interp_ui_out (cli_interp)); } /* Observer for the sync_execution_done notification. */ @@ -120,6 +125,9 @@ cli_on_command_error (void) static void * cli_interpreter_init (struct interp *self, int top_level) { + if (top_level) + cli_interp = self; + /* If changing this, remember to update tui-interp.c as well. */ observer_attach_normal_stop (cli_on_normal_stop); observer_attach_end_stepping_range (cli_on_end_stepping_range); @@ -130,12 +138,13 @@ cli_interpreter_init (struct interp *self, int top_level) observer_attach_sync_execution_done (cli_on_sync_execution_done); observer_attach_command_error (cli_on_command_error); - return NULL; + return interp_data (self); } static int cli_interpreter_resume (void *data) { + struct cli_interp *cli = (struct cli_interp *) data; struct ui_file *stream; /*sync_execution = 1; */ @@ -144,17 +153,17 @@ cli_interpreter_resume (void *data) previously writing to gdb_stdout, then set it to the new gdb_stdout afterwards. */ - stream = cli_out_set_stream (cli_uiout, gdb_stdout); + stream = cli_out_set_stream (cli->cli_uiout, gdb_stdout); if (stream != gdb_stdout) { - cli_out_set_stream (cli_uiout, stream); + cli_out_set_stream (cli->cli_uiout, stream); stream = NULL; } gdb_setup_readline (); if (stream != NULL) - cli_out_set_stream (cli_uiout, gdb_stdout); + cli_out_set_stream (cli->cli_uiout, gdb_stdout); return 1; } @@ -169,6 +178,7 @@ cli_interpreter_suspend (void *data) static struct gdb_exception cli_interpreter_exec (void *data, const char *command_str) { + struct cli_interp *cli = (struct cli_interp *) data; struct ui_file *old_stream; struct gdb_exception result; @@ -184,9 +194,9 @@ cli_interpreter_exec (void *data, const char *command_str) It is important that it gets reset everytime, since the user could set gdb to use a different interpreter. */ - old_stream = cli_out_set_stream (cli_uiout, gdb_stdout); - result = safe_execute_command (cli_uiout, str, 1); - cli_out_set_stream (cli_uiout, old_stream); + old_stream = cli_out_set_stream (cli->cli_uiout, gdb_stdout); + result = safe_execute_command (cli->cli_uiout, str, 1); + cli_out_set_stream (cli->cli_uiout, old_stream); return result; } @@ -222,7 +232,34 @@ safe_execute_command (struct ui_out *command_uiout, char *command, int from_tty) static struct ui_out * cli_ui_out (struct interp *self) { - return cli_uiout; + struct cli_interp *cli = (struct cli_interp *) interp_data (self); + + return cli->cli_uiout; +} + +/* The CLI interpreter's vtable. */ + +static const struct interp_procs cli_interp_procs = { + cli_interpreter_init, /* init_proc */ + cli_interpreter_resume, /* resume_proc */ + cli_interpreter_suspend, /* suspend_proc */ + cli_interpreter_exec, /* exec_proc */ + cli_ui_out, /* ui_out_proc */ + NULL, /* set_logging_proc */ + cli_command_loop /* command_loop_proc */ +}; + +/* Factory for CLI interpreters. */ + +static struct interp * +cli_interp_factory (const char *name) +{ + struct cli_interp *cli = XNEW (struct cli_interp); + + /* Create a default uiout builder for the CLI. */ + cli->cli_uiout = cli_out_new (gdb_stdout); + + return interp_new (name, &cli_interp_procs, cli); } /* Standard gdb initialization hook. */ @@ -231,19 +268,5 @@ extern initialize_file_ftype _initialize_cli_interp; /* -Wmissing-prototypes */ void _initialize_cli_interp (void) { - static const struct interp_procs procs = { - cli_interpreter_init, /* init_proc */ - cli_interpreter_resume, /* resume_proc */ - cli_interpreter_suspend, /* suspend_proc */ - cli_interpreter_exec, /* exec_proc */ - cli_ui_out, /* ui_out_proc */ - NULL, /* set_logging_proc */ - cli_command_loop /* command_loop_proc */ - }; - - /* Create a default uiout builder for the CLI. */ - cli_uiout = cli_out_new (gdb_stdout); - cli_interp = interp_new (INTERP_CONSOLE, &procs); - - interp_add (cli_interp); + interp_factory_register (INTERP_CONSOLE, cli_interp_factory); } |