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.
122 lines
3.1 KiB
Text
122 lines
3.1 KiB
Text
# Copyright 2006-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 { [skip_cplus_tests] } { continue }
|
|
|
|
load_lib mi-support.exp
|
|
set MIFLAGS "-i=mi"
|
|
|
|
gdb_exit
|
|
if [mi_gdb_start] {
|
|
continue
|
|
}
|
|
|
|
standard_testfile .cc
|
|
|
|
if [get_compiler_info "c++"] {
|
|
return -1
|
|
}
|
|
|
|
if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable {debug c++}] != ""} {
|
|
untested $testfile.exp
|
|
return -1
|
|
}
|
|
|
|
mi_gdb_load ${binfile}
|
|
|
|
mi_prepare_inline_tests $srcfile
|
|
|
|
mi_run_inline_test reference_update
|
|
mi_run_inline_test base_in_reference
|
|
mi_run_inline_test reference_to_pointer
|
|
mi_run_inline_test reference_to_struct
|
|
mi_run_inline_test path_expression
|
|
|
|
set lineno [gdb_get_line_number "/* anonymous_structs_and_unions */"]
|
|
mi_create_breakpoint "$srcfile:$lineno" \
|
|
"break in anonymous_structs_and_unions" \
|
|
-func {anonymous_structs_and_unions\(\)} -file ".*mi-var-cp.cc" \
|
|
-line $lineno
|
|
mi_execute_to "exec-continue" "breakpoint-hit" \
|
|
"anonymous_structs_and_unions" "" ".*" ".*" {"" "disp=\"keep\""} \
|
|
"continue to anonymous_structs breakpoint"
|
|
|
|
set tree {
|
|
Anonymous a {
|
|
{} public {
|
|
anonymous struct {
|
|
{} public {
|
|
int b {}
|
|
}
|
|
}
|
|
anonymous struct {
|
|
{} public {
|
|
int c {}
|
|
}
|
|
}
|
|
anonymous struct {
|
|
{} public {
|
|
int d {}
|
|
anonymous struct {
|
|
{} public {
|
|
int e {}
|
|
anonymous struct {
|
|
{} public {
|
|
int f {}
|
|
anonymous union {
|
|
{} public {
|
|
int g {}
|
|
char h {}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
anonymous union {
|
|
{} public {
|
|
int i {}
|
|
char j {}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
proc verify_everything {variable_name} {
|
|
# Test -var-list-children
|
|
mi_varobj_tree_test_children_callback $variable_name
|
|
|
|
# Bring the variable named by VARIABLE_NAME into the current scope
|
|
# in VAROBJ.
|
|
upvar #0 $variable_name varobj
|
|
|
|
# Test -var-info-path-expression
|
|
mi_gdb_test "-var-info-path-expression $varobj(obj_name)" \
|
|
"\\^done,path_expr=\"[string_to_regexp $varobj(path_expr)]\"" \
|
|
"path expression for $varobj(obj_name)"
|
|
|
|
# Test -var-info-expression
|
|
mi_gdb_test "-var-info-expression $varobj(obj_name)" \
|
|
"\\^done,lang=\"C\\+\\+\",exp=\"[string_to_regexp $varobj(display_name)]\"" \
|
|
"expression for $varobj(obj_name)"
|
|
}
|
|
|
|
mi_walk_varobj_tree c++ $tree verify_everything
|
|
|
|
mi_gdb_exit
|
|
return 0
|