From: Lancelot SIX <lancelot.six@amd.com>
To: <gdb-patches@sourceware.org>
Cc: <lsix@lancelotsix.com>, Pedro Alves <pedro@palves.net>
Subject: [PATCH 1/3] MI: mi_runto -pending
Date: Fri, 17 Jun 2022 11:10:22 +0100 [thread overview]
Message-ID: <20220617101024.2830260-2-lancelot.six@amd.com> (raw)
In-Reply-To: <20220617101024.2830260-1-lancelot.six@amd.com>
From: Pedro Alves <pedro@palves.net>
With the CLI testsuite's runto proc, we can pass "allow-pending" as an
option, like:
runto func allow-pending
That is currently not possible with MI's mi_runto, however. This
patch makes it possible, by adding a new "-pending" option to
mi_runto.
A pending breakpoint shows different MI attributes compared to a
breakpoint with a location, so the regexp returned by
mi_make_breakpoint isn't suitable. Thus, add a new
mi_make_breakpoint_pending proc for pending breakpoints.
Tweak mi_runto to let it take and pass down arguments.
Change-Id: I185fef00ab545a1df2ce12b4dbc3da908783a37c
---
gdb/testsuite/lib/mi-support.exp | 66 +++++++++++++++++++++++++++++---
1 file changed, 60 insertions(+), 6 deletions(-)
diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index e578a7e6f9b..e724b2eeb51 100644
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -1114,6 +1114,8 @@ proc mi_clean_restart { args } {
# Supported options:
#
# -qualified -- pass --qualified to -break-insert
+# -pending -- pass -f to -break-insert to create a pending
+# breakpoint.
proc mi_runto_helper {func run_or_continue args} {
global mi_gdb_prompt expect_out
@@ -1122,13 +1124,24 @@ proc mi_runto_helper {func run_or_continue args} {
parse_args {{qualified}}
set test "mi runto $func"
- set bp [mi_make_breakpoint -type breakpoint -disp del \
- -func $func\(\\\(.*\\\)\)?]
+ if {$pending} {
+ set bp [mi_make_breakpoint_pending -type breakpoint -disp del]
+ } else {
+ set bp [mi_make_breakpoint -type breakpoint -disp del \
+ -func $func\(\\\(.*\\\)\)?]
+ }
set extra_opts ""
+ set extra_output ""
if {$qualified} {
- append extra_opts "--qualified"
+ lappend extra_opts "--qualified"
}
- mi_gdb_test "200-break-insert $extra_opts -t $func" "200\\^done,$bp" \
+ if {$pending} {
+ lappend extra_opts "-f"
+ # MI prints "Function FUNC not defined", "No line NNN in current
+ # file.", etc. to the CLI stream.
+ set extra_output "&\"\[^\r\n\]+\"\r\n"
+ }
+ mi_gdb_test "200-break-insert [join $extra_opts " "] -t $func" "${extra_output}200\\^done,$bp" \
"breakpoint at $func"
if {$run_or_continue == "run"} {
@@ -1142,8 +1155,8 @@ proc mi_runto_helper {func run_or_continue args} {
mi_expect_stop "breakpoint-hit" $func ".*" ".*" "\[0-9\]+" { "" "disp=\"del\"" } $test
}
-proc mi_runto {func} {
- return [mi_runto_helper $func "run"]
+proc mi_runto {func args} {
+ return [mi_runto_helper $func "run" {*}$args]
}
# Just like runto_main but works with the MI interface.
@@ -2683,6 +2696,47 @@ proc mi_make_breakpoint_multi {args} {
return $result
}
+# Construct a breakpoint regexp, for a pending breakpoint. This may
+# be used to test the output of -break-insert, -dprintf-insert, or
+# -break-info for pending breakpoints.
+#
+# Arguments for the breakpoint may be specified using the options
+# number, type, disp, enabled, pending.
+#
+# Example: mi_make_breakpoint_pending -number 2 -pending func
+# will return the breakpoint:
+# bkpt={number="2",type=".*",disp=".*",enabled=".*",addr="<PENDING>",
+# pending="func", times="0".*original-location=".*"}
+
+proc mi_make_breakpoint_pending {args} {
+ parse_args {{number .*} {type .*} {disp .*} {enabled .*}
+ {pending .*} {original-location .*}}
+
+ set attr_list {}
+ foreach attr [list number type disp enabled] {
+ lappend attr_list $attr [set $attr]
+ }
+
+ lappend attr_list "addr" "<PENDING>"
+
+ foreach attr [list pending] {
+ lappend attr_list $attr [set $attr]
+ }
+
+ set ignore 0
+ set times 0
+ set script ""
+ set cond ""
+ set evaluated-by ""
+
+ set result [mi_make_breakpoint_1 \
+ $attr_list $cond ${evaluated-by} $times \
+ $ignore $script ${original-location}]
+
+ append result "\\\}"
+ return $result
+}
+
# Construct a breakpoint regexp. This may be used to test the output of
# -break-insert, -dprintf-insert, or -break-info.
#
--
2.25.1
next prev parent reply other threads:[~2022-06-17 10:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-17 10:10 [PATCH 0/3] Fix some use-after-free errors in varobj code Lancelot SIX
2022-06-17 10:10 ` Lancelot SIX [this message]
2022-06-17 10:10 ` [PATCH 2/3] gdb/varobj: Fix use after free in varobj Lancelot SIX
2022-06-17 16:09 ` Andrew Burgess
2022-06-17 16:38 ` Lancelot SIX
2022-06-20 15:52 ` Lancelot SIX
2022-06-30 18:43 ` Formatting/indentation of lambdas (Re: [PATCH 2/3] gdb/varobj: Fix use after free in varobj) Pedro Alves
2022-07-05 13:33 ` Lancelot SIX
2022-06-17 10:10 ` [PATCH 3/3] gdb/varobj: Fix varobj_invalidate_iter Lancelot SIX
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=20220617101024.2830260-2-lancelot.six@amd.com \
--to=lancelot.six@amd.com \
--cc=gdb-patches@sourceware.org \
--cc=lsix@lancelotsix.com \
--cc=pedro@palves.net \
/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).