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.
234 lines
7 KiB
Text
234 lines
7 KiB
Text
# Copyright (C) 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/>.
|
|
|
|
# This file is part of the GDB testsuite. It tests Python-based
|
|
# pretty-printing for MI.
|
|
|
|
load_lib mi-support.exp
|
|
set MIFLAGS "-i=mi2"
|
|
|
|
gdb_exit
|
|
if [mi_gdb_start] {
|
|
continue
|
|
}
|
|
|
|
set testfile "py-prettyprint"
|
|
set srcfile ${testfile}.c
|
|
set binfile ${objdir}/${subdir}/${testfile}
|
|
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DMI}] != "" } {
|
|
untested mi2-var-child.exp
|
|
return -1
|
|
}
|
|
|
|
mi_delete_breakpoints
|
|
mi_gdb_reinitialize_dir $srcdir/$subdir
|
|
mi_gdb_load ${binfile}
|
|
|
|
if {[lsearch -exact [mi_get_features] python] < 0} {
|
|
unsupported "python support is disabled"
|
|
return -1
|
|
}
|
|
|
|
mi_runto main
|
|
|
|
mi_gdb_test "python execfile ('${srcdir}/${subdir}/${testfile}.py')" ""
|
|
|
|
mi_continue_to_line [gdb_get_line_number {MI breakpoint here} ${testfile}.c] \
|
|
"step to breakpoint"
|
|
|
|
mi_create_dynamic_varobj container c \
|
|
"create container varobj, no pretty-printing"
|
|
|
|
mi_list_varobj_children container {
|
|
{ container.name name 1 string }
|
|
{ container.len len 0 int }
|
|
{ container.elements elements 1 "int ." }
|
|
} "examine container children=0, no pretty-printing"
|
|
|
|
mi_delete_varobj container "delete varobj"
|
|
|
|
mi_gdb_test "-enable-pretty-printing" ""
|
|
|
|
mi_create_varobj_checked string string_1 \
|
|
"struct string_repr" \
|
|
"create string_1 varobj"
|
|
|
|
mi_gdb_test "-data-evaluate-expression \"string_1 = string_2\"" ".*" \
|
|
"assign string_1 from string_2"
|
|
|
|
mi_gdb_test "-var-update string" \
|
|
"\\^done,changelist=\\\[{name=\"string\",in_scope=\"true\",type_changed=\"false\",dynamic=\"1\",has_more=\"0\"}\\\]" \
|
|
"update string varobj after assignment"
|
|
|
|
mi_create_dynamic_varobj container c \
|
|
"create container varobj"
|
|
|
|
mi_list_varobj_children container {
|
|
} "examine container children=0"
|
|
|
|
mi_next "next over update 1"
|
|
|
|
mi_varobj_update_dynamic container "varobj update 1" {
|
|
type_changed false new_num_children 1 dynamic 1 has_more 0
|
|
} {
|
|
} {
|
|
{ name {container.\[0\]} exp {\[0\]} numchild 0 type int thread-id 1 }
|
|
}
|
|
|
|
mi_next "next over update 2"
|
|
|
|
mi_varobj_update_dynamic container "varobj update 2" {
|
|
type_changed false new_num_children 2 dynamic 1 has_more 0
|
|
} {
|
|
} {
|
|
{ name {container.\[1\]} exp {\[1\]} numchild 0 type int thread-id 1 }
|
|
}
|
|
|
|
mi_gdb_test "-var-set-visualizer container None" \
|
|
"\\^done" \
|
|
"clear visualizer"
|
|
|
|
mi_gdb_test "-var-update container" \
|
|
"\\^done,changelist=\\\[\\\]" \
|
|
"varobj update after clearing"
|
|
|
|
mi_gdb_test "-var-set-visualizer container gdb.default_visualizer" \
|
|
"\\^done" \
|
|
"choose default visualizer"
|
|
|
|
mi_varobj_update_dynamic container "varobj update after choosing default" {
|
|
type_changed false new_num_children 2 dynamic 1 has_more 0
|
|
} {
|
|
} {
|
|
{ name {container.\[0\]} exp {\[0\]} numchild 0 type int thread-id 1 }
|
|
{ name {container.\[1\]} exp {\[1\]} numchild 0 type int thread-id 1 }
|
|
}
|
|
|
|
mi_gdb_test "-var-set-visualizer container ContainerPrinter" \
|
|
"\\^done" \
|
|
"choose visualizer using expression"
|
|
|
|
mi_varobj_update_dynamic container \
|
|
"varobj update after choosing via expression" {
|
|
type_changed false new_num_children 2 dynamic 1 has_more 0
|
|
} {
|
|
} {
|
|
{ name {container.\[0\]} exp {\[0\]} numchild 0 type int thread-id 1 }
|
|
{ name {container.\[1\]} exp {\[1\]} numchild 0 type int thread-id 1 }
|
|
}
|
|
|
|
mi_list_varobj_children_range container 1 2 2 {
|
|
{ {container.\[1\]} {\[1\]} 0 int }
|
|
} "list varobj children after selecting child range"
|
|
|
|
mi_list_varobj_children_range container -1 -1 2 {
|
|
{ {container.\[0\]} {\[0\]} 0 int }
|
|
{ {container.\[1\]} {\[1\]} 0 int }
|
|
} "list varobj children after resetting child range"
|
|
|
|
mi_next "next over update 3"
|
|
|
|
mi_gdb_test "-var-set-update-range container 0 1" \
|
|
"\\^done" \
|
|
"set update range"
|
|
|
|
# This should truncate the list.
|
|
mi_list_varobj_children container {
|
|
{ {container.\[0\]} {\[0\]} 0 int }
|
|
} "list children after setting update range"
|
|
|
|
# This should return just the items in [1,2).
|
|
mi_list_varobj_children_range container 1 2 2 {
|
|
{ {container.\[1\]} {\[1\]} 0 int }
|
|
} "list selected children after setting range"
|
|
|
|
# This should not be affected by the previous list-children request.
|
|
mi_list_varobj_children container {
|
|
{ {container.\[0\]} {\[0\]} 0 int }
|
|
} "list children after listing selected range"
|
|
|
|
mi_next "next over update 4"
|
|
|
|
# This should only show the first child, because the update range has
|
|
# been set.
|
|
mi_varobj_update_dynamic container \
|
|
"update after next with restricted range" {
|
|
type_changed false new_num_children 1 dynamic 1 has_more 1
|
|
} {
|
|
{ name {container.\[0\]} in_scope true type_changed false dynamic 1 has_more 0 }
|
|
} {
|
|
}
|
|
|
|
mi_gdb_test "-var-set-update-range container 3 4" \
|
|
"\\^done" \
|
|
"set update range with non-zero start"
|
|
|
|
# Elements were updated but should not be reported.
|
|
mi_varobj_update_dynamic container \
|
|
"update varobj with change outside selected range" {
|
|
type_changed false new_num_children 3 dynamic 1 has_more 0
|
|
} {
|
|
} {
|
|
}
|
|
|
|
mi_next "next over update 5"
|
|
|
|
# Regression test: examine an object that has no children, then update
|
|
# it to ensure that we don't print the children.
|
|
mi_create_dynamic_varobj container2 c2 \
|
|
"create second container varobj"
|
|
|
|
mi_gdb_test "-var-update container2" \
|
|
"\\^done,changelist=.." \
|
|
"update varobj, no children requested"
|
|
|
|
mi_next "next over update 6"
|
|
|
|
# Now container2 has an element -- and an update should mention that
|
|
# it has_more. But, because we did not request children, we still
|
|
# should not actually see them.
|
|
mi_varobj_update_dynamic container2 \
|
|
"update varobj 2, no children requested" {
|
|
type_changed false dynamic 1 has_more 1
|
|
} {} {}
|
|
|
|
mi_continue_to_line \
|
|
[gdb_get_line_number {MI outer breakpoint here} ${testfile}.c] \
|
|
"step to outer breakpoint"
|
|
|
|
mi_create_dynamic_varobj outer outer \
|
|
"create outer varobj"
|
|
|
|
mi_list_varobj_children outer {
|
|
{ outer.s s 2 "struct substruct" }
|
|
{ outer.x x 0 "int" }
|
|
} "list children of outer"
|
|
|
|
mi_list_varobj_children outer.s {
|
|
{ outer.s.a a 0 int }
|
|
{ outer.s.b b 0 int }
|
|
} "list children of outer.s"
|
|
|
|
mi_next "next over outer update"
|
|
|
|
mi_gdb_test "-var-update outer" \
|
|
".done,changelist=.{name=\"outer.s.a\",in_scope=\"true\",type_changed=\"false\",dynamic=\"1\",has_more=\"0\"}." \
|
|
"update after updating element of outer"
|
|
|
|
mi_continue_to_line \
|
|
[gdb_get_line_number {Another MI breakpoint} ${testfile}.c] \
|
|
"step to second breakpoint"
|
|
|
|
mi_varobj_update_with_type_change container int 0 "update after type change"
|