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.
100 lines
2.9 KiB
Text
100 lines
2.9 KiB
Text
# Copyright 2008-2014 Free Software Foundation, Inc.
|
|
|
|
# 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/>.
|
|
|
|
if { ![support_displaced_stepping] } {
|
|
unsupported "displaced stepping"
|
|
return -1
|
|
}
|
|
|
|
load_lib mi-support.exp
|
|
set MIFLAGS "-i=mi"
|
|
|
|
gdb_exit
|
|
if {[mi_gdb_start]} {
|
|
continue
|
|
}
|
|
|
|
#
|
|
# Start here
|
|
#
|
|
standard_testfile nsintrall.c
|
|
|
|
set options [list debug]
|
|
if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
|
|
return -1
|
|
}
|
|
|
|
mi_gdb_reinitialize_dir $srcdir/$subdir
|
|
mi_gdb_load $binfile
|
|
|
|
mi_gdb_test "-gdb-set non-stop 1" ".*"
|
|
mi_gdb_test "-gdb-set target-async 1" ".*"
|
|
mi_detect_async
|
|
|
|
if { [mi_run_to_main] < 0 } {
|
|
continue
|
|
}
|
|
|
|
mi_create_breakpoint thread_function \
|
|
"breakpoint at thread_function" \
|
|
-number 2 -func thread_function
|
|
|
|
mi_send_resuming_command "exec-continue --all" "resume all"
|
|
for {set i 0} {$i < 6} {incr i} {
|
|
mi_expect_stop "breakpoint-hit" "thread_function" "\[^\n\]*" "$srcfile" \
|
|
"\[0-9\]*" {"" "disp=\"keep\""} "stop $i"
|
|
}
|
|
|
|
mi_check_thread_states \
|
|
{"stopped" "stopped" "stopped" "stopped" "stopped" "stopped"} \
|
|
"thread state, all stopped"
|
|
|
|
# now that we know about all the threads, we can get rid of the breakpoints
|
|
mi_delete_breakpoints
|
|
|
|
# Here we create a response string. Note we don't want \r\n at the end,
|
|
# since mi_gdb_test will append this itself.
|
|
set running_re ""
|
|
for {set i 6} {$i > 1} {incr i -1} {
|
|
set running_re "$running_re\\*running,thread-id=\"$i\"\r\n"
|
|
}
|
|
set running_re "$running_re\\*running,thread-id=\"1\""
|
|
|
|
mi_gdb_test "-exec-continue --all" "\[^\n\]*\r\n$running_re" \
|
|
"resume all, no breakpoint"
|
|
|
|
mi_check_thread_states \
|
|
{"running" "running" "running" "running" "running" "running"} \
|
|
"thread state, resume all"
|
|
|
|
mi_gdb_test "200-exec-interrupt --all" "200\\^done" "interrupt all threads"
|
|
|
|
for {set i 0} {$i < 6} {incr i} {
|
|
mi_expect_interrupt "interrupt $i"
|
|
}
|
|
mi_check_thread_states \
|
|
{"stopped" "stopped" "stopped" "stopped" "stopped" "stopped"} \
|
|
"thread state, all interrupted"
|
|
|
|
# resume all threads, and check that no thread is spuriously left interrupted
|
|
mi_gdb_test "-exec-continue --all" "\[^\n\]*\r\n$running_re" \
|
|
"resume all after interrupting"
|
|
|
|
sleep 1
|
|
mi_check_thread_states \
|
|
{"running" "running" "running" "running" "running" "running"} \
|
|
"thread state, resume all after interrupting"
|
|
|
|
mi_gdb_exit
|