From: Pedro Alves <palves@redhat.com>
To: gdb-patches@sourceware.org
Subject: [PATCH v2 06/23] Make thread_still_needs_step_over consider stepping_over_watchpoint too
Date: Tue, 07 Apr 2015 13:30:00 -0000 [thread overview]
Message-ID: <1428410990-28560-7-git-send-email-palves@redhat.com> (raw)
In-Reply-To: <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 <palves@redhat.com>
* 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);
}
--
1.9.3
next prev parent reply other threads:[~2015-04-07 13:30 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-07 12:49 [PATCH v2 00/23] All-stop on top of non-stop Pedro Alves
2015-04-07 12:50 ` [PATCH v2 15/23] Implement all-stop on top of a target running non-stop mode Pedro Alves
2015-04-07 13:36 ` Eli Zaretskii
2015-04-08 9:34 ` Yao Qi
2015-04-08 9:53 ` Pedro Alves
2015-04-08 11:08 ` Pedro Alves
2015-04-08 19:35 ` Pedro Alves
2015-04-08 19:41 ` Pedro Alves
2015-04-07 12:50 ` [PATCH v2 16/23] Fix signal-while-stepping-over-bp-other-thread.exp on targets always in non-stop Pedro Alves
2015-04-07 12:50 ` [PATCH v2 02/23] Fix and test "checkpoint" in non-stop mode Pedro Alves
2015-04-07 12:50 ` [PATCH v2 21/23] PPC64: Fix gdb.arch/ppc64-atomic-inst.exp with displaced stepping Pedro Alves
2015-04-07 12:50 ` [PATCH v2 12/23] Misc switch_back_to_stepped_thread cleanups Pedro Alves
2015-04-07 12:50 ` [PATCH v2 20/23] PPC64: symbol-file + exec-file results in broken displaced stepping Pedro Alves
2015-04-07 12:50 ` [PATCH v2 04/23] Change adjust_pc_after_break's prototype Pedro Alves
2015-04-07 12:50 ` [PATCH v2 11/23] Use keep_going in proceed and start_step_over too Pedro Alves
2015-04-07 12:50 ` [PATCH v2 22/23] S/390: displaced stepping and PC-relative RIL-b/RIL-c instructions Pedro Alves
2015-04-07 12:50 ` [PATCH v2 10/23] PPC64: Fix step-over-trips-on-watchpoint.exp with displaced stepping on Pedro Alves
2015-04-07 12:50 ` [PATCH v2 09/23] Make gdb.threads/step-over-trips-on-watchpoint.exp effective on !x86 Pedro Alves
2015-04-07 12:50 ` [PATCH v2 05/23] remote.c/all-stop: Implement TARGET_WAITKIND_NO_RESUMED and TARGET_WNOHANG Pedro Alves
2015-04-07 12:50 ` [PATCH v2 23/23] native Linux: enable always non-stop by default Pedro Alves
2015-04-07 12:50 ` [PATCH v2 19/23] Disable displaced stepping if trying it fails Pedro Alves
2015-04-07 12:50 ` [PATCH v2 01/23] Fix gdb.base/sigstep.exp with displaced stepping on software single-step targets Pedro Alves
2015-04-10 9:56 ` Pedro Alves
2015-04-07 12:50 ` [PATCH v2 03/23] PR13858 - Can't do displaced stepping with no symbols Pedro Alves
2015-04-09 12:46 ` Pedro Alves
2015-04-07 12:55 ` [PATCH v2 17/23] Fix interrupt-noterm.exp on targets always in non-stop Pedro Alves
2015-04-07 12:57 ` [PATCH v2 08/23] Test step-over-{lands-on-breakpoint|trips-on-watchpoint}.exp with displaced stepping Pedro Alves
2015-04-10 14:54 ` Pedro Alves
2015-04-07 12:59 ` [PATCH v2 07/23] Embed the pending step-over chain in thread_info objects Pedro Alves
2015-04-07 12:59 ` [PATCH v2 13/23] Factor out code to re-resume stepped thread Pedro Alves
2015-04-07 12:59 ` [PATCH v2 14/23] Teach non-stop to do in-line step-overs (stop all, step, restart) Pedro Alves
2015-04-07 13:30 ` [PATCH v2 18/23] Fix step-over-{trips-on-watchpoint|lands-on-breakpoint}.exp race Pedro Alves
2015-04-07 13:30 ` Pedro Alves [this message]
2015-04-08 9:28 ` [PATCH v2 06/23] Make thread_still_needs_step_over consider stepping_over_watchpoint too Yao Qi
2015-04-13 10:47 ` Pedro Alves
2015-04-08 9:45 ` [PATCH v2 00/23] All-stop on top of non-stop Yao Qi
2015-04-08 10:17 ` Pedro Alves
2015-04-08 10:30 ` Pedro Alves
2015-04-10 8:41 ` Yao Qi
2015-04-10 8:50 ` Pedro Alves
2015-04-10 8:22 ` Yao Qi
2015-04-10 8:34 ` Pedro Alves
2015-04-10 9:26 ` Yao Qi
2015-04-13 15:28 ` Pedro Alves
2015-04-13 16:16 ` Yao Qi
2015-04-13 16:23 ` Pedro Alves
2015-04-13 16:23 ` Pedro Alves
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1428410990-28560-7-git-send-email-palves@redhat.com \
--to=palves@redhat.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).