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.
117 lines
3.6 KiB
Text
117 lines
3.6 KiB
Text
# Copyright 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 once binary file has changed, GDB correctly handles
|
|
# previously defined MI variables.
|
|
#
|
|
|
|
|
|
load_lib mi-support.exp
|
|
set MIFLAGS "-i=mi"
|
|
|
|
gdb_exit
|
|
if [mi_gdb_start] {
|
|
continue
|
|
}
|
|
|
|
set testfile "var-cmd"
|
|
set srcfile ${testfile}.c
|
|
set binfile ${objdir}/${subdir}/mi-var-invalidate
|
|
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
|
|
untested mi-var-invalidate.exp
|
|
return -1
|
|
}
|
|
# Just change the output binary.
|
|
set binfile_bis ${objdir}/${subdir}/mi-var-invalidate_bis
|
|
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile_bis}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
|
|
untested mi-var-invalidate.exp
|
|
return -1
|
|
}
|
|
|
|
set testfile2 "basics"
|
|
set srcfile2 ${testfile2}.c
|
|
set binfile2 ${objdir}/${subdir}/${testfile2}
|
|
if { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
|
|
untested mi-var-invalidate.exp
|
|
return -1
|
|
}
|
|
|
|
mi_delete_breakpoints
|
|
mi_gdb_reinitialize_dir $srcdir/$subdir
|
|
mi_gdb_load ${binfile}
|
|
|
|
# Desc: Create global variable.
|
|
mi_create_varobj global_simple global_simple "create global variable"
|
|
|
|
mi_runto do_locals_tests
|
|
|
|
# Desc: create local variables
|
|
mi_create_varobj linteger linteger "create local variable linteger"
|
|
|
|
#
|
|
# Reload the same binary.
|
|
# Global variable should remain, local should be invalidated.
|
|
#
|
|
mi_delete_breakpoints
|
|
mi_gdb_load ${binfile_bis}
|
|
mi_runto main
|
|
|
|
# Check local variable is "invalid".
|
|
mi_gdb_test "-var-update linteger" \
|
|
"\\^done,changelist=\\\[\{name=\"linteger\",in_scope=\"invalid\",has_more=\"0\"\}\\\]" \
|
|
"linteger not anymore in scope due to binary changes"
|
|
|
|
mi_gdb_test "-var-info-type linteger" \
|
|
"\\^done,type=\"\"" \
|
|
"no type for invalid variable linteger (1)"
|
|
|
|
# Check global variable is still correct.
|
|
mi_gdb_test "-var-update global_simple" \
|
|
"\\^done,changelist=\\\[\]" \
|
|
"global_simple still alive"
|
|
|
|
mi_gdb_test "-var-info-type global_simple" \
|
|
"\\^done,type=\"simpleton\"" \
|
|
"type simpleton for valid variable global_simple"
|
|
|
|
|
|
#
|
|
# Load an other binary.
|
|
# All variables must be invalidated.
|
|
#
|
|
mi_delete_breakpoints
|
|
mi_gdb_load ${binfile2}
|
|
# Check local variable are "invalid"
|
|
mi_gdb_test "-var-update linteger" \
|
|
"\\^done,changelist=\\\[\{name=\"linteger\",in_scope=\"invalid\",has_more=\"0\"\}\\\]" \
|
|
"linteger not valid anymore due to binary changes"
|
|
|
|
mi_gdb_test "-var-info-type linteger" \
|
|
"\\^done,type=\"\"" \
|
|
"no type for invalid variable linteger (2)"
|
|
|
|
# Check global variable are still correct.
|
|
mi_gdb_test "-var-update global_simple" \
|
|
"\\^done,changelist=\\\[\{name=\"global_simple\",in_scope=\"invalid\",has_more=\"0\"\}\\\]" \
|
|
"global_simple not anymore in scope due to binary changes"
|
|
|
|
mi_gdb_test "-var-info-type global_simple" \
|
|
"\\^done,type=\"\"" \
|
|
"no type for invalid variable global_simple"
|
|
|
|
mi_gdb_exit
|
|
return 0
|