From: "Andrew Burgess" <aburgess@broadcom.com>
To: "gdb-patches@sourceware.org" <gdb-patches@sourceware.org>
Cc: lgustavo@codesourcery.com
Subject: [PATCH] Permanent breakpoints degrade to normal breakpoints on enable
Date: Fri, 18 Oct 2013 14:48:00 -0000 [thread overview]
Message-ID: <52614A15.7070301@broadcom.com> (raw)
This patch:
https://sourceware.org/ml/gdb-patches/2012-01/msg00964.html
introduced what I believe is a stray line that causes permanent
breakpoints to become normal breakpoints if the user ever tries
to "enable" the permanent breakpoint.
I've removed the extra line and written a test to cover this case.
OK to apply?
Andrew
gdb/ChangeLog
2013-10-18 Andrew Burgess <aburgess@broadcom.com>
* breakpoint.c (enable_breakpoint_disp): Remove setting of
enabled_state for permanent breakpoints.
gdb/testsuite/ChangeLog
2013-10-18 Andrew Burgess <aburgess@broadcom.com>
* gdb.arch/i386-permbkpt.exp: Extend the existing tests, and add
more tests.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 911f7b5..53ece71 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -14666,8 +14666,6 @@ enable_breakpoint_disp (struct breakpoint *bpt, enum bpdisp disposition,
if (bpt->enable_state != bp_permanent)
bpt->enable_state = bp_enabled;
- bpt->enable_state = bp_enabled;
-
/* Mark breakpoint locations modified. */
mark_breakpoint_modified (bpt);
diff --git a/gdb/testsuite/gdb.arch/i386-permbkpt.exp b/gdb/testsuite/gdb.arch/i386-permbkpt.exp
index 88bfff3..52c2ee1 100644
--- a/gdb/testsuite/gdb.arch/i386-permbkpt.exp
+++ b/gdb/testsuite/gdb.arch/i386-permbkpt.exp
@@ -18,6 +18,9 @@
# Test inserting breakpoints over permanent breakpoints on i386 and amd64.
+global hex
+global decimal
+
if { ![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"] } then {
verbose "Skipping i386 test for multi break at permanent breakpoint location."
return
@@ -35,5 +38,28 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
clean_restart ${binfile}
-gdb_test "break main" "" "First permanent break"
-gdb_test "break main" "" "Second permanent break"
+gdb_test "break main" \
+ "Breakpoint $decimal at $hex: .*" \
+ "First permanent break"
+gdb_test_no_output "set \$bp1 = \$bpnum"
+
+# Place a second breakpoint at the same place as the first, check
+# that the first is called a "permanent" breakpoint.
+gdb_test "break main" \
+ "Note: breakpoint $decimal \\(permanent\\) also set at pc $hex\.\[\n\r\]+Breakpoint $decimal at $hex: .*" \
+ "Second permanent break"
+gdb_test_no_output "set \$bp2 = \$bpnum"
+
+# Now, delete the last breakpoint placed.
+gdb_test_no_output "delete \$bp2"
+
+# Now 'enable' the first breakpoint, this should have no impact as the
+# breakpoint is already enabled, however, we've had bugs in this code
+# before now.
+gdb_test_no_output "enable \$bp1"
+
+# Check that placing (another) second breakpoint at the same location as
+# the first still reports the first as a permanent breakpoint.
+gdb_test "break main" \
+ "Note: breakpoint $decimal \\(permanent\\) also set at pc $hex\.\[\n\r\]+Breakpoint $decimal at $hex: .*" \
+ "Third permanent break"
next reply other threads:[~2013-10-18 14:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-18 14:48 Andrew Burgess [this message]
2013-10-18 14:53 ` Luis Machado
2013-10-18 16:15 ` Pedro Alves
2013-10-18 16:17 ` I think permanent breakpoints are fundamentally broken as is (was: Re: [PATCH] Permanent breakpoints degrade to normal breakpoints on enable) Pedro Alves
2013-10-29 17:52 ` I think permanent breakpoints are fundamentally broken as is Andrew Burgess
2013-11-05 18: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=52614A15.7070301@broadcom.com \
--to=aburgess@broadcom.com \
--cc=gdb-patches@sourceware.org \
--cc=lgustavo@codesourcery.com \
/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).