4b48d43901
breakpoint table handling. This is a patch in five parts (all committed here in one commit). ----- 1/5: parse_args parse_args is a very useful utility function which allows you to do getopt-y kinds of things in Tcl. Example: proc myproc {foo args} { parse_args {{bar} {baz "abc"} {qux}} # ... } myproc ABC -bar -baz DEF peanut butter will define the following variables in myproc: foo (=ABC), bar (=1), baz (=DEF), and qux (=0) args will be the list {peanut butter} ----- 2/5: mi_build_kv_pairs build_kv_pairs simply does what it says: given the input list and an option join string, it combines list elements into kv-pairs for MI handling. It knows how to handle tuples and other special MI types. Example: mi_build_kv_pairs {a b c d e f g \[.*\]} returns a=\"b\",c=\"d\",e=\"f\",g=\[.*\] ----- 3/5: mi_make_breakpoint This function builds breakpoint regexps, such as "bkpt={number=\".*\", [snip]}". Note that ONLY the options given to mi_make_breakpoint/mi_create_breakpoint will actually be tested. So if -number is omitted, the regexp will allow anything [number=\".*\"] Examples: mi_make_breakpoint -number 3 mi_create_breakpoint "myfile.c:21" -file myfile.c -line 21 ----- 4/5: mi_make_breakpoint_table This function builds MI breakpoint table regexps. Example: set bps {} lappend bps [mi_make_breakpoint -number 1 -func "main" \ -file ".*/myfile.c" -line 42 lappend bps [mi_make_breakpoint -number 2 -func "marker" \ -file ".*myfile.c" -line 21 gdb_test "-break-info" "\\^done,[mi_make_breakpoint_table $bps]" \ "breakpoint list" ----- 5/5: Update all callers Self-explanatory testsuite/ChangeLog 2014-04-23 Keith Seitz <keiths@redhat.com> * lib/mi-support.exp (mi_list_breakpoints): Delete. (mi_make_breakpoint_table): New procedure. (mi_create_breakpoint): Use mi_make_breakpoint and return the result. (mi_make_breakpoint): New procedure. (mi_build_kv_pairs): New procedure. * gdb.mi/mi-break.exp: Remove unused globals, update mi_create_breakpoint usage, and use mi_make_breakpoint_table. All callers updated. * gdb.mi/mi-dprintf.exp: Use variable to track command number. Update all callers of mi_create_breakpoint and use mi_make_breakpoint_table. Remove any unused global variables. * gdb.mi/mi-nonstop.exp: Likewise. * gdb.mi/mi-nsintrall.exp: Likewise. * gdb.mi/mi-nsmoribund.exp: Likewise. * gdb.mi/mi-nsthrexec.exp: Likewise. * gdb.mi/mi-reverse.exp: Likewise. * gdb.mi/mi-simplerun.exp: Likewise. * gdb.mi/mi-stepn.exp: Likewise. * gdb.mi/mi-syn-frame.exp: Likewise. * gdb.mi/mi-until.exp: Likewise. * gdb.mi/mi-var-cp.exp: Likewise. * gdb.mi/mi-var-display.exp: Likewise. * gdb.mi/mi2-amd64-entry-value.exp: Likewise. * gdb.mi/mi2-var-child.exp: Likewise. * gdb.mi/mi-vla-c99.exp: Likewise. * lib/mi-support.exp: Likewise. From Ian Lance Taylor <iant@cygnus.com>: * lib/gdb.exp (parse_args): New procedure.
189 lines
5.4 KiB
Text
189 lines
5.4 KiB
Text
# Copyright (C) 2013-2014 Free Software Foundation, Inc.
|
|
# Contributed by Hui Zhu <hui@codesourcery.com>
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
load_lib mi-support.exp
|
|
set MIFLAGS "-i=mi"
|
|
|
|
gdb_exit
|
|
if [mi_gdb_start] {
|
|
continue
|
|
}
|
|
|
|
standard_testfile
|
|
|
|
if {[build_executable $testfile.exp $testfile $srcfile {debug}] == -1} {
|
|
untested "failed to compile $testfile"
|
|
return -1
|
|
}
|
|
|
|
mi_delete_breakpoints
|
|
|
|
set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
|
|
set dp_location1 [gdb_get_line_number "set dprintf 1 here"]
|
|
|
|
mi_run_to_main
|
|
|
|
set i 0
|
|
mi_gdb_test "[incr i]-dprintf-insert" \
|
|
"$i\\^error,msg=\"-dprintf-insert: Missing <location>\"" "mi insert without location"
|
|
|
|
mi_gdb_test "[incr i]-dprintf-insert foo" \
|
|
"$i\\^error,msg=\"-dprintf-insert: Missing <format>\"" "mi insert breakpoint without format string"
|
|
|
|
mi_gdb_test "[incr i]-dprintf-insert 29" \
|
|
"$i\\^error,msg=\"-dprintf-insert: Missing <format>\"" "mi insert second breakpoint without format string"
|
|
|
|
mi_gdb_test "-break-insert main" ".*" "mi insert breakpoint main"
|
|
mi_delete_breakpoints
|
|
|
|
set bps [mi_make_breakpoint -type dprintf -func foo -file ".*mi-dprintf.c" \
|
|
-fullname ".*mi-dprintf.c"]
|
|
mi_gdb_test "[incr i]-dprintf-insert foo \"\\\"foobarbazqux\\\" At foo entry\\n\"" \
|
|
"$i\\^done,$bps" "mi insert dprintf foo"
|
|
|
|
set bps [mi_make_breakpoint -type dprintf -func foo \
|
|
-file ".*mi-dprintf.c" -fullname ".*mi-dprintf.c" \
|
|
-line $dp_location1]
|
|
mi_gdb_test "[incr i]-dprintf-insert $dp_location1 \"arg=%d, g=%d\\n\" arg g" \
|
|
"$i\\^done,$bps" "mi insert dprintf dp_location1"
|
|
|
|
set bps {}
|
|
lappend bps [mi_make_breakpoint -number 3 -type dprintf -func foo \
|
|
-file ".*mi-dprintf.c" -fullname ".*mi-dprintf.c"]
|
|
lappend bps [mi_make_breakpoint -type dprintf -func foo \
|
|
-file ".*mi-dprintf.c" -fullname ".*mi-dprintf.c" \
|
|
-line $dp_location1]
|
|
mi_gdb_test "[incr i]-break-info" \
|
|
"$i\\^done,[mi_make_breakpoint_table $bps]" \
|
|
"mi info dprintf"
|
|
|
|
mi_gdb_test "-break-insert $bp_location1" ".*" "mi insert breakpoint bp_location1"
|
|
|
|
proc mi_continue_dprintf {args} {
|
|
with_test_prefix $args {
|
|
global mi_gdb_prompt
|
|
|
|
if { $args == "call" || $args == "fprintf" } {
|
|
set foobarbazqux "\"foobarbazqux\""
|
|
} else {
|
|
set foobarbazqux "\\\\\"foobarbazqux\\\\\""
|
|
}
|
|
|
|
mi_run_cmd
|
|
set msg "mi 1st dprintf"
|
|
gdb_expect {
|
|
-re ".*$foobarbazqux At foo entry.*arg=1234, g=1234" {
|
|
pass $msg
|
|
}
|
|
-re ".*$mi_gdb_prompt$" {
|
|
fail $msg
|
|
}
|
|
timeout {
|
|
fail $msg
|
|
}
|
|
}
|
|
mi_expect_stop ".*" ".*" ".*" ".*" ".*" "" "$msg stop"
|
|
|
|
set msg "mi 2nd dprintf"
|
|
mi_send_resuming_command "exec-continue" "$msg continue"
|
|
gdb_expect {
|
|
-re ".*$foobarbazqux At foo entry.*arg=1235, g=2222" {
|
|
pass $msg
|
|
}
|
|
-re ".*$mi_gdb_prompt$" {
|
|
fail $msg
|
|
}
|
|
timeout {
|
|
fail $msg
|
|
}
|
|
}
|
|
mi_expect_stop ".*" ".*" ".*" ".*" ".*" "" "$msg 2nd stop"
|
|
}
|
|
}
|
|
|
|
mi_continue_dprintf "gdb"
|
|
|
|
# The "call" style depends on having I/O functions available, so test.
|
|
|
|
if ![target_info exists gdb,noinferiorio] {
|
|
|
|
# Now switch styles and rerun; in the absence of redirection the
|
|
# output should be the same.
|
|
|
|
mi_gdb_test "set dprintf-style call" ".*" "mi set dprintf style to call"
|
|
mi_continue_dprintf "call"
|
|
|
|
mi_gdb_test "set dprintf-function fprintf" ".*" "mi set dprintf-channel stderr"
|
|
mi_gdb_test "set dprintf-channel stderr" ".*" "mi set dprintf channel"
|
|
mi_continue_dprintf "fprintf"
|
|
}
|
|
|
|
set target_can_dprintf 0
|
|
set msg "set dprintf style to agent"
|
|
send_gdb "set dprintf-style agent\n"
|
|
gdb_expect {
|
|
-re "warning: Target cannot run dprintf commands, falling back to GDB printf.*$mi_gdb_prompt$" {
|
|
unsupported "$msg"
|
|
}
|
|
-re ".*done.*$mi_gdb_prompt$" {
|
|
set target_can_dprintf 1
|
|
pass "$msg"
|
|
}
|
|
-re ".*$mi_gdb_prompt$" {
|
|
fail "$msg"
|
|
}
|
|
timeout {
|
|
fail "$msg"
|
|
}
|
|
}
|
|
|
|
if $target_can_dprintf {
|
|
if {[mi_run_cmd] < 0} {
|
|
# This likely means we failed to use target side commands in
|
|
# combination with software breakpoints. IOW, the target
|
|
# likely doesn't support target-side software breakpoints.
|
|
set target_can_dprintf 0
|
|
unsupported "send dprintf to target"
|
|
}
|
|
|
|
if $target_can_dprintf {
|
|
mi_expect_stop ".*" ".*" ".*" ".*" ".*" "" "mi expect stop"
|
|
|
|
mi_send_resuming_command "exec-continue" "mi 1st dprintf continue, agent"
|
|
mi_expect_stop ".*" "foo" ".*" ".*" ".*" "" "mi 1st dprintf, agent"
|
|
|
|
mi_send_resuming_command "exec-continue" "mi 2nd dprintf continue, agent"
|
|
|
|
# The =breakpoint-modified text is a part of the
|
|
# "-exec-continue" output.
|
|
set msg "mi info dprintf second time"
|
|
gdb_expect {
|
|
-re "=breakpoint-modified," {
|
|
pass $msg
|
|
}
|
|
-re ".*$mi_gdb_prompt$" {
|
|
fail "$msg"
|
|
}
|
|
timeout {
|
|
fail "$msg"
|
|
}
|
|
}
|
|
|
|
mi_expect_stop ".*" "foo" ".*" ".*" ".*" "" "mi 2nd dprintf, agent"
|
|
}
|
|
}
|
|
|
|
mi_gdb_test "set dprintf-style foobar" ".*error.*" "mi set dprintf style to an unrecognized type"
|