/* TUI Interpreter definitions for GDB, the GNU debugger.
- Copyright (C) 2003-2016 Free Software Foundation, Inc.
+ Copyright (C) 2003-2020 Free Software Foundation, Inc.
This file is part of GDB.
#include "ui-out.h"
#include "cli-out.h"
#include "tui/tui-data.h"
-#include "readline/readline.h"
#include "tui/tui-win.h"
#include "tui/tui.h"
#include "tui/tui-io.h"
#include "infrun.h"
-#include "observer.h"
+#include "observable.h"
#include "gdbthread.h"
+#include "inferior.h"
+#include "main.h"
-static struct ui_out *tui_ui_out (struct interp *self);
-
-/* Set to 1 when the TUI mode must be activated when we first start
+/* Set to true when the TUI mode must be activated when we first start
gdb. */
-static int tui_start_enabled = 0;
+static bool tui_start_enabled = false;
+
+class tui_interp final : public cli_interp_base
+{
+public:
+ explicit tui_interp (const char *name)
+ : cli_interp_base (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;
+};
/* Returns the INTERP if the INTERP is a TUI, and returns NULL
otherwise. */
-static struct interp *
+static tui_interp *
as_tui_interp (struct interp *interp)
{
- if (strcmp (interp_name (interp), INTERP_TUI) == 0)
- return interp;
- return NULL;
+ return dynamic_cast<tui_interp *> (interp);
}
/* Cleanup the tui before exiting. */
thread = inferior_thread ();
if (should_print_stop_to_console (interp, thread))
- print_stop_event (tui_ui_out (tui));
+ print_stop_event (tui->interp_ui_out ());
}
}
if (tui == NULL)
continue;
- print_signal_received_reason (tui_ui_out (tui), siggnal);
+ print_signal_received_reason (tui->interp_ui_out (), siggnal);
}
}
if (tui == NULL)
continue;
- print_end_stepping_range_reason (tui_ui_out (tui));
+ print_end_stepping_range_reason (tui->interp_ui_out ());
}
}
if (tui == NULL)
continue;
- print_signal_exited_reason (tui_ui_out (tui), siggnal);
+ print_signal_exited_reason (tui->interp_ui_out (), siggnal);
}
}
if (tui == NULL)
continue;
- print_exited_reason (tui_ui_out (tui), exitstatus);
+ print_exited_reason (tui->interp_ui_out (), exitstatus);
}
}
if (tui == NULL)
continue;
- print_no_history_reason (tui_ui_out (tui));
+ print_no_history_reason (tui->interp_ui_out ());
}
}
static void
tui_on_user_selected_context_changed (user_selected_what selection)
{
- struct thread_info *tp;
-
/* This event is suppressed. */
if (cli_suppress_notification.user_selected_context)
return;
- tp = find_thread_ptid (inferior_ptid);
+ thread_info *tp = inferior_ptid != null_ptid ? inferior_thread () : NULL;
SWITCH_THRU_ALL_UIS ()
{
continue;
if (selection & USER_SELECTED_INFERIOR)
- print_selected_inferior (tui_ui_out (tui));
+ print_selected_inferior (tui->interp_ui_out ());
if (tp != NULL
&& ((selection & (USER_SELECTED_THREAD | USER_SELECTED_FRAME))))
- print_selected_thread_frame (tui_ui_out (tui), selection);
+ print_selected_thread_frame (tui->interp_ui_out (), selection);
}
}
/* These implement the TUI interpreter. */
-static void *
-tui_init (struct interp *self, int top_level)
+void
+tui_interp::init (bool top_level)
{
/* Install exit handler to leave the screen in a good shape. */
atexit (tui_exit);
- tui_initialize_static_data ();
-
tui_initialize_io ();
tui_initialize_win ();
if (ui_file_isatty (gdb_stdout))
tui_initialize_readline ();
-
- return NULL;
}
-static int
-tui_resume (void *data)
+void
+tui_interp::resume ()
{
struct ui *ui = current_ui;
struct ui_file *stream;
previously writing to gdb_stdout, then set it to the new
gdb_stdout afterwards. */
- stream = cli_out_set_stream (tui_old_uiout, gdb_stdout);
+ stream = tui_old_uiout->set_stream (gdb_stdout);
if (stream != gdb_stdout)
{
- cli_out_set_stream (tui_old_uiout, stream);
+ tui_old_uiout->set_stream (stream);
stream = NULL;
}
ui->input_handler = command_line_handler;
if (stream != NULL)
- cli_out_set_stream (tui_old_uiout, gdb_stdout);
+ tui_old_uiout->set_stream (gdb_stdout);
if (tui_start_enabled)
tui_enable ();
- return 1;
}
-static int
-tui_suspend (void *data)
+void
+tui_interp::suspend ()
{
tui_start_enabled = tui_active;
tui_disable ();
- return 1;
}
-static struct ui_out *
-tui_ui_out (struct interp *self)
+ui_out *
+tui_interp::interp_ui_out ()
{
if (tui_active)
return tui_out;
return tui_old_uiout;
}
-static struct gdb_exception
-tui_exec (void *data, const char *command_str)
+gdb_exception
+tui_interp::exec (const char *command_str)
{
internal_error (__FILE__, __LINE__, _("tui_exec called"));
}
-/* The TUI interpreter's vtable. */
-
-static const struct interp_procs tui_interp_procs = {
- tui_init,
- tui_resume,
- tui_suspend,
- tui_exec,
- tui_ui_out,
- NULL,
- cli_interpreter_pre_command_loop,
- cli_interpreter_supports_command_editing,
-};
/* Factory for TUI interpreters. */
static struct interp *
tui_interp_factory (const char *name)
{
- return interp_new (name, &tui_interp_procs, NULL);
+ return new tui_interp (name);
}
-/* Provide a prototype to silence -Wmissing-prototypes. */
-extern initialize_file_ftype _initialize_tui_interp;
-
void
_initialize_tui_interp (void)
{
interp_factory_register (INTERP_TUI, tui_interp_factory);
if (interpreter_p && strcmp (interpreter_p, INTERP_TUI) == 0)
- tui_start_enabled = 1;
+ tui_start_enabled = true;
if (interpreter_p && strcmp (interpreter_p, INTERP_CONSOLE) == 0)
{
}
/* If changing this, remember to update cli-interp.c as well. */
- observer_attach_normal_stop (tui_on_normal_stop);
- observer_attach_signal_received (tui_on_signal_received);
- observer_attach_end_stepping_range (tui_on_end_stepping_range);
- observer_attach_signal_exited (tui_on_signal_exited);
- observer_attach_exited (tui_on_exited);
- observer_attach_no_history (tui_on_no_history);
- observer_attach_sync_execution_done (tui_on_sync_execution_done);
- observer_attach_command_error (tui_on_command_error);
- observer_attach_user_selected_context_changed
+ gdb::observers::normal_stop.attach (tui_on_normal_stop);
+ gdb::observers::signal_received.attach (tui_on_signal_received);
+ gdb::observers::end_stepping_range.attach (tui_on_end_stepping_range);
+ gdb::observers::signal_exited.attach (tui_on_signal_exited);
+ gdb::observers::exited.attach (tui_on_exited);
+ gdb::observers::no_history.attach (tui_on_no_history);
+ gdb::observers::sync_execution_done.attach (tui_on_sync_execution_done);
+ gdb::observers::command_error.attach (tui_on_command_error);
+ gdb::observers::user_selected_context_changed.attach
(tui_on_user_selected_context_changed);
}
projects / deliverable / binutils-gdb.git / blobdiff