0cc7d26fe4
* varobj.h (varobj_update_result_t) <new>: New field. (varobj_get_child_range, varobj_set_child_range): Declare. (varobj_list_children): Update. (varobj_enable_pretty_printing, varobj_has_more) (varobj_pretty_printed_p): Declare. * varobj.c (pretty_printing): New global. (varobj_enable_pretty_printing): New function. (struct varobj_root) <from, to, constructor, child_iter, saved_item>: New fields. (varobj_create): Don't call install_default_visualizer. (instantiate_pretty_printer): Don't use value_copy. (varobj_has_more): New function. (restrict_range): New function. (install_dynamic_child): Likewise. (dynamic_varobj_has_child_method): Likewise. (update_dynamic_varobj_children): Remove 'new_and_unchanged' argument; add 'new', 'unchanged', 'from', and 'to' arguments. Rewrite. (varobj_get_num_children): Call update_dynamic_varobj_children. (varobj_list_children): Add 'from' and 'to' arguments. Ignore result of update_dynamic_varobj_children. Don't call install_default_visualizer. Restrict result range. (varobj_add_child): Don't call install_default_visualizer. (varobj_pretty_printed_p): New function. (install_visualizer): Rewrite. Move earlier in file. (install_default_visualizer): Likewise. (construct_visualizer): New function. (install_new_value_visualizer): Likewise. (install_new_value): Don't call release_value. Special case pretty-printed objects. Use value_incref. Rearrange "changed" logic. (varobj_get_child_range): New function. (varobj_set_child_range): Likewise. (varobj_set_visualizer): Rewrite. (varobj_update): Rewrite pretty-printing logic. (new_variable): Initialize new fields. (free_variable): Destroy new fields. (value_of_root): Copy 'from' and 'to'. (my_value_of_variable): Handle pretty-printers. (value_get_print_value): Rework pretty-printing logic. (cplus_describe_child): Don't use release_value. * mi/mi-cmds.h (mi_cmd_enable_pretty_printing) (mi_cmd_var_set_update_range): Declare. * mi/mi-cmds.c (mi_cmds): Add enable-pretty-printing and var-set-update-range. * mi/mi-cmd-var.c (print_varobj): Update. Emit "dynamic" attribute. (mi_cmd_var_create): Emit "has_more" attribute. (mi_cmd_var_set_format): Plug memory leak. (mi_print_value_p): Replace 'type' argument with 'var'. Handle pretty-printed varobjs. (mi_cmd_var_list_children): Accept 'from' and 'to' arguments. Emit "has_more" attribute. (mi_cmd_var_evaluate_expression): Plug memory leak. (mi_cmd_var_assign): Likewise. (varobj_update_one): Likewise. Emit "dynamic", "has_more", and "new_children" attributes. (mi_cmd_enable_pretty_printing): New function. (mi_cmd_var_set_update_range): Likewise. gdb/doc * gdb.texinfo (GDB/MI Variable Objects): Document -enable-pretty-printing, -var-set-update-range, dynamic varobjs. Expand -var-update documentation. gdb/testsuite * lib/mi-support.exp (mi_create_varobj): Update. (mi_create_floating_varobj): Likewise. (mi_create_dynamic_varobj): New proc. (mi_varobj_update): Update. (mi_varobj_update_with_type_change): Likewise. (mi_varobj_update_kv_helper): New proc. (mi_varobj_update_dynamic_helper): Rewrite. (mi_varobj_update_dynamic): New proc. (mi_list_varobj_children): Update. (mi_list_varobj_children_range): Add 'from' and 'to' arguments. * gdb.python/python-prettyprint.py (pp_outer): New class. (pp_nullstr): Likewise. (lookup_function): Register new printers. * gdb.python/python-prettyprint.c (struct substruct): New type. (struct outerstruct): Likewise. (substruct_test): New function. (struct nullstr): New type. (string_1, string_2): New globals. (main): Add new tests. * gdb.python/python-mi.exp: Added regression tests. * gdb.mi/mi2-var-display.exp: Update. * gdb.mi/mi2-var-cmd.exp: Update. * gdb.mi/mi2-var-child.exp: Update. * gdb.mi/mi2-var-block.exp: Update. * gdb.mi/mi-var-invalidate.exp: Update. * gdb.mi/mi-var-display.exp: Update. * gdb.mi/mi-var-cmd.exp: Update. * gdb.mi/mi-var-child.exp: Update. * gdb.mi/mi-var-block.exp: Update. * gdb.mi/mi-break.exp: Update. * gdb.mi/gdb701.exp: Update.
236 lines
9.8 KiB
Text
236 lines
9.8 KiB
Text
# Copyright 1999, 2001, 2004, 2006, 2007, 2008, 2009
|
|
# 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/>.
|
|
|
|
#
|
|
# Test essential Machine interface (MI) operations
|
|
#
|
|
# Verify that, using the MI, we can run a simple program and perform basic
|
|
# debugging activities like: insert breakpoints, run the program,
|
|
# step, next, continue until it ends and, last but not least, quit.
|
|
#
|
|
# The goal is not to test gdb functionality, which is done by other tests,
|
|
# but to verify the correct output response to MI operations.
|
|
#
|
|
|
|
load_lib mi-support.exp
|
|
set MIFLAGS "-i=mi"
|
|
|
|
gdb_exit
|
|
if [mi_gdb_start] {
|
|
continue
|
|
}
|
|
|
|
set testfile "basics"
|
|
set srcfile ${testfile}.c
|
|
set binfile ${objdir}/${subdir}/mi-break
|
|
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
|
|
untested mi-break.exp
|
|
return -1
|
|
}
|
|
|
|
mi_delete_breakpoints
|
|
mi_gdb_reinitialize_dir $srcdir/$subdir
|
|
mi_gdb_load ${binfile}
|
|
|
|
# Locate line numbers in basics.c.
|
|
set line_callee4_head [gdb_get_line_number "callee4 ("]
|
|
set line_callee4_body [expr $line_callee4_head + 2]
|
|
set line_callee3_head [gdb_get_line_number "callee3 ("]
|
|
set line_callee3_body [expr $line_callee3_head + 2]
|
|
set line_callee2_head [gdb_get_line_number "callee2 ("]
|
|
set line_callee2_body [expr $line_callee2_head + 2]
|
|
set line_callee1_head [gdb_get_line_number "callee1 ("]
|
|
set line_callee1_body [expr $line_callee1_head + 2]
|
|
set line_main_head [gdb_get_line_number "main ("]
|
|
set line_main_body [expr $line_main_head + 2]
|
|
|
|
set fullname "fullname=\"${fullname_syntax}${srcfile}\""
|
|
|
|
proc test_tbreak_creation_and_listing {} {
|
|
global mi_gdb_prompt
|
|
global srcfile
|
|
global hex
|
|
global line_callee4_head line_callee4_body
|
|
global line_callee3_head line_callee3_body
|
|
global line_callee2_head line_callee2_body
|
|
global line_callee1_head line_callee1_body
|
|
global line_main_head line_main_body
|
|
global fullname
|
|
|
|
# Insert some breakpoints and list them
|
|
# Also, disable some so they do not interfere with other tests
|
|
# Tests:
|
|
# -break-insert -t main
|
|
# -break-insert -t basics.c:callee2
|
|
# -break-insert -t basics.c:$line_callee3_head
|
|
# -break-insert -t srcfile:$line_callee4_head
|
|
# -break-list
|
|
|
|
mi_create_breakpoint "-t main" 1 del main ".*basics.c" $line_main_body $hex \
|
|
"break-insert -t operation"
|
|
|
|
mi_create_breakpoint "-t basics.c:callee2" 2 del callee2 ".*basics.c" $line_callee2_body $hex \
|
|
"insert temp breakpoint at basics.c:callee2"
|
|
|
|
mi_create_breakpoint "-t basics.c:$line_callee3_head" 3 del callee3 ".*basics.c" $line_callee3_head $hex \
|
|
"insert temp breakpoint at basics.c:\$line_callee3_head"
|
|
|
|
# Getting the quoting right is tricky. That is "\"<file>\":$line_callee4_head"
|
|
mi_create_breakpoint "-t \"\\\"${srcfile}\\\":$line_callee4_head\"" 4 del callee4 ".*basics.c" $line_callee4_head $hex \
|
|
"insert temp breakpoint at \"<fullfilename>\":\$line_callee4_head"
|
|
|
|
mi_gdb_test "666-break-list" \
|
|
"666\\\^done,BreakpointTable=\{nr_rows=\".\",nr_cols=\".\",hdr=\\\[\{width=\".*\",alignment=\".*\",col_name=\"number\",colhdr=\"Num\"\}.*colhdr=\"Type\".*colhdr=\"Disp\".*colhdr=\"Enb\".*colhdr=\"Address\".*colhdr=\"What\".*\\\],body=\\\[bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",${fullname},line=\"$line_main_body\",times=\"0\",original-location=\".*\"\}.*\\\]\}" \
|
|
"list of breakpoints"
|
|
|
|
mi_gdb_test "777-break-delete" \
|
|
"777\\^done" \
|
|
"delete temp breakpoints"
|
|
}
|
|
|
|
proc test_rbreak_creation_and_listing {} {
|
|
global mi_gdb_prompt
|
|
global srcfile
|
|
global hex
|
|
global line_callee4_head line_callee4_body
|
|
global line_callee3_head line_callee3_body
|
|
global line_callee2_head line_callee2_body
|
|
global line_callee1_head line_callee1_body
|
|
global line_main_head line_main_body
|
|
|
|
# Insert some breakpoints and list them
|
|
# Also, disable some so they do not interfere with other tests
|
|
# Tests:
|
|
# -break-insert -r main
|
|
# -break-insert -r callee2
|
|
# -break-insert -r callee
|
|
# -break-insert -r .*llee
|
|
# -break-list
|
|
|
|
setup_xfail "*-*-*"
|
|
mi_gdb_test "122-break-insert -r main" \
|
|
"122\\^done,bkpt=\{number=\"5\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_main_body\"\}" \
|
|
"break-insert -r operation"
|
|
|
|
setup_xfail "*-*-*"
|
|
mi_gdb_test "133-break-insert -r callee2" \
|
|
"133\\^done,bkpt=\{number=\"6\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee2_body\"\}" \
|
|
"insert breakpoint with regexp callee2"
|
|
|
|
setup_xfail "*-*-*"
|
|
mi_gdb_test "144-break-insert -r callee" \
|
|
"144\\^done,bkpt=\{number=\"7\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee1_body\"\},bkpt=\{number=\"8\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee2_body\"\},bkpt=\{number=\"9\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee3_body\"\},bkpt=\{number=\"10\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee4_body\"\}" \
|
|
"insert breakpoint with regexp callee"
|
|
|
|
setup_xfail "*-*-*"
|
|
mi_gdb_test "155-break-insert -r \.\*llee" \
|
|
"155\\^done,bkpt=\{number=\"11\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee1_body\"\},bkpt=\{number=\"12\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee2_body\"\},bkpt=\{number=\"13\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee3_body\"\},bkpt=\{number=\"14\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee4_body\"\}" \
|
|
"insert breakpoint with regexp .*llee"
|
|
|
|
setup_xfail "*-*-*"
|
|
mi_gdb_test "166-break-list" \
|
|
"1\\\^done,BreakpointTable=\{nr_rows=\".\",nr_cols=\".\",hdr=\\\[\{width=\".*\",alignment=\".*\",col_name=\"number\",colhdr=\"Num\"\}.*colhdr=\"Type\".*colhdr=\"Disp\".*colhdr=\"Enb\".*colhdr=\"Address\".*colhdr=\"What\".*\\\],body=\\\[bkpt=\{number=\"5\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"$line_main_body\",times=\"0\"\},.*\}\\\]\}" \
|
|
"list of breakpoints"
|
|
|
|
mi_gdb_test "177-break-delete" \
|
|
"177\\^done" \
|
|
"delete temp breakpoints"
|
|
}
|
|
|
|
proc test_ignore_count {} {
|
|
global mi_gdb_prompt
|
|
|
|
mi_gdb_test "-break-insert -i 1 callme" \
|
|
"\\^done.*ignore=\"1\".*" \
|
|
"insert breakpoint with ignore count at callme"
|
|
|
|
mi_run_cmd
|
|
|
|
mi_expect_stop "breakpoint-hit" "callme" "\{name=\"i\",value=\"2\"\}" ".*basics.c" "52" \
|
|
{"" "disp=\"keep\"" } "run to breakpoint with ignore count"
|
|
}
|
|
|
|
proc test_error {} {
|
|
global mi_gdb_prompt
|
|
|
|
mi_gdb_test "-break-insert function_that_does_not_exist" \
|
|
".*\\^error,msg=\"Function \\\\\"function_that_does_not_exist\\\\\" not defined.\"" \
|
|
"breakpoint at nonexistent function"
|
|
|
|
# We used to have a bug whereby -break-insert that failed would not
|
|
# clear some event hooks. As result, whenever we evaluate expression
|
|
# containing function call, the internal breakpoint created to handle
|
|
# function call would be reported, messing up MI output.
|
|
mi_gdb_test "-var-create V * return_1()" \
|
|
"\\^done,name=\"V\",numchild=\"0\",value=\"1\",type=\"int\",has_more=\"0\"" \
|
|
"create varobj for function call"
|
|
|
|
mi_gdb_test "-var-update *" \
|
|
"\\^done,changelist=\\\[\\\]" \
|
|
"update varobj for function call"
|
|
}
|
|
|
|
proc test_disabled_creation {} {
|
|
global mi_gdb_prompt
|
|
global hex
|
|
global line_callee2_body
|
|
|
|
mi_gdb_test "-break-insert -d basics.c:callee2" \
|
|
"\\^done,bkpt=\{number=\"6\",type=\"breakpoint\",disp=\"keep\",enabled=\"n\",addr=\"$hex\",func=\"callee2\",file=\".*basics.c\",fullname=\".*\",line=\"$line_callee2_body\",times=\"0\",original-location=\".*\"\}" \
|
|
"test disabled creation"
|
|
|
|
mi_gdb_test "-break-delete" \
|
|
"\\^done" \
|
|
"test disabled creation: cleanup"
|
|
}
|
|
|
|
proc test_breakpoint_commands {} {
|
|
global line_callee2_body
|
|
global hex
|
|
global fullname
|
|
|
|
mi_create_breakpoint "basics.c:callee2" 7 keep callee2 ".*basics.c" $line_callee2_body $hex \
|
|
"breakpoint commands: insert breakpoint at basics.c:callee2"
|
|
|
|
mi_gdb_test "-break-commands 7 \"print 10\" \"continue\"" \
|
|
"\\^done" \
|
|
"breakpoint commands: set commands"
|
|
|
|
mi_gdb_test "-break-info 7" \
|
|
"\\^done,BreakpointTable=\{nr_rows=\".\",nr_cols=\".\",hdr=\\\[\{width=\".*\",alignment=\".*\",col_name=\"number\",colhdr=\"Num\"\}.*colhdr=\"Type\".*colhdr=\"Disp\".*colhdr=\"Enb\".*colhdr=\"Address\".*colhdr=\"What\".*\\\],body=\\\[bkpt=\{number=\"7\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"callee2\",file=\".*basics.c\",${fullname},line=\"$line_callee2_body\",times=\"0\",script=\{\"print 10\",\"continue\"\},original-location=\".*\"\}.*\\\]\}" \
|
|
"breakpoint commands: check that commands are set"
|
|
|
|
mi_gdb_test "-break-commands 7" \
|
|
"\\^done" \
|
|
"breakpoint commands: clear commands"
|
|
|
|
mi_list_breakpoints [list [list 7 "keep" "callee2" "basics.c" "$line_callee2_body" $hex]] \
|
|
"breakpoint commands: check that commands are cleared"
|
|
}
|
|
|
|
test_tbreak_creation_and_listing
|
|
test_rbreak_creation_and_listing
|
|
|
|
test_ignore_count
|
|
|
|
test_error
|
|
|
|
test_disabled_creation
|
|
|
|
test_breakpoint_commands
|
|
|
|
mi_gdb_exit
|
|
return 0
|