/* MI Interpreter Definitions and Commands for GDB, the GNU debugger.
- Copyright (C) 2002-2019 Free Software Foundation, Inc.
+ Copyright (C) 2002-2024 Free Software Foundation, Inc.
This file is part of GDB.
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
+
+#include "mi-interp.h"
+
#include "interps.h"
#include "event-top.h"
-#include "event-loop.h"
+#include "gdbsupport/event-loop.h"
#include "inferior.h"
#include "infrun.h"
#include "ui-out.h"
-#include "top.h"
+#include "ui.h"
#include "mi-main.h"
#include "mi-cmds.h"
#include "mi-out.h"
#include "cli-out.h"
#include "thread-fsm.h"
#include "cli/cli-interp.h"
-#include "common/scope-exit.h"
+#include "gdbsupport/scope-exit.h"
/* These are the interpreter setup, etc. functions for the MI
interpreter. */
static void mi_insert_notify_hooks (void);
static void mi_remove_notify_hooks (void);
-static void mi_on_signal_received (enum gdb_signal siggnal);
-static void mi_on_end_stepping_range (void);
-static void mi_on_signal_exited (enum gdb_signal siggnal);
-static void mi_on_exited (int exitstatus);
-static void mi_on_normal_stop (struct bpstats *bs, int print_frame);
-static void mi_on_no_history (void);
-
-static void mi_new_thread (struct thread_info *t);
-static void mi_thread_exit (struct thread_info *t, int silent);
-static void mi_record_changed (struct inferior*, int, const char *,
- const char *);
-static void mi_inferior_added (struct inferior *inf);
-static void mi_inferior_appeared (struct inferior *inf);
-static void mi_inferior_exit (struct inferior *inf);
-static void mi_inferior_removed (struct inferior *inf);
-static void mi_on_resume (ptid_t ptid);
-static void mi_solib_loaded (struct so_list *solib);
-static void mi_solib_unloaded (struct so_list *solib);
-static void mi_about_to_proceed (void);
-static void mi_traceframe_changed (int tfnum, int tpnum);
-static void mi_tsv_created (const struct trace_state_variable *tsv);
-static void mi_tsv_deleted (const struct trace_state_variable *tsv);
-static void mi_tsv_modified (const struct trace_state_variable *tsv);
-static void mi_breakpoint_created (struct breakpoint *b);
-static void mi_breakpoint_deleted (struct breakpoint *b);
-static void mi_breakpoint_modified (struct breakpoint *b);
-static void mi_command_param_changed (const char *param, const char *value);
-static void mi_memory_changed (struct inferior *inf, CORE_ADDR memaddr,
- ssize_t len, const bfd_byte *myaddr);
-static void mi_on_sync_execution_done (void);
-
-static int report_initial_inferior (struct inferior *inf, void *closure);
-
/* Display the MI prompt. */
static void
{
struct ui *ui = current_ui;
- fputs_unfiltered ("(gdb) \n", mi->raw_stdout);
+ gdb_puts ("(gdb) \n", mi->raw_stdout);
gdb_flush (mi->raw_stdout);
ui->prompt_state = PROMPTED;
}
-/* Returns the INTERP's data cast as mi_interp if INTERP is an MI, and
- returns NULL otherwise. */
-
-static struct mi_interp *
-as_mi_interp (struct interp *interp)
+void
+mi_interp::on_command_error ()
{
- return dynamic_cast<mi_interp *> (interp);
+ display_mi_prompt (this);
}
void
mi->log = mi->err;
mi->targ = new mi_console_file (mi->raw_stdout, "@", '"');
mi->event_channel = new mi_console_file (mi->raw_stdout, "=", 0);
- mi->mi_uiout = mi_out_new (name ());
+ mi->mi_uiout = mi_out_new (name ()).release ();
gdb_assert (mi->mi_uiout != nullptr);
- mi->cli_uiout = cli_out_new (mi->out);
+ mi->cli_uiout = new cli_ui_out (mi->out);
if (top_level)
{
- /* The initial inferior is created before this function is
- called, so we need to report it explicitly. Use iteration in
- case future version of GDB creates more than one inferior
- up-front. */
- iterate_over_inferiors (report_initial_inferior, mi);
- }
+ /* The initial inferior is created before this function is called, so we
+ need to report it explicitly when initializing the top-level MI
+ interpreter.
+
+ This is also called when additional MI interpreters are added (using
+ the new-ui command), when multiple inferiors possibly exist, so we need
+ to use iteration to report all the inferiors. */
+
+ for (inferior *inf : all_inferiors ())
+ mi->on_inferior_added (inf);
+ }
}
void
/* Route target error through the MI as well. */
gdb_stdtargerr = mi->targ;
- /* Replace all the hooks that we know about. There really needs to
- be a better way of doing this... */
- clear_interpreter_hooks ();
-
deprecated_show_load_progress = mi_load_progress;
}
gdb_disable_readline ();
}
-gdb_exception
+void
mi_interp::exec (const char *command)
{
mi_execute_command_wrapper (command);
- return gdb_exception ();
}
void
-mi_cmd_interpreter_exec (const char *command, char **argv, int argc)
+mi_cmd_interpreter_exec (const char *command, const char *const *argv,
+ int argc)
{
struct interp *interp_to_use;
int i;
};
for (i = 1; i < argc; i++)
- {
- struct gdb_exception e = interp_exec (interp_to_use, argv[i]);
-
- if (e.reason < 0)
- error ("%s", e.what ());
- }
+ interp_exec (interp_to_use, argv[i]);
}
/* This inserts a number of hooks that are meant to produce
mi_execute_command (cmd, ui->instream == ui->stdin_stream);
}
-/* Observer for the synchronous_command_done notification. */
-
-static void
-mi_on_sync_execution_done (void)
+void
+mi_interp::on_sync_execution_done ()
{
- struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
-
- if (mi == NULL)
- return;
-
/* If MI is sync, then output the MI prompt now, indicating we're
ready for further input. */
if (!mi_async_p ())
- display_mi_prompt (mi);
+ display_mi_prompt (this);
}
/* mi_execute_command_wrapper wrapper suitable for INPUT_HANDLER. */
display_mi_prompt (mi);
}
-static void
-mi_new_thread (struct thread_info *t)
+void
+mi_interp::on_new_thread (thread_info *t)
{
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
-
- if (mi == NULL)
- continue;
-
- target_terminal::scoped_restore_terminal_state term_state;
- target_terminal::ours_for_output ();
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
- fprintf_unfiltered (mi->event_channel,
- "thread-created,id=\"%d\",group-id=\"i%d\"",
- t->global_num, t->inf->num);
- gdb_flush (mi->event_channel);
- }
+ gdb_printf (this->event_channel, "thread-created,id=\"%d\",group-id=\"i%d\"",
+ t->global_num, t->inf->num);
+ gdb_flush (this->event_channel);
}
-static void
-mi_thread_exit (struct thread_info *t, int silent)
+void
+mi_interp::on_thread_exited (thread_info *t,
+ std::optional<ULONGEST> /* exit_code */,
+ int /* silent */)
{
- if (silent)
- return;
-
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
-
- if (mi == NULL)
- continue;
-
- target_terminal::scoped_restore_terminal_state term_state;
- target_terminal::ours_for_output ();
- fprintf_unfiltered (mi->event_channel,
- "thread-exited,id=\"%d\",group-id=\"i%d\"",
- t->global_num, t->inf->num);
- gdb_flush (mi->event_channel);
- }
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
+ gdb_printf (this->event_channel, "thread-exited,id=\"%d\",group-id=\"i%d\"",
+ t->global_num, t->inf->num);
+ gdb_flush (this->event_channel);
}
-/* Emit notification on changing the state of record. */
-
-static void
-mi_record_changed (struct inferior *inferior, int started, const char *method,
- const char *format)
+void
+mi_interp::on_record_changed (inferior *inferior, int started,
+ const char *method, const char *format)
{
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
-
- if (mi == NULL)
- continue;
-
- target_terminal::scoped_restore_terminal_state term_state;
- target_terminal::ours_for_output ();
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
- if (started)
- {
- if (format != NULL)
- {
- fprintf_unfiltered (mi->event_channel,
- "record-started,thread-group=\"i%d\","
- "method=\"%s\",format=\"%s\"",
- inferior->num, method, format);
- }
- else
- {
- fprintf_unfiltered (mi->event_channel,
- "record-started,thread-group=\"i%d\","
- "method=\"%s\"",
- inferior->num, method);
- }
- }
+ if (started)
+ {
+ if (format != NULL)
+ gdb_printf (this->event_channel,
+ "record-started,thread-group=\"i%d\","
+ "method=\"%s\",format=\"%s\"",
+ inferior->num, method, format);
else
- {
- fprintf_unfiltered (mi->event_channel,
- "record-stopped,thread-group=\"i%d\"",
- inferior->num);
- }
-
- gdb_flush (mi->event_channel);
+ gdb_printf (this->event_channel,
+ "record-started,thread-group=\"i%d\","
+ "method=\"%s\"",
+ inferior->num, method);
}
-}
-
-static void
-mi_inferior_added (struct inferior *inf)
-{
- SWITCH_THRU_ALL_UIS ()
- {
- struct interp *interp;
- struct mi_interp *mi;
-
- /* We'll be called once for the initial inferior, before the top
- level interpreter is set. */
- interp = top_level_interpreter ();
- if (interp == NULL)
- continue;
-
- mi = as_mi_interp (interp);
- if (mi == NULL)
- continue;
-
- target_terminal::scoped_restore_terminal_state term_state;
- target_terminal::ours_for_output ();
+ else
+ gdb_printf (this->event_channel,
+ "record-stopped,thread-group=\"i%d\"",
+ inferior->num);
- fprintf_unfiltered (mi->event_channel,
- "thread-group-added,id=\"i%d\"",
- inf->num);
- gdb_flush (mi->event_channel);
- }
+ gdb_flush (this->event_channel);
}
-static void
-mi_inferior_appeared (struct inferior *inf)
+void
+mi_interp::on_inferior_added (inferior *inf)
{
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
-
- if (mi == NULL)
- continue;
-
- target_terminal::scoped_restore_terminal_state term_state;
- target_terminal::ours_for_output ();
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
- fprintf_unfiltered (mi->event_channel,
- "thread-group-started,id=\"i%d\",pid=\"%d\"",
- inf->num, inf->pid);
- gdb_flush (mi->event_channel);
- }
+ gdb_printf (this->event_channel, "thread-group-added,id=\"i%d\"", inf->num);
+ gdb_flush (this->event_channel);
}
-static void
-mi_inferior_exit (struct inferior *inf)
+void
+mi_interp::on_inferior_appeared (inferior *inf)
{
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
-
- if (mi == NULL)
- continue;
-
- target_terminal::scoped_restore_terminal_state term_state;
- target_terminal::ours_for_output ();
-
- if (inf->has_exit_code)
- fprintf_unfiltered (mi->event_channel,
- "thread-group-exited,id=\"i%d\",exit-code=\"%s\"",
- inf->num, int_string (inf->exit_code, 8, 0, 0, 1));
- else
- fprintf_unfiltered (mi->event_channel,
- "thread-group-exited,id=\"i%d\"", inf->num);
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
- gdb_flush (mi->event_channel);
- }
+ gdb_printf (this->event_channel, "thread-group-started,id=\"i%d\",pid=\"%d\"",
+ inf->num, inf->pid);
+ gdb_flush (this->event_channel);
}
-static void
-mi_inferior_removed (struct inferior *inf)
+void
+mi_interp::on_inferior_disappeared (inferior *inf)
{
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
-
- if (mi == NULL)
- continue;
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
- target_terminal::scoped_restore_terminal_state term_state;
- target_terminal::ours_for_output ();
+ if (inf->has_exit_code)
+ gdb_printf (this->event_channel,
+ "thread-group-exited,id=\"i%d\",exit-code=\"%s\"",
+ inf->num, int_string (inf->exit_code, 8, 0, 0, 1));
+ else
+ gdb_printf (this->event_channel,
+ "thread-group-exited,id=\"i%d\"", inf->num);
- fprintf_unfiltered (mi->event_channel,
- "thread-group-removed,id=\"i%d\"",
- inf->num);
- gdb_flush (mi->event_channel);
- }
+ gdb_flush (this->event_channel);
}
-/* Return the MI interpreter, if it is active -- either because it's
- the top-level interpreter or the interpreter executing the current
- command. Returns NULL if the MI interpreter is not being used. */
-
-static struct mi_interp *
-find_mi_interp (void)
+void
+mi_interp::on_inferior_removed (inferior *inf)
{
- struct mi_interp *mi;
-
- mi = as_mi_interp (top_level_interpreter ());
- if (mi != NULL)
- return mi;
-
- mi = as_mi_interp (command_interp ());
- if (mi != NULL)
- return mi;
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
- return NULL;
+ gdb_printf (this->event_channel, "thread-group-removed,id=\"i%d\"", inf->num);
+ gdb_flush (this->event_channel);
}
/* Observers for several run control events that print why the
inferior has stopped to both the MI event channel and to the MI
console. If the MI interpreter is not active, print nothing. */
-/* Observer for the signal_received notification. */
-
-static void
-mi_on_signal_received (enum gdb_signal siggnal)
-{
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = find_mi_interp ();
-
- if (mi == NULL)
- continue;
-
- print_signal_received_reason (mi->mi_uiout, siggnal);
- print_signal_received_reason (mi->cli_uiout, siggnal);
- }
-}
-
-/* Observer for the end_stepping_range notification. */
-
-static void
-mi_on_end_stepping_range (void)
+void
+mi_interp::on_signal_received (enum gdb_signal siggnal)
{
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = find_mi_interp ();
-
- if (mi == NULL)
- continue;
-
- print_end_stepping_range_reason (mi->mi_uiout);
- print_end_stepping_range_reason (mi->cli_uiout);
- }
+ print_signal_received_reason (this->mi_uiout, siggnal);
+ print_signal_received_reason (this->cli_uiout, siggnal);
}
-/* Observer for the signal_exited notification. */
-
-static void
-mi_on_signal_exited (enum gdb_signal siggnal)
+void
+mi_interp::on_signal_exited (gdb_signal sig)
{
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = find_mi_interp ();
-
- if (mi == NULL)
- continue;
-
- print_signal_exited_reason (mi->mi_uiout, siggnal);
- print_signal_exited_reason (mi->cli_uiout, siggnal);
- }
+ print_signal_exited_reason (this->mi_uiout, sig);
+ print_signal_exited_reason (this->cli_uiout, sig);
}
-/* Observer for the exited notification. */
-
-static void
-mi_on_exited (int exitstatus)
+void
+mi_interp::on_exited (int status)
{
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = find_mi_interp ();
-
- if (mi == NULL)
- continue;
-
- print_exited_reason (mi->mi_uiout, exitstatus);
- print_exited_reason (mi->cli_uiout, exitstatus);
- }
+ print_exited_reason (this->mi_uiout, status);
+ print_exited_reason (this->cli_uiout, status);
}
-/* Observer for the no_history notification. */
-
-static void
-mi_on_no_history (void)
+void
+mi_interp::on_no_history ()
{
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = find_mi_interp ();
-
- if (mi == NULL)
- continue;
-
- print_no_history_reason (mi->mi_uiout);
- print_no_history_reason (mi->cli_uiout);
- }
+ print_no_history_reason (this->mi_uiout);
+ print_no_history_reason (this->cli_uiout);
}
-static void
-mi_on_normal_stop_1 (struct bpstats *bs, int print_frame)
+void
+mi_interp::on_normal_stop (struct bpstat *bs, int print_frame)
{
/* Since this can be called when CLI command is executing,
using cli interpreter, be sure to use MI uiout for output,
not the current one. */
- struct ui_out *mi_uiout = top_level_interpreter ()->interp_ui_out ();
- struct mi_interp *mi = (struct mi_interp *) top_level_interpreter ();
+ ui_out *mi_uiout = this->interp_ui_out ();
if (print_frame)
{
- struct thread_info *tp;
- int core;
- struct interp *console_interp;
-
- tp = inferior_thread ();
+ thread_info *tp = inferior_thread ();
- if (tp->thread_fsm != NULL
- && tp->thread_fsm->finished_p ())
+ if (tp->thread_fsm () != nullptr
+ && tp->thread_fsm ()->finished_p ())
{
- enum async_reply_reason reason;
-
- reason = tp->thread_fsm->async_reply_reason ();
+ async_reply_reason reason
+ = tp->thread_fsm ()->async_reply_reason ();
mi_uiout->field_string ("reason", async_reason_lookup (reason));
}
- console_interp = interp_lookup (current_ui, INTERP_CONSOLE);
+ interp *console_interp = interp_lookup (current_ui, INTERP_CONSOLE);
+
/* We only want to print the displays once, and we want it to
look just how it would on the console, so we use this to
decide whether the MI stop should include them. */
print_stop_event (mi_uiout, !console_print);
if (console_print)
- print_stop_event (mi->cli_uiout);
+ print_stop_event (this->cli_uiout);
- mi_uiout->field_int ("thread-id", tp->global_num);
+ mi_uiout->field_signed ("thread-id", tp->global_num);
if (non_stop)
{
ui_out_emit_list list_emitter (mi_uiout, "stopped-threads");
- mi_uiout->field_int (NULL, tp->global_num);
+ mi_uiout->field_signed (NULL, tp->global_num);
}
else
mi_uiout->field_string ("stopped-threads", "all");
- core = target_core_of_thread (tp->ptid);
+ int core = target_core_of_thread (tp->ptid);
if (core != -1)
- mi_uiout->field_int ("core", core);
+ mi_uiout->field_signed ("core", core);
}
-
- fputs_unfiltered ("*stopped", mi->raw_stdout);
- mi_out_put (mi_uiout, mi->raw_stdout);
- mi_out_rewind (mi_uiout);
- mi_print_timing_maybe (mi->raw_stdout);
- fputs_unfiltered ("\n", mi->raw_stdout);
- gdb_flush (mi->raw_stdout);
-}
-
-static void
-mi_on_normal_stop (struct bpstats *bs, int print_frame)
-{
- SWITCH_THRU_ALL_UIS ()
- {
- if (as_mi_interp (top_level_interpreter ()) == NULL)
- continue;
- mi_on_normal_stop_1 (bs, print_frame);
- }
+ gdb_puts ("*stopped", this->raw_stdout);
+ mi_out_put (mi_uiout, this->raw_stdout);
+ mi_out_rewind (mi_uiout);
+ mi_print_timing_maybe (this->raw_stdout);
+ gdb_puts ("\n", this->raw_stdout);
+ gdb_flush (this->raw_stdout);
}
-static void
-mi_about_to_proceed (void)
+void
+mi_interp::on_about_to_proceed ()
{
/* Suppress output while calling an inferior function. */
return;
}
- mi_proceeded = 1;
+ this->mi_proceeded = 1;
}
/* When the element is non-zero, no MI notifications will be emitted in
0,
};
-/* Emit notification on changing a traceframe. */
-
-static void
-mi_traceframe_changed (int tfnum, int tpnum)
+void
+mi_interp::on_traceframe_changed (int tfnum, int tpnum)
{
if (mi_suppress_notification.traceframe)
return;
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
-
- if (mi == NULL)
- continue;
-
- target_terminal::scoped_restore_terminal_state term_state;
- target_terminal::ours_for_output ();
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
- if (tfnum >= 0)
- fprintf_unfiltered (mi->event_channel, "traceframe-changed,"
- "num=\"%d\",tracepoint=\"%d\"\n",
- tfnum, tpnum);
- else
- fprintf_unfiltered (mi->event_channel, "traceframe-changed,end");
+ if (tfnum >= 0)
+ gdb_printf (this->event_channel, "traceframe-changed,"
+ "num=\"%d\",tracepoint=\"%d\"",
+ tfnum, tpnum);
+ else
+ gdb_printf (this->event_channel, "traceframe-changed,end");
- gdb_flush (mi->event_channel);
- }
+ gdb_flush (this->event_channel);
}
-/* Emit notification on creating a trace state variable. */
-
-static void
-mi_tsv_created (const struct trace_state_variable *tsv)
+void
+mi_interp::on_tsv_created (const trace_state_variable *tsv)
{
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
-
- if (mi == NULL)
- continue;
-
- target_terminal::scoped_restore_terminal_state term_state;
- target_terminal::ours_for_output ();
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
- fprintf_unfiltered (mi->event_channel, "tsv-created,"
- "name=\"%s\",initial=\"%s\"\n",
- tsv->name.c_str (), plongest (tsv->initial_value));
+ gdb_printf (this->event_channel, "tsv-created,"
+ "name=\"%s\",initial=\"%s\"",
+ tsv->name.c_str (), plongest (tsv->initial_value));
- gdb_flush (mi->event_channel);
- }
+ gdb_flush (this->event_channel);
}
-/* Emit notification on deleting a trace state variable. */
-
-static void
-mi_tsv_deleted (const struct trace_state_variable *tsv)
+void
+mi_interp::on_tsv_deleted (const trace_state_variable *tsv)
{
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
-
- if (mi == NULL)
- continue;
-
- target_terminal::scoped_restore_terminal_state term_state;
- target_terminal::ours_for_output ();
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
- if (tsv != NULL)
- fprintf_unfiltered (mi->event_channel, "tsv-deleted,"
- "name=\"%s\"\n", tsv->name.c_str ());
- else
- fprintf_unfiltered (mi->event_channel, "tsv-deleted\n");
+ if (tsv != nullptr)
+ gdb_printf (this->event_channel, "tsv-deleted,name=\"%s\"",
+ tsv->name.c_str ());
+ else
+ gdb_printf (this->event_channel, "tsv-deleted");
- gdb_flush (mi->event_channel);
- }
+ gdb_flush (this->event_channel);
}
-/* Emit notification on modifying a trace state variable. */
-
-static void
-mi_tsv_modified (const struct trace_state_variable *tsv)
+void
+mi_interp::on_tsv_modified (const trace_state_variable *tsv)
{
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
- struct ui_out *mi_uiout;
-
- if (mi == NULL)
- continue;
+ ui_out *mi_uiout = this->interp_ui_out ();
- mi_uiout = top_level_interpreter ()->interp_ui_out ();
-
- target_terminal::scoped_restore_terminal_state term_state;
- target_terminal::ours_for_output ();
-
- fprintf_unfiltered (mi->event_channel,
- "tsv-modified");
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
- mi_uiout->redirect (mi->event_channel);
+ gdb_printf (this->event_channel,
+ "tsv-modified");
- mi_uiout->field_string ("name", tsv->name);
- mi_uiout->field_string ("initial",
- plongest (tsv->initial_value));
- if (tsv->value_known)
- mi_uiout->field_string ("current", plongest (tsv->value));
+ ui_out_redirect_pop redir (mi_uiout, this->event_channel);
- mi_uiout->redirect (NULL);
+ mi_uiout->field_string ("name", tsv->name);
+ mi_uiout->field_string ("initial",
+ plongest (tsv->initial_value));
+ if (tsv->value_known)
+ mi_uiout->field_string ("current", plongest (tsv->value));
- gdb_flush (mi->event_channel);
- }
+ gdb_flush (this->event_channel);
}
/* Print breakpoint BP on MI's event channel. */
break if anything is output to mi_uiout prior to calling the
breakpoint_created notifications. So, we use
ui_out_redirect. */
- mi_uiout->redirect (mi->event_channel);
+ ui_out_redirect_pop redir (mi_uiout, mi->event_channel);
try
{
print_breakpoint (bp);
}
- catch (const gdb_exception &ex)
+ catch (const gdb_exception_error &ex)
{
exception_print (gdb_stderr, ex);
}
-
- mi_uiout->redirect (NULL);
}
-/* Emit notification about a created breakpoint. */
-
-static void
-mi_breakpoint_created (struct breakpoint *b)
+void
+mi_interp::on_breakpoint_created (breakpoint *b)
{
if (mi_suppress_notification.breakpoint)
return;
if (b->number <= 0)
return;
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
-
- if (mi == NULL)
- continue;
-
- target_terminal::scoped_restore_terminal_state term_state;
- target_terminal::ours_for_output ();
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
- fprintf_unfiltered (mi->event_channel,
- "breakpoint-created");
- mi_print_breakpoint_for_event (mi, b);
+ gdb_printf (this->event_channel, "breakpoint-created");
+ mi_print_breakpoint_for_event (this, b);
- gdb_flush (mi->event_channel);
- }
+ gdb_flush (this->event_channel);
}
-/* Emit notification about deleted breakpoint. */
-
-static void
-mi_breakpoint_deleted (struct breakpoint *b)
+void
+mi_interp::on_breakpoint_deleted (breakpoint *b)
{
if (mi_suppress_notification.breakpoint)
return;
if (b->number <= 0)
return;
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
-
- if (mi == NULL)
- continue;
-
- target_terminal::scoped_restore_terminal_state term_state;
- target_terminal::ours_for_output ();
-
- fprintf_unfiltered (mi->event_channel, "breakpoint-deleted,id=\"%d\"",
- b->number);
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
- gdb_flush (mi->event_channel);
- }
+ gdb_printf (this->event_channel, "breakpoint-deleted,id=\"%d\"", b->number);
+ gdb_flush (this->event_channel);
}
-/* Emit notification about modified breakpoint. */
-
-static void
-mi_breakpoint_modified (struct breakpoint *b)
+void
+mi_interp::on_breakpoint_modified (breakpoint *b)
{
if (mi_suppress_notification.breakpoint)
return;
if (b->number <= 0)
return;
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
-
- if (mi == NULL)
- continue;
-
- target_terminal::scoped_restore_terminal_state term_state;
- target_terminal::ours_for_output ();
- fprintf_unfiltered (mi->event_channel,
- "breakpoint-modified");
- mi_print_breakpoint_for_event (mi, b);
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
+ gdb_printf (this->event_channel, "breakpoint-modified");
+ mi_print_breakpoint_for_event (this, b);
- gdb_flush (mi->event_channel);
- }
+ gdb_flush (this->event_channel);
}
static void
if (mi == NULL)
continue;
- fprintf_unfiltered (mi->raw_stdout,
- "*running,thread-id=\"%d\"\n",
- thread->global_num);
+ gdb_printf (mi->raw_stdout,
+ "*running,thread-id=\"%d\"\n",
+ thread->global_num);
}
}
}
static void
-mi_on_resume_1 (struct mi_interp *mi, ptid_t ptid)
+mi_on_resume_1 (struct mi_interp *mi,
+ process_stratum_target *targ, ptid_t ptid)
{
/* To cater for older frontends, emit ^running, but do it only once
per each command. We do it here, since at this point we know
will make it impossible for frontend to know what's going on.
In future (MI3), we'll be outputting "^done" here. */
- if (!running_result_record_printed && mi_proceeded)
+ if (!mi->running_result_record_printed && mi->mi_proceeded)
{
- fprintf_unfiltered (mi->raw_stdout, "%s^running\n",
- current_token ? current_token : "");
+ gdb_printf (mi->raw_stdout, "%s^running\n",
+ mi->current_token ? mi->current_token : "");
}
/* Backwards compatibility. If doing a wildcard resume and there's
thread individually. */
if ((ptid == minus_one_ptid || ptid.is_pid ())
&& !multiple_inferiors_p ())
- fprintf_unfiltered (mi->raw_stdout, "*running,thread-id=\"all\"\n");
+ gdb_printf (mi->raw_stdout, "*running,thread-id=\"all\"\n");
else
- for (thread_info *tp : all_non_exited_threads (ptid))
+ for (thread_info *tp : all_non_exited_threads (targ, ptid))
mi_output_running (tp);
- if (!running_result_record_printed && mi_proceeded)
+ if (!mi->running_result_record_printed && mi->mi_proceeded)
{
- running_result_record_printed = 1;
+ mi->running_result_record_printed = 1;
/* This is what gdb used to do historically -- printing prompt
even if it cannot actually accept any input. This will be
surely removed for MI3, and may be removed even earlier. */
if (current_ui->prompt_state == PROMPT_BLOCKED)
- fputs_unfiltered ("(gdb) \n", mi->raw_stdout);
+ gdb_puts ("(gdb) \n", mi->raw_stdout);
}
gdb_flush (mi->raw_stdout);
}
-static void
-mi_on_resume (ptid_t ptid)
+void
+mi_interp::on_target_resumed (ptid_t ptid)
{
struct thread_info *tp = NULL;
+ process_stratum_target *target = current_inferior ()->process_target ();
if (ptid == minus_one_ptid || ptid.is_pid ())
tp = inferior_thread ();
else
- tp = find_thread_ptid (ptid);
+ tp = target->find_thread (ptid);
/* Suppress output while calling an inferior function. */
if (tp->control.in_infcall)
return;
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
-
- if (mi == NULL)
- continue;
-
- target_terminal::scoped_restore_terminal_state term_state;
- target_terminal::ours_for_output ();
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
- mi_on_resume_1 (mi, ptid);
- }
+ mi_on_resume_1 (this, target, ptid);
}
/* See mi-interp.h. */
void
-mi_output_solib_attribs (ui_out *uiout, struct so_list *solib)
+mi_output_solib_attribs (ui_out *uiout, const solib &solib)
{
- struct gdbarch *gdbarch = target_gdbarch ();
+ gdbarch *gdbarch = current_inferior ()->arch ();
- uiout->field_string ("id", solib->so_original_name);
- uiout->field_string ("target-name", solib->so_original_name);
- uiout->field_string ("host-name", solib->so_name);
- uiout->field_int ("symbols-loaded", solib->symbols_loaded);
- if (!gdbarch_has_global_solist (target_gdbarch ()))
+ uiout->field_string ("id", solib.so_original_name);
+ uiout->field_string ("target-name", solib.so_original_name);
+ uiout->field_string ("host-name", solib.so_name);
+ uiout->field_signed ("symbols-loaded", solib.symbols_loaded);
+ if (!gdbarch_has_global_solist (current_inferior ()->arch ()))
uiout->field_fmt ("thread-group", "i%d", current_inferior ()->num);
ui_out_emit_list list_emitter (uiout, "ranges");
ui_out_emit_tuple tuple_emitter (uiout, NULL);
- if (solib->addr_high != 0)
+ if (solib.addr_high != 0)
{
- uiout->field_core_addr ("from", gdbarch, solib->addr_low);
- uiout->field_core_addr ("to", gdbarch, solib->addr_high);
+ uiout->field_core_addr ("from", gdbarch, solib.addr_low);
+ uiout->field_core_addr ("to", gdbarch, solib.addr_high);
}
}
-static void
-mi_solib_loaded (struct so_list *solib)
+void
+mi_interp::on_solib_loaded (const solib &solib)
{
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
- struct ui_out *uiout;
-
- if (mi == NULL)
- continue;
-
- uiout = top_level_interpreter ()->interp_ui_out ();
-
- target_terminal::scoped_restore_terminal_state term_state;
- target_terminal::ours_for_output ();
+ ui_out *uiout = this->interp_ui_out ();
- fprintf_unfiltered (mi->event_channel, "library-loaded");
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
- uiout->redirect (mi->event_channel);
+ gdb_printf (this->event_channel, "library-loaded");
- mi_output_solib_attribs (uiout, solib);
+ ui_out_redirect_pop redir (uiout, this->event_channel);
- uiout->redirect (NULL);
+ mi_output_solib_attribs (uiout, solib);
- gdb_flush (mi->event_channel);
- }
+ gdb_flush (this->event_channel);
}
-static void
-mi_solib_unloaded (struct so_list *solib)
+void
+mi_interp::on_solib_unloaded (const solib &solib)
{
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
- struct ui_out *uiout;
-
- if (mi == NULL)
- continue;
-
- uiout = top_level_interpreter ()->interp_ui_out ();
+ ui_out *uiout = this->interp_ui_out ();
- target_terminal::scoped_restore_terminal_state term_state;
- target_terminal::ours_for_output ();
-
- fprintf_unfiltered (mi->event_channel, "library-unloaded");
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
- uiout->redirect (mi->event_channel);
+ gdb_printf (this->event_channel, "library-unloaded");
- uiout->field_string ("id", solib->so_original_name);
- uiout->field_string ("target-name", solib->so_original_name);
- uiout->field_string ("host-name", solib->so_name);
- if (!gdbarch_has_global_solist (target_gdbarch ()))
- {
- uiout->field_fmt ("thread-group", "i%d", current_inferior ()->num);
- }
+ ui_out_redirect_pop redir (uiout, this->event_channel);
- uiout->redirect (NULL);
+ uiout->field_string ("id", solib.so_original_name);
+ uiout->field_string ("target-name", solib.so_original_name);
+ uiout->field_string ("host-name", solib.so_name);
+ if (!gdbarch_has_global_solist (current_inferior ()->arch ()))
+ uiout->field_fmt ("thread-group", "i%d", current_inferior ()->num);
- gdb_flush (mi->event_channel);
- }
+ gdb_flush (this->event_channel);
}
-/* Emit notification about the command parameter change. */
-
-static void
-mi_command_param_changed (const char *param, const char *value)
+void
+mi_interp::on_param_changed (const char *param, const char *value)
{
if (mi_suppress_notification.cmd_param_changed)
return;
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
- struct ui_out *mi_uiout;
-
- if (mi == NULL)
- continue;
-
- mi_uiout = top_level_interpreter ()->interp_ui_out ();
-
- target_terminal::scoped_restore_terminal_state term_state;
- target_terminal::ours_for_output ();
+ ui_out *mi_uiout = this->interp_ui_out ();
- fprintf_unfiltered (mi->event_channel, "cmd-param-changed");
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
- mi_uiout->redirect (mi->event_channel);
+ gdb_printf (this->event_channel, "cmd-param-changed");
- mi_uiout->field_string ("param", param);
- mi_uiout->field_string ("value", value);
+ ui_out_redirect_pop redir (mi_uiout, this->event_channel);
- mi_uiout->redirect (NULL);
+ mi_uiout->field_string ("param", param);
+ mi_uiout->field_string ("value", value);
- gdb_flush (mi->event_channel);
- }
+ gdb_flush (this->event_channel);
}
-/* Emit notification about the target memory change. */
-
-static void
-mi_memory_changed (struct inferior *inferior, CORE_ADDR memaddr,
- ssize_t len, const bfd_byte *myaddr)
+void
+mi_interp::on_memory_changed (inferior *inferior, CORE_ADDR memaddr,
+ ssize_t len, const bfd_byte *myaddr)
{
if (mi_suppress_notification.memory)
return;
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
- struct ui_out *mi_uiout;
- struct obj_section *sec;
-
- if (mi == NULL)
- continue;
-
- mi_uiout = top_level_interpreter ()->interp_ui_out ();
- target_terminal::scoped_restore_terminal_state term_state;
- target_terminal::ours_for_output ();
+ ui_out *mi_uiout = this->interp_ui_out ();
- fprintf_unfiltered (mi->event_channel, "memory-changed");
-
- mi_uiout->redirect (mi->event_channel);
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
- mi_uiout->field_fmt ("thread-group", "i%d", inferior->num);
- mi_uiout->field_core_addr ("addr", target_gdbarch (), memaddr);
- mi_uiout->field_fmt ("len", "%s", hex_string (len));
+ gdb_printf (this->event_channel, "memory-changed");
- /* Append 'type=code' into notification if MEMADDR falls in the range of
- sections contain code. */
- sec = find_pc_section (memaddr);
- if (sec != NULL && sec->objfile != NULL)
- {
- flagword flags = bfd_get_section_flags (sec->objfile->obfd,
- sec->the_bfd_section);
+ ui_out_redirect_pop redir (mi_uiout, this->event_channel);
- if (flags & SEC_CODE)
- mi_uiout->field_string ("type", "code");
- }
+ mi_uiout->field_fmt ("thread-group", "i%d", inferior->num);
+ mi_uiout->field_core_addr ("addr", current_inferior ()->arch (), memaddr);
+ mi_uiout->field_string ("len", hex_string (len));
- mi_uiout->redirect (NULL);
+ /* Append 'type=code' into notification if MEMADDR falls in the range of
+ sections contain code. */
+ obj_section *sec = find_pc_section (memaddr);
+ if (sec != nullptr && sec->objfile != nullptr)
+ {
+ flagword flags = bfd_section_flags (sec->the_bfd_section);
- gdb_flush (mi->event_channel);
+ if (flags & SEC_CODE)
+ mi_uiout->field_string ("type", "code");
}
-}
-/* Emit an event when the selection context (inferior, thread, frame)
- changed. */
+ gdb_flush (this->event_channel);
+}
-static void
-mi_user_selected_context_changed (user_selected_what selection)
+void
+mi_interp::on_user_selected_context_changed (user_selected_what selection)
{
- struct thread_info *tp;
-
/* Don't send an event if we're responding to an MI command. */
if (mi_suppress_notification.user_selected_context)
return;
- if (inferior_ptid != null_ptid)
- tp = inferior_thread ();
- else
- tp = NULL;
-
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
- struct ui_out *mi_uiout;
-
- if (mi == NULL)
- continue;
+ thread_info *tp = inferior_ptid != null_ptid ? inferior_thread () : nullptr;
+ ui_out *mi_uiout = this->interp_ui_out ();
+ ui_out_redirect_pop redirect_popper (mi_uiout, this->event_channel);
- mi_uiout = top_level_interpreter ()->interp_ui_out ();
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
- mi_uiout->redirect (mi->event_channel);
- ui_out_redirect_pop redirect_popper (mi_uiout);
+ if (selection & USER_SELECTED_INFERIOR)
+ print_selected_inferior (this->cli_uiout);
- target_terminal::scoped_restore_terminal_state term_state;
- target_terminal::ours_for_output ();
+ if (tp != NULL
+ && (selection & (USER_SELECTED_THREAD | USER_SELECTED_FRAME)))
+ {
+ print_selected_thread_frame (this->cli_uiout, selection);
- if (selection & USER_SELECTED_INFERIOR)
- print_selected_inferior (mi->cli_uiout);
+ gdb_printf (this->event_channel, "thread-selected,id=\"%d\"",
+ tp->global_num);
- if (tp != NULL
- && (selection & (USER_SELECTED_THREAD | USER_SELECTED_FRAME)))
+ if (tp->state != THREAD_RUNNING)
{
- print_selected_thread_frame (mi->cli_uiout, selection);
-
- fprintf_unfiltered (mi->event_channel,
- "thread-selected,id=\"%d\"",
- tp->global_num);
-
- if (tp->state != THREAD_RUNNING)
- {
- if (has_stack_frames ())
- print_stack_frame_to_uiout (mi_uiout, get_selected_frame (NULL),
- 1, SRC_AND_LOC, 1);
- }
+ if (has_stack_frames ())
+ print_stack_frame_to_uiout (mi_uiout, get_selected_frame (NULL),
+ 1, SRC_AND_LOC, 1);
}
-
- gdb_flush (mi->event_channel);
}
-}
-
-static int
-report_initial_inferior (struct inferior *inf, void *closure)
-{
- /* This function is called from mi_interpreter_init, and since
- mi_inferior_added assumes that inferior is fully initialized
- and top_level_interpreter_data is set, we cannot call
- it here. */
- struct mi_interp *mi = (struct mi_interp *) closure;
-
- target_terminal::scoped_restore_terminal_state term_state;
- target_terminal::ours_for_output ();
-
- fprintf_unfiltered (mi->event_channel,
- "thread-group-added,id=\"i%d\"",
- inf->num);
- gdb_flush (mi->event_channel);
- return 0;
+ gdb_flush (this->event_channel);
}
ui_out *
{
mi->saved_raw_stdout = mi->raw_stdout;
- /* If something is being redirected, then grab logfile. */
- ui_file *logfile_p = nullptr;
- if (logging_redirect || debug_redirect)
- {
- logfile_p = logfile.get ();
- mi->saved_raw_file_to_delete = logfile_p;
- }
+ ui_file *logfile_p = logfile.get ();
+ mi->logfile_holder = std::move (logfile);
/* If something is not being redirected, then a tee containing both the
logfile and stdout. */
ui_file *tee = nullptr;
if (!logging_redirect || !debug_redirect)
{
- tee = new tee_file (mi->raw_stdout, std::move (logfile));
- mi->saved_raw_file_to_delete = tee;
+ tee = new tee_file (mi->raw_stdout, logfile_p);
+ mi->stdout_holder.reset (tee);
}
mi->raw_stdout = logging_redirect ? logfile_p : tee;
- mi->raw_stdlog = debug_redirect ? logfile_p : tee;
}
else
{
- delete mi->saved_raw_file_to_delete;
+ mi->logfile_holder.reset ();
+ mi->stdout_holder.reset ();
mi->raw_stdout = mi->saved_raw_stdout;
mi->saved_raw_stdout = nullptr;
- mi->saved_raw_file_to_delete = nullptr;
}
mi->out->set_raw (mi->raw_stdout);
return new mi_interp (name);
}
+void _initialize_mi_interp ();
void
-_initialize_mi_interp (void)
+_initialize_mi_interp ()
{
/* The various interpreter levels. */
- interp_factory_register (INTERP_MI1, mi_interp_factory);
interp_factory_register (INTERP_MI2, mi_interp_factory);
interp_factory_register (INTERP_MI3, mi_interp_factory);
+ interp_factory_register (INTERP_MI4, mi_interp_factory);
interp_factory_register (INTERP_MI, mi_interp_factory);
-
- gdb::observers::signal_received.attach (mi_on_signal_received);
- gdb::observers::end_stepping_range.attach (mi_on_end_stepping_range);
- gdb::observers::signal_exited.attach (mi_on_signal_exited);
- gdb::observers::exited.attach (mi_on_exited);
- gdb::observers::no_history.attach (mi_on_no_history);
- gdb::observers::new_thread.attach (mi_new_thread);
- gdb::observers::thread_exit.attach (mi_thread_exit);
- gdb::observers::inferior_added.attach (mi_inferior_added);
- gdb::observers::inferior_appeared.attach (mi_inferior_appeared);
- gdb::observers::inferior_exit.attach (mi_inferior_exit);
- gdb::observers::inferior_removed.attach (mi_inferior_removed);
- gdb::observers::record_changed.attach (mi_record_changed);
- gdb::observers::normal_stop.attach (mi_on_normal_stop);
- gdb::observers::target_resumed.attach (mi_on_resume);
- gdb::observers::solib_loaded.attach (mi_solib_loaded);
- gdb::observers::solib_unloaded.attach (mi_solib_unloaded);
- gdb::observers::about_to_proceed.attach (mi_about_to_proceed);
- gdb::observers::traceframe_changed.attach (mi_traceframe_changed);
- gdb::observers::tsv_created.attach (mi_tsv_created);
- gdb::observers::tsv_deleted.attach (mi_tsv_deleted);
- gdb::observers::tsv_modified.attach (mi_tsv_modified);
- gdb::observers::breakpoint_created.attach (mi_breakpoint_created);
- gdb::observers::breakpoint_deleted.attach (mi_breakpoint_deleted);
- gdb::observers::breakpoint_modified.attach (mi_breakpoint_modified);
- gdb::observers::command_param_changed.attach (mi_command_param_changed);
- gdb::observers::memory_changed.attach (mi_memory_changed);
- gdb::observers::sync_execution_done.attach (mi_on_sync_execution_done);
- gdb::observers::user_selected_context_changed.attach
- (mi_user_selected_context_changed);
}
projects / thirdparty / binutils-gdb.git / blobdiff