From patchwork Tue Apr 7 12:49:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 6065 Received: (qmail 14799 invoked by alias); 7 Apr 2015 13:30:46 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 14775 invoked by uid 89); 7 Apr 2015 13:30:45 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 07 Apr 2015 13:30:44 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t37Cnw7R018718 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 7 Apr 2015 08:49:59 -0400 Received: from brno.lan (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t37Cnowq022139 for ; Tue, 7 Apr 2015 08:49:58 -0400 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH v2 06/23] Make thread_still_needs_step_over consider stepping_over_watchpoint too Date: Tue, 7 Apr 2015 13:49:33 +0100 Message-Id: <1428410990-28560-7-git-send-email-palves@redhat.com> In-Reply-To: <1428410990-28560-1-git-send-email-palves@redhat.com> References: <1428410990-28560-1-git-send-email-palves@redhat.com> I noticed that even though keep_going knows to start a step over for a watchpoint, thread_still_needs_step_over doesn't. gdb/ChangeLog: 2015-04-07 Pedro Alves * infrun.c (thread_still_needs_step_over): Rename to ... (thread_still_needs_step_over_bp): ... this. (enum step_over_what): New. (thread_still_needs_step_over): Reimplement. --- gdb/infrun.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/gdb/infrun.c b/gdb/infrun.c index 1e8ee4f..c544362 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -2521,7 +2521,7 @@ clear_proceed_status (int step) meanwhile, we can skip the whole step-over dance. */ static int -thread_still_needs_step_over (struct thread_info *tp) +thread_still_needs_step_over_bp (struct thread_info *tp) { if (tp->stepping_over_breakpoint) { @@ -2538,6 +2538,34 @@ thread_still_needs_step_over (struct thread_info *tp) return 0; } +/* Bit flags indicating what the thread needs to step over. */ + +enum step_over_what + { + STEP_OVER_BREAKPOINT = 1, + STEP_OVER_WATCHPOINT = 2 + }; + +/* Check whether thread TP still needs to start a step-over in order + to make progress when resumed. Returns a union of enum + step_over_what bits, indicating what needs to be stepped over. */ + +static int +thread_still_needs_step_over (struct thread_info *tp) +{ + struct inferior *inf = find_inferior_ptid (tp->ptid); + int what = 0; + + if (thread_still_needs_step_over_bp (tp)) + what |= STEP_OVER_BREAKPOINT; + + if (tp->stepping_over_watchpoint + && !target_have_steppable_watchpoint) + what |= STEP_OVER_WATCHPOINT; + + return what; +} + /* Returns true if scheduler locking applies. STEP indicates whether we're about to do a step/next-like command to a thread. */ @@ -6274,6 +6302,7 @@ keep_going (struct execution_control_state *ecs) int remove_bp; int remove_wps; enum gdb_signal signo; + enum step_over_what step_what; /* Either the trap was not expected, but we are continuing anyway (if we got a signal, the user asked it be passed to @@ -6294,11 +6323,6 @@ keep_going (struct execution_control_state *ecs) instruction, and then re-insert the breakpoint when that step is finished. */ - remove_bp = (ecs->hit_singlestep_breakpoint - || thread_still_needs_step_over (ecs->event_thread)); - remove_wps = (ecs->event_thread->stepping_over_watchpoint - && !target_have_steppable_watchpoint); - /* Do not deliver GDB_SIGNAL_TRAP (except when the user explicitly specifies that such a signal should be delivered to the target program). Typically, that would occur when a @@ -6315,6 +6339,12 @@ keep_going (struct execution_control_state *ecs) signo = ecs->event_thread->suspend.stop_signal; + step_what = thread_still_needs_step_over (ecs->event_thread); + + remove_bp = (ecs->hit_singlestep_breakpoint + || (step_what & STEP_OVER_BREAKPOINT)); + remove_wps = (step_what & STEP_OVER_WATCHPOINT); + if (remove_bp && !use_displaced_stepping_now_p (get_regcache_arch (regcache), signo)) @@ -6327,6 +6357,8 @@ keep_going (struct execution_control_state *ecs) else clear_step_over_info (); + ecs->event_thread->control.trap_expected = (remove_bp || remove_wps); + /* Stop stepping if inserting breakpoints fails. */ TRY { @@ -6341,8 +6373,6 @@ keep_going (struct execution_control_state *ecs) } END_CATCH - ecs->event_thread->control.trap_expected = (remove_bp || remove_wps); - discard_cleanups (old_cleanups); resume (ecs->event_thread->suspend.stop_signal); }