From 6613eb10d10ee79ef09bf4dfe696586f479c8d02 Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Fri, 14 Aug 2015 13:45:06 -0700 Subject: [PATCH] mi_make_breakpoint: add "evaluated-by" option For some time now, GDB has permitted target-side evaluation of breakpoint conditions. On targets that support this feature, GDB may output an "evaluated-by" field into the breakpoint reply. This patch adds handling for this option, and outputs a default pattern to optionally recognize (and ignore) this pattern in the reply. gdb/testsuite/ChangeLog * lib/mi-support.exp (mi_make_breakpoint): Add option/handling for "evaluated-by". --- gdb/testsuite/lib/mi-support.exp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index 74e893dbcfe..0d17ecb9ce8 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -2395,7 +2395,8 @@ proc mi_build_kv_pairs {attr_list {joiner ,}} { # # All arguments for the breakpoint may be specified using the options # number, type, disp, enabled, addr, func, file, fullanme, line, -# thread-groups, cond, times, ignore, script, and original-location. +# thread-groups, cond, evaluated-by, times, ignore, script, +# and original-location. # # Only if -script and -ignore are given will they appear in the output. # Otherwise, this procedure will skip them using ".*". @@ -2410,7 +2411,7 @@ proc mi_make_breakpoint {args} { parse_args {{number .*} {type .*} {disp .*} {enabled .*} {addr .*} {func .*} {file .*} {fullname .*} {line .*} {thread-groups \\\[.*\\\]} {times .*} {ignore 0} - {script ""} {original-location .*} {cond ""}} + {script ""} {original-location .*} {cond ""} {evaluated-by ""}} set attr_list {} foreach attr [list number type disp enabled addr func file \ @@ -2426,6 +2427,15 @@ proc mi_make_breakpoint {args} { if {[string length $cond] > 0} { append result "," append result [mi_build_kv_pairs [list "cond" $cond]] + + # When running on a remote, GDB may output who is evaluating + # breakpoint conditions. + if {[string length ${evaluated-by}] > 0} { + append result [mi_build_kv_pairs \ + [list "evaluated-by" ${evaluated-by}]] + } else { + append result {(,evaluated-by=".*")?} + } } append result "," -- 2.30.2