diff options
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/infrun.c | 43 |
2 files changed, 17 insertions, 35 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 766d1531de5..b55ffdd89fc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,14 @@ 2017-11-16 Pedro Alves <palves@redhat.com> + * infrun.c (resume_cleanups): Delete. + (resume): No longer install a resume_cleanups cleanup nor call + QUIT. + (proceed): Pass the terminal to the inferior. + (keep_going_pass_signal): No longer install a resume_cleanups + cleanup. + +2017-11-16 Pedro Alves <palves@redhat.com> + * inf-loop.c (inferior_event_handler): Don't swallow the exception if the prompt is blocked. diff --git a/gdb/infrun.c b/gdb/infrun.c index e2d1248e750..49f2fc54d6e 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -74,8 +74,6 @@ static void sig_print_info (enum gdb_signal); static void sig_print_header (void); -static void resume_cleanups (void *); - static int follow_fork (void); static int follow_fork_inferior (int follow_child, int detach_fork); @@ -2192,17 +2190,6 @@ infrun_thread_ptid_changed (ptid_t old_ptid, ptid_t new_ptid) } -/* Resuming. */ - -/* Things to clean up if we QUIT out of resume (). */ -static void -resume_cleanups (void *ignore) -{ - if (!ptid_equal (inferior_ptid, null_ptid)) - delete_single_step_breakpoints (inferior_thread ()); - - normal_stop (); -} static const char schedlock_off[] = "off"; static const char schedlock_on[] = "on"; @@ -2367,17 +2354,12 @@ do_target_resume (ptid_t resume_ptid, int step, enum gdb_signal sig) target_commit_resume (); } -/* Resume the inferior, but allow a QUIT. This is useful if the user - wants to interrupt some lengthy single-stepping operation - (for child processes, the SIGINT goes to the inferior, and so - we get a SIGINT random_signal, but for remote debugging and perhaps - other targets, that's not true). +/* Resume the inferior. SIG is the signal to give the inferior + (GDB_SIGNAL_0 for none). */ - SIG is the signal to give the inferior (zero for none). */ void resume (enum gdb_signal sig) { - struct cleanup *old_cleanups = make_cleanup (resume_cleanups, 0); struct regcache *regcache = get_current_regcache (); struct gdbarch *gdbarch = regcache->arch (); struct thread_info *tp = inferior_thread (); @@ -2397,8 +2379,6 @@ resume (enum gdb_signal sig) gdb_assert (!tp->stop_requested); gdb_assert (!thread_is_in_step_over_chain (tp)); - QUIT; - if (tp->suspend.waitstatus_pending_p) { if (debug_infrun) @@ -2425,7 +2405,6 @@ resume (enum gdb_signal sig) } tp->suspend.stop_signal = GDB_SIGNAL_0; - discard_cleanups (old_cleanups); if (target_can_async_p ()) target_async (1); @@ -2537,7 +2516,6 @@ resume (enum gdb_signal sig) resume_ptid = internal_resume_ptid (user_step); do_target_resume (resume_ptid, 0, GDB_SIGNAL_0); - discard_cleanups (old_cleanups); tp->resumed = 1; return; } @@ -2575,7 +2553,6 @@ resume (enum gdb_signal sig) "Got placed in step-over queue\n"); tp->control.trap_expected = 0; - discard_cleanups (old_cleanups); return; } else if (prepared < 0) @@ -2752,7 +2729,6 @@ resume (enum gdb_signal sig) do_target_resume (resume_ptid, step, sig); tp->resumed = 1; - discard_cleanups (old_cleanups); } /* Proceeding. */ @@ -3067,6 +3043,12 @@ proceed (CORE_ADDR addr, enum gdb_signal siggnal) inferior. */ gdb_flush (gdb_stdout); + /* Since we've marked the inferior running, give it the terminal. A + QUIT/Ctrl-C from here on is forwarded to the target (which can + still detect attempts to unblock a stuck connection with repeated + Ctrl-C from within target_pass_ctrlc). */ + target_terminal::inferior (); + /* In a multi-threaded task we may select another thread and then continue or step. @@ -7657,10 +7639,6 @@ stop_waiting (struct execution_control_state *ecs) static void keep_going_pass_signal (struct execution_control_state *ecs) { - /* Make sure normal_stop is called if we get a QUIT handled before - reaching resume. */ - struct cleanup *old_cleanups = make_cleanup (resume_cleanups, 0); - gdb_assert (ptid_equal (ecs->event_thread->ptid, inferior_ptid)); gdb_assert (!ecs->event_thread->resumed); @@ -7682,7 +7660,6 @@ keep_going_pass_signal (struct execution_control_state *ecs) non-signal event (e.g., a fork); or took a signal which we are supposed to pass through to the inferior. Simply continue. */ - discard_cleanups (old_cleanups); resume (ecs->event_thread->suspend.stop_signal); } else if (step_over_info_valid_p ()) @@ -7710,8 +7687,6 @@ keep_going_pass_signal (struct execution_control_state *ecs) "resume of %s deferred\n", target_pid_to_str (tp->ptid)); } - - discard_cleanups (old_cleanups); } else { @@ -7775,14 +7750,12 @@ keep_going_pass_signal (struct execution_control_state *ecs) { exception_print (gdb_stderr, e); stop_waiting (ecs); - discard_cleanups (old_cleanups); return; } END_CATCH ecs->event_thread->control.trap_expected = (remove_bp || remove_wps); - discard_cleanups (old_cleanups); resume (ecs->event_thread->suspend.stop_signal); } |