aboutsummaryrefslogtreecommitdiff
path: root/gdb/mi/mi-interp.c
diff options
context:
space:
mode:
Diffstat (limited to 'gdb/mi/mi-interp.c')
-rw-r--r--gdb/mi/mi-interp.c143
1 files changed, 42 insertions, 101 deletions
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index f96c59a..714bb4b 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -341,20 +341,17 @@ mi_new_thread (struct thread_info *t)
SWITCH_THRU_ALL_UIS ()
{
struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
- struct cleanup *old_chain;
if (mi == NULL)
continue;
- old_chain = make_cleanup_restore_target_terminal ();
- 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, inf->num);
gdb_flush (mi->event_channel);
-
- do_cleanups (old_chain);
}
}
@@ -367,19 +364,16 @@ mi_thread_exit (struct thread_info *t, int silent)
SWITCH_THRU_ALL_UIS ()
{
struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
- struct cleanup *old_chain;
if (mi == NULL)
continue;
- old_chain = make_cleanup_restore_target_terminal ();
- target_terminal_ours_for_output ();
+ 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);
-
- do_cleanups (old_chain);
}
}
@@ -392,13 +386,12 @@ mi_record_changed (struct inferior *inferior, int started, const char *method,
SWITCH_THRU_ALL_UIS ()
{
struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
- struct cleanup *old_chain;
if (mi == NULL)
continue;
- old_chain = make_cleanup_restore_target_terminal ();
- target_terminal_ours_for_output ();
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
if (started)
{
@@ -425,8 +418,6 @@ mi_record_changed (struct inferior *inferior, int started, const char *method,
}
gdb_flush (mi->event_channel);
-
- do_cleanups (old_chain);
}
}
@@ -437,7 +428,6 @@ mi_inferior_added (struct inferior *inf)
{
struct interp *interp;
struct mi_interp *mi;
- struct cleanup *old_chain;
/* We'll be called once for the initial inferior, before the top
level interpreter is set. */
@@ -449,15 +439,13 @@ mi_inferior_added (struct inferior *inf)
if (mi == NULL)
continue;
- old_chain = make_cleanup_restore_target_terminal ();
- 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-added,id=\"i%d\"",
inf->num);
gdb_flush (mi->event_channel);
-
- do_cleanups (old_chain);
}
}
@@ -467,19 +455,17 @@ mi_inferior_appeared (struct inferior *inf)
SWITCH_THRU_ALL_UIS ()
{
struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
- struct cleanup *old_chain;
if (mi == NULL)
continue;
- old_chain = make_cleanup_restore_target_terminal ();
- 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);
- do_cleanups (old_chain);
}
}
@@ -489,13 +475,12 @@ mi_inferior_exit (struct inferior *inf)
SWITCH_THRU_ALL_UIS ()
{
struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
- struct cleanup *old_chain;
if (mi == NULL)
continue;
- old_chain = make_cleanup_restore_target_terminal ();
- target_terminal_ours_for_output ();
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
if (inf->has_exit_code)
fprintf_unfiltered (mi->event_channel,
@@ -506,7 +491,6 @@ mi_inferior_exit (struct inferior *inf)
"thread-group-exited,id=\"i%d\"", inf->num);
gdb_flush (mi->event_channel);
- do_cleanups (old_chain);
}
}
@@ -516,20 +500,17 @@ mi_inferior_removed (struct inferior *inf)
SWITCH_THRU_ALL_UIS ()
{
struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
- struct cleanup *old_chain;
if (mi == NULL)
continue;
- old_chain = make_cleanup_restore_target_terminal ();
- 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-removed,id=\"i%d\"",
inf->num);
gdb_flush (mi->event_channel);
-
- do_cleanups (old_chain);
}
}
@@ -746,13 +727,12 @@ mi_traceframe_changed (int tfnum, int tpnum)
SWITCH_THRU_ALL_UIS ()
{
struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
- struct cleanup *old_chain;
if (mi == NULL)
continue;
- old_chain = make_cleanup_restore_target_terminal ();
- 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,"
@@ -762,8 +742,6 @@ mi_traceframe_changed (int tfnum, int tpnum)
fprintf_unfiltered (mi->event_channel, "traceframe-changed,end");
gdb_flush (mi->event_channel);
-
- do_cleanups (old_chain);
}
}
@@ -775,21 +753,18 @@ mi_tsv_created (const struct trace_state_variable *tsv)
SWITCH_THRU_ALL_UIS ()
{
struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
- struct cleanup *old_chain;
if (mi == NULL)
continue;
- old_chain = make_cleanup_restore_target_terminal ();
- 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, plongest (tsv->initial_value));
gdb_flush (mi->event_channel);
-
- do_cleanups (old_chain);
}
}
@@ -801,13 +776,12 @@ mi_tsv_deleted (const struct trace_state_variable *tsv)
SWITCH_THRU_ALL_UIS ()
{
struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
- struct cleanup *old_chain;
if (mi == NULL)
continue;
- old_chain = make_cleanup_restore_target_terminal ();
- 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,"
@@ -816,8 +790,6 @@ mi_tsv_deleted (const struct trace_state_variable *tsv)
fprintf_unfiltered (mi->event_channel, "tsv-deleted\n");
gdb_flush (mi->event_channel);
-
- do_cleanups (old_chain);
}
}
@@ -830,15 +802,14 @@ mi_tsv_modified (const struct trace_state_variable *tsv)
{
struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
struct ui_out *mi_uiout;
- struct cleanup *old_chain;
if (mi == NULL)
continue;
mi_uiout = interp_ui_out (top_level_interpreter ());
- old_chain = make_cleanup_restore_target_terminal ();
- target_terminal_ours_for_output ();
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
fprintf_unfiltered (mi->event_channel,
"tsv-modified");
@@ -854,8 +825,6 @@ mi_tsv_modified (const struct trace_state_variable *tsv)
mi_uiout->redirect (NULL);
gdb_flush (mi->event_channel);
-
- do_cleanups (old_chain);
}
}
@@ -874,15 +843,14 @@ mi_breakpoint_created (struct breakpoint *b)
{
struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
struct ui_out *mi_uiout;
- struct cleanup *old_chain;
if (mi == NULL)
continue;
mi_uiout = interp_ui_out (top_level_interpreter ());
- old_chain = make_cleanup_restore_target_terminal ();
- 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");
@@ -906,8 +874,6 @@ mi_breakpoint_created (struct breakpoint *b)
mi_uiout->redirect (NULL);
gdb_flush (mi->event_channel);
-
- do_cleanups (old_chain);
}
}
@@ -925,20 +891,17 @@ mi_breakpoint_deleted (struct breakpoint *b)
SWITCH_THRU_ALL_UIS ()
{
struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
- struct cleanup *old_chain;
if (mi == NULL)
continue;
- old_chain = make_cleanup_restore_target_terminal ();
- target_terminal_ours_for_output ();
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
fprintf_unfiltered (mi->event_channel, "breakpoint-deleted,id=\"%d\"",
b->number);
gdb_flush (mi->event_channel);
-
- do_cleanups (old_chain);
}
}
@@ -956,13 +919,12 @@ mi_breakpoint_modified (struct breakpoint *b)
SWITCH_THRU_ALL_UIS ()
{
struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
- struct cleanup *old_chain;
if (mi == NULL)
continue;
- old_chain = make_cleanup_restore_target_terminal ();
- target_terminal_ours_for_output ();
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
fprintf_unfiltered (mi->event_channel,
"breakpoint-modified");
/* We want the output from gdb_breakpoint_query to go to
@@ -985,8 +947,6 @@ mi_breakpoint_modified (struct breakpoint *b)
mi->mi_uiout->redirect (NULL);
gdb_flush (mi->event_channel);
-
- do_cleanups (old_chain);
}
}
@@ -1094,17 +1054,14 @@ mi_on_resume (ptid_t ptid)
SWITCH_THRU_ALL_UIS ()
{
struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
- struct cleanup *old_chain;
if (mi == NULL)
continue;
- old_chain = make_cleanup_restore_target_terminal ();
- target_terminal_ours_for_output ();
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
mi_on_resume_1 (mi, ptid);
-
- do_cleanups (old_chain);
}
}
@@ -1138,15 +1095,14 @@ mi_solib_loaded (struct so_list *solib)
{
struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
struct ui_out *uiout;
- struct cleanup *old_chain;
if (mi == NULL)
continue;
uiout = interp_ui_out (top_level_interpreter ());
- old_chain = make_cleanup_restore_target_terminal ();
- target_terminal_ours_for_output ();
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
fprintf_unfiltered (mi->event_channel, "library-loaded");
@@ -1157,8 +1113,6 @@ mi_solib_loaded (struct so_list *solib)
uiout->redirect (NULL);
gdb_flush (mi->event_channel);
-
- do_cleanups (old_chain);
}
}
@@ -1169,15 +1123,14 @@ mi_solib_unloaded (struct so_list *solib)
{
struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
struct ui_out *uiout;
- struct cleanup *old_chain;
if (mi == NULL)
continue;
uiout = interp_ui_out (top_level_interpreter ());
- old_chain = make_cleanup_restore_target_terminal ();
- target_terminal_ours_for_output ();
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
fprintf_unfiltered (mi->event_channel, "library-unloaded");
@@ -1194,8 +1147,6 @@ mi_solib_unloaded (struct so_list *solib)
uiout->redirect (NULL);
gdb_flush (mi->event_channel);
-
- do_cleanups (old_chain);
}
}
@@ -1211,15 +1162,14 @@ mi_command_param_changed (const char *param, const char *value)
{
struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
struct ui_out *mi_uiout;
- struct cleanup *old_chain;
if (mi == NULL)
continue;
mi_uiout = interp_ui_out (top_level_interpreter ());
- old_chain = make_cleanup_restore_target_terminal ();
- target_terminal_ours_for_output ();
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
fprintf_unfiltered (mi->event_channel, "cmd-param-changed");
@@ -1231,8 +1181,6 @@ mi_command_param_changed (const char *param, const char *value)
mi_uiout->redirect (NULL);
gdb_flush (mi->event_channel);
-
- do_cleanups (old_chain);
}
}
@@ -1250,15 +1198,14 @@ mi_memory_changed (struct inferior *inferior, CORE_ADDR memaddr,
struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
struct ui_out *mi_uiout;
struct obj_section *sec;
- struct cleanup *old_chain;
if (mi == NULL)
continue;
mi_uiout = interp_ui_out (top_level_interpreter ());
- old_chain = make_cleanup_restore_target_terminal ();
- target_terminal_ours_for_output ();
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
fprintf_unfiltered (mi->event_channel, "memory-changed");
@@ -1283,8 +1230,6 @@ mi_memory_changed (struct inferior *inferior, CORE_ADDR memaddr,
mi_uiout->redirect (NULL);
gdb_flush (mi->event_channel);
-
- do_cleanups (old_chain);
}
}
@@ -1306,7 +1251,6 @@ mi_user_selected_context_changed (user_selected_what selection)
{
struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
struct ui_out *mi_uiout;
- struct cleanup *old_chain;
if (mi == NULL)
continue;
@@ -1316,8 +1260,8 @@ mi_user_selected_context_changed (user_selected_what selection)
mi_uiout->redirect (mi->event_channel);
ui_out_redirect_pop redirect_popper (mi_uiout);
- old_chain = make_cleanup_restore_target_terminal ();
- target_terminal_ours_for_output ();
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
if (selection & USER_SELECTED_INFERIOR)
print_selected_inferior (mi->cli_uiout);
@@ -1340,7 +1284,6 @@ mi_user_selected_context_changed (user_selected_what selection)
}
gdb_flush (mi->event_channel);
- do_cleanups (old_chain);
}
}
@@ -1352,17 +1295,15 @@ report_initial_inferior (struct inferior *inf, void *closure)
and top_level_interpreter_data is set, we cannot call
it here. */
struct mi_interp *mi = (struct mi_interp *) closure;
- struct cleanup *old_chain;
- old_chain = make_cleanup_restore_target_terminal ();
- 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-added,id=\"i%d\"",
inf->num);
gdb_flush (mi->event_channel);
- do_cleanups (old_chain);
return 0;
}
generated by cgit v1.1 at 2025-02-17 04:40:05 +0000