2014-01-01 03:54:24 +00:00
|
|
|
# Copyright 2002-2014 Free Software Foundation, Inc.
|
2002-09-16 19:01:43 +00:00
|
|
|
|
|
|
|
|
# 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
|
2007-08-23 18:14:19 +00:00
|
|
|
# the Free Software Foundation; either version 3 of the License, or
|
2002-09-16 19:01:43 +00:00
|
|
|
# (at your option) any later version.
|
2007-08-23 18:14:19 +00:00
|
|
|
#
|
2002-09-16 19:01:43 +00:00
|
|
|
# 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.
|
2007-08-23 18:14:19 +00:00
|
|
|
#
|
2002-09-16 19:01:43 +00:00
|
|
|
# You should have received a copy of the GNU General Public License
|
2007-08-23 18:14:19 +00:00
|
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
2002-09-16 19:01:43 +00:00
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# test gdb/701
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
load_lib mi-support.exp
|
|
|
|
|
set MIFLAGS "-i=mi"
|
|
|
|
|
|
|
|
|
|
gdb_exit
|
|
|
|
|
if [mi_gdb_start] {
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
|
2012-07-10 15:32:52 +00:00
|
|
|
standard_testfile
|
|
|
|
|
|
2002-09-16 19:01:43 +00:00
|
|
|
if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable debug] != ""} {
|
2006-08-10 05:27:22 +00:00
|
|
|
untested gdb701.exp
|
|
|
|
|
return -1
|
2002-09-16 19:01:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# When varobj reports the types of objects, it often isn't really reporting
|
|
|
|
|
# the type as GDB knows it. For example, in this testcase, we have a
|
|
|
|
|
# structure which has been typedefed. A varobj of this type would really have
|
|
|
|
|
# a type of "TYPE_CODE_TYPEDEF". It's target type is "TYPE_CODE_STRUCT". Varobj
|
|
|
|
|
# should skip over the TYPEDEF type when figuring out the varobj's children.
|
|
|
|
|
# If it doesn't, Bad Things Happen(TM).
|
|
|
|
|
|
|
|
|
|
# Run to main
|
|
|
|
|
mi_run_to_main
|
|
|
|
|
|
|
|
|
|
# Step over "foo = 0"
|
|
|
|
|
mi_next "step over \"foo = 0\""
|
|
|
|
|
|
2008-03-26 13:24:22 +00:00
|
|
|
mi_create_varobj "fooPtr" "foo" "create fooPtr"
|
2002-09-16 19:01:43 +00:00
|
|
|
|
|
|
|
|
mi_gdb_test "-var-list-children fooPtr" \
|
|
|
|
|
"(&\".*\"\r\n)*\\^done,numchild=\"3\",.*" \
|
|
|
|
|
"list children of fooPtr"
|
|
|
|
|
|
|
|
|
|
foreach i [list x y z] {
|
|
|
|
|
mi_gdb_test "-var-list-children fooPtr.$i" \
|
gdb
* 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.
2009-09-15 18:51:26 +00:00
|
|
|
"(&\".*\"\r\n)*\\^done,numchild=\"0\",has_more=\"0\"" \
|
2002-09-16 19:01:43 +00:00
|
|
|
"list children of fooPtr.$i"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mi_gdb_exit
|
|
|
|
|
return 0
|
