From d236ad1955a0a6b5203bc1474b989fd9dba668f8 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Sun, 18 Oct 2015 12:32:47 +0100 Subject: [PATCH] garbage collect gdb/infrun.c:stop_after_trap No longer used anywhere. gdb/ChangeLog: 2015-10-22 Pedro Alves * infrun.c (stop_after_trap): Delete. (clear_proceed_status, handle_signal_stop, struct infcall_control_state, save_infcall_control_state) (restore_infcall_control_state): Remove references to stop_after_trap. --- gdb/ChangeLog | 8 ++++++++ gdb/infrun.c | 22 ---------------------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fe8edb5b1d8..9e82e2f33c1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2015-10-22 Pedro Alves + + * infrun.c (stop_after_trap): Delete. + (clear_proceed_status, handle_signal_stop, struct + infcall_control_state, save_infcall_control_state) + (restore_infcall_control_state): Remove references to + stop_after_trap. + 2015-10-22 Simon Marchi * python/python.c (_initialize_python): Add cast. diff --git a/gdb/infrun.c b/gdb/infrun.c index 0c268ff55c3..917f9beffff 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -387,11 +387,6 @@ show_stop_on_solib_events (struct ui_file *file, int from_tty, value); } -/* Nonzero means expecting a trace trap - and should stop the inferior and return silently when it happens. */ - -int stop_after_trap; - /* Nonzero after stop if current stack frame should be printed. */ static int stop_print_frame; @@ -2857,8 +2852,6 @@ clear_proceed_status (int step) inferior->control.stop_soon = NO_STOP_QUIETLY; } - stop_after_trap = 0; - observer_notify_about_to_proceed (); } @@ -5500,18 +5493,6 @@ handle_signal_stop (struct execution_control_state *ecs) return; } - if (ecs->event_thread->suspend.stop_signal == GDB_SIGNAL_TRAP - && stop_after_trap) - { - if (!ptid_equal (ecs->ptid, inferior_ptid)) - context_switch (ecs->ptid); - if (debug_infrun) - fprintf_unfiltered (gdb_stdlog, "infrun: stopped\n"); - stop_print_frame = 0; - stop_waiting (ecs); - return; - } - /* This originates from attach_command(). We need to overwrite the stop_signal here, because some kernels don't ignore a SIGSTOP in a subsequent ptrace(PTRACE_CONT,SIGSTOP) call. @@ -8776,7 +8757,6 @@ struct infcall_control_state /* Other fields: */ enum stop_stack_kind stop_stack_dummy; int stopped_by_random_signal; - int stop_after_trap; /* ID if the selected frame when the inferior function call was made. */ struct frame_id selected_frame_id; @@ -8808,7 +8788,6 @@ save_infcall_control_state (void) /* Other fields: */ inf_status->stop_stack_dummy = stop_stack_dummy; inf_status->stopped_by_random_signal = stopped_by_random_signal; - inf_status->stop_after_trap = stop_after_trap; inf_status->selected_frame_id = get_frame_id (get_selected_frame (NULL)); @@ -8860,7 +8839,6 @@ restore_infcall_control_state (struct infcall_control_state *inf_status) /* Other fields: */ stop_stack_dummy = inf_status->stop_stack_dummy; stopped_by_random_signal = inf_status->stopped_by_random_signal; - stop_after_trap = inf_status->stop_after_trap; if (target_has_stack) { -- 2.30.2