From: Andrew Burgess <aburgess@redhat.com>
To: gdb-patches@sourceware.org
Cc: Andrew Burgess <aburgess@redhat.com>
Subject: [PATCHv3 1/2] gdb: cleanup around some set_momentary_breakpoint_at_pc calls
Date: Thu, 16 Mar 2023 17:03:44 +0000 [thread overview]
Message-ID: <bd94773f0876cf066dc9f78c5f686f8fe56cc890.1678985326.git.aburgess@redhat.com> (raw)
In-Reply-To: <cover.1678985326.git.aburgess@redhat.com>
I noticed a couple of places in infrun.c where we call
set_momentary_breakpoint_at_pc, and then set the newly created
breakpoint's thread field, these are in:
insert_exception_resume_breakpoint
insert_exception_resume_from_probe
Function set_momentary_breakpoint_at_pc calls
set_momentary_breakpoint, which always creates the breakpoint as
thread-specific for the current inferior_thread().
The two insert_* functions mentioned above take an arbitrary
thread_info* as an argument and set the breakpoint::thread to hold the
thread number of that arbitrary thread.
However, the insert_* functions store the breakpoint pointer within
the current inferior_thread(), so we know that the thread being passed
in must be the currently selected thread.
What this means is that we can:
1. Assert that the thread being passed in is the currently selected
thread, and
2. No longer adjust the breakpoint::thread field, this will already
have been set correctly be calling set_momentary_breakpoint_at_pc.
There should be no user visible changes after this commit.
---
gdb/infrun.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 33aa0c8794b..35c3d2b8f58 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -8138,6 +8138,9 @@ insert_exception_resume_breakpoint (struct thread_info *tp,
infrun_debug_printf ("exception resume at %lx",
(unsigned long) handler);
+ /* set_momentary_breakpoint_at_pc creates a thread-specific
+ breakpoint for the current inferior thread. */
+ gdb_assert (tp == inferior_thread ());
bp = set_momentary_breakpoint_at_pc (get_frame_arch (frame),
handler,
bp_exception_resume).release ();
@@ -8145,8 +8148,7 @@ insert_exception_resume_breakpoint (struct thread_info *tp,
/* set_momentary_breakpoint_at_pc invalidates FRAME. */
frame = nullptr;
- bp->thread = tp->global_num;
- inferior_thread ()->control.exception_resume_breakpoint = bp;
+ tp->control.exception_resume_breakpoint = bp;
}
}
catch (const gdb_exception_error &e)
@@ -8176,10 +8178,12 @@ insert_exception_resume_from_probe (struct thread_info *tp,
infrun_debug_printf ("exception resume at %s",
paddress (probe->objfile->arch (), handler));
+ /* set_momentary_breakpoint_at_pc creates a thread-specific breakpoint
+ for the current inferior thread. */
+ gdb_assert (tp == inferior_thread ());
bp = set_momentary_breakpoint_at_pc (get_frame_arch (frame),
handler, bp_exception_resume).release ();
- bp->thread = tp->global_num;
- inferior_thread ()->control.exception_resume_breakpoint = bp;
+ tp->control.exception_resume_breakpoint = bp;
}
/* This is called when an exception has been intercepted. Check to
--
2.25.4
next prev parent reply other threads:[~2023-03-16 17:03 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-28 11:25 [PATCH 0/6] Inferior specific breakpoints Andrew Burgess
2022-11-28 11:25 ` [PATCH 1/6] gdb/remote: announce thread exit events for remote targets Andrew Burgess
2022-11-28 11:25 ` [PATCH 2/6] gdb/testsuite: don't try to set non-stop mode on a running target Andrew Burgess
2022-11-28 11:25 ` [PATCH 3/6] gdb: fix display of thread condition for multi-location breakpoints Andrew Burgess
2022-12-23 8:37 ` Aktemur, Tankut Baris
2022-11-28 11:25 ` [PATCH 4/6] gdb: error if 'thread' or 'task' keywords are overused Andrew Burgess
2022-11-28 13:10 ` Eli Zaretskii
2022-11-28 11:25 ` [PATCH 5/6] gdb: add inferior-specific breakpoints and watchpoints Andrew Burgess
2022-11-28 13:18 ` Eli Zaretskii
2022-12-23 10:05 ` Aktemur, Tankut Baris
2023-01-19 19:13 ` Andrew Burgess
2023-01-20 13:12 ` Aktemur, Tankut Baris
2022-11-28 11:25 ` [PATCH 6/6] gdb: convert the 'start' breakpoint to use inferior keyword Andrew Burgess
2022-12-23 10:17 ` Aktemur, Tankut Baris
2022-12-23 10:55 ` [PATCH 0/6] Inferior specific breakpoints Aktemur, Tankut Baris
2023-01-20 9:46 ` [PATCHv2 " Andrew Burgess
2023-01-20 9:46 ` [PATCHv2 1/6] gdb/remote: announce thread exit events for remote targets Andrew Burgess
2023-02-02 17:50 ` Pedro Alves
2023-02-04 15:46 ` Andrew Burgess
2023-01-20 9:46 ` [PATCHv2 2/6] gdb/testsuite: don't try to set non-stop mode on a running target Andrew Burgess
2023-02-04 16:22 ` Andrew Burgess
2023-01-20 9:46 ` [PATCHv2 3/6] gdb: fix display of thread condition for multi-location breakpoints Andrew Burgess
2023-02-02 18:13 ` Pedro Alves
2023-02-06 14:48 ` Andrew Burgess
2023-02-06 17:01 ` Pedro Alves
2023-02-07 14:42 ` Andrew Burgess
2023-01-20 9:46 ` [PATCHv2 4/6] gdb: error if 'thread' or 'task' keywords are overused Andrew Burgess
2023-01-20 13:22 ` Eli Zaretskii
2023-02-02 14:08 ` Andrew Burgess
2023-02-02 14:31 ` Eli Zaretskii
2023-02-02 18:21 ` Pedro Alves
2023-02-03 16:41 ` Andrew Burgess
2023-02-04 5:52 ` Joel Brobecker
2023-02-04 15:40 ` Andrew Burgess
2023-02-06 11:06 ` Andrew Burgess
2023-01-20 9:46 ` [PATCHv2 5/6] gdb: add inferior-specific breakpoints and watchpoints Andrew Burgess
2023-01-20 13:25 ` Eli Zaretskii
2023-02-02 19:17 ` Pedro Alves
2023-02-03 16:55 ` Andrew Burgess
2023-02-06 17:24 ` Pedro Alves
2023-02-16 12:56 ` Aktemur, Tankut Baris
2023-01-20 9:46 ` [PATCHv2 6/6] gdb: convert the 'start' breakpoint to use inferior keyword Andrew Burgess
2023-02-16 12:59 ` Aktemur, Tankut Baris
2023-03-16 17:03 ` [PATCHv3 0/2] Inferior specific breakpoints Andrew Burgess
2023-03-16 17:03 ` Andrew Burgess [this message]
2023-04-03 14:12 ` [PATCHv3 1/2] gdb: cleanup around some set_momentary_breakpoint_at_pc calls Andrew Burgess
2023-03-16 17:03 ` [PATCHv3 2/2] gdb: add inferior-specific breakpoints Andrew Burgess
2023-04-03 14:14 ` [PATCHv4] " Andrew Burgess
2023-05-15 19:15 ` [PATCHv5] " Andrew Burgess
2023-05-30 20:41 ` [PATCHv6] " Andrew Burgess
2023-07-07 10:23 ` [PATCHv7] " Andrew Burgess
2023-08-17 15:53 ` [PUSHEDv8] " Andrew Burgess
2023-08-23 8:06 ` [PUSHED] gdb: add missing notify_breakpoint_modified call Andrew Burgess
2023-08-23 8:19 ` [PUSHED] gdb/testsuite: improve MI support for inferior specific breakpoints Andrew Burgess
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=bd94773f0876cf066dc9f78c5f686f8fe56cc890.1678985326.git.aburgess@redhat.com \
--to=aburgess@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).