2000-02-03 05:14:45 +01:00
|
|
|
|
/* Implementation of the GDB variable objects API.
|
2005-01-14 19:17:20 +01:00
|
|
|
|
|
2012-01-04 09:28:28 +01:00
|
|
|
|
Copyright (C) 1999-2012 Free Software Foundation, Inc.
|
2000-02-03 05:14:45 +01: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 20:08:50 +02:00
|
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
2000-02-03 05:14:45 +01:00
|
|
|
|
(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
|
2007-08-23 20:08:50 +02:00
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
#include "defs.h"
|
2005-02-20 02:19:24 +01:00
|
|
|
|
#include "exceptions.h"
|
2000-02-03 05:14:45 +01:00
|
|
|
|
#include "value.h"
|
|
|
|
|
#include "expression.h"
|
|
|
|
|
#include "frame.h"
|
|
|
|
|
#include "language.h"
|
|
|
|
|
#include "gdbcmd.h"
|
2007-01-01 13:01:04 +01:00
|
|
|
|
#include "block.h"
|
gdb
* varobj.c (value_get_print_value): Include valprint.h.
(value_get_print_value): Use get_formatted_print_options.
* value.h (struct value_print_options): Declare.
(value_print, val_print, common_val_print, val_print_string):
Update.
* value.c: Include valprint.h.
(show_values): Use get_user_print_options.
(show_convenience): Likewise.
* valprint.h (prettyprint_arrays, prettyprint_structs): Don't
declare.
(struct value_print_options): New type.
(vtblprint, unionprint, addressprint, objectprint, print_max,
inspect_it, repeat_count_threshold, output_format,
stop_print_at_null): Don't declare.
(user_print_options, get_user_print_options,
get_raw_print_options, get_formatted_print_options): Declare.
(print_array_indexes_p): Don't declare.
(maybe_print_array_index, val_print_array_elements): Update.
* valprint.c (print_max): Remove.
(user_print_options): New global.
(get_user_print_options, get_raw_print_options,
get_formatted_print_options): New functions.
(print_array_indexes, repeat_count_threshold, stop_print_at_null,
prettyprint_structs, prettyprint_arrays, unionprint,
addressprint): Remove.
(val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(common_val_print): Likewise.
(print_array_indexes_p): Remove.
(maybe_print_array_index): Remove format, pretty arguments; add
options. Update.
(val_print_array_elements): Remove format, deref_ref, pretty
arguments; add options. Update.
(val_print_string): Add options argument. Update.
(_initialize_valprint): Use user_print_options.
(output_format): Remove.
(set_output_radix_1): Use user_print_options.
* typeprint.c: Include valprint.h.
(objectprint): Don't declare.
(whatis_exp): Use get_user_print_options.
* tui/tui-regs.c: Include valprint.h.
(tui_register_format): Use get_formatted_print_options.
* tracepoint.c: Include valprint.h.
(addressprint): Don't declare.
(trace_mention): Use get_user_print_options.
(tracepoints_info): Likewise.
* stack.c (print_frame_args): Use get_raw_print_options.
(print_frame_info): Use get_user_print_options.
(print_frame): Likewise.
* sh64-tdep.c: Include valprint.h
(sh64_do_register): Use get_formatted_print_options.
* scm-valprint.c (scm_inferior_print): Remove format, deref_ref,
pretty arguments; add options.
(scm_scmlist_print): Likewise. Update.
(scm_scmval_print): Likewise.
(scm_val_print): Likewise.
(scm_value_print): Remove format, pretty arguments; add options.
Update.
* scm-lang.h (scm_value_print, scm_val_print, scm_scmval_print):
Update.
* scm-lang.c (scm_printstr): Add options argument.
* python/python-value.c: Include valprint.h.
(valpy_str): Use get_user_print_options.
* printcmd.c: Include valprint.h.
(addressprint): Don't declare.
(inspect_it): Remove.
(print_formatted): Remove format option; add options. Update.
(print_scalar_formatted): Likewise.
(print_address_demangle): Use get_user_print_options.
(do_examine): Use get_formatted_print_options.
(print_command_1): Likewise.
(output_command): Use get_formatted_print_options.
(do_one_display): Likewise.
(print_variable_value): Use get_user_print_options.
* p-valprint.c (pascal_val_print): Remove format, deref_ref,
pretty arguments; add options. Update.
(pascal_value_print): Remove format, pretty arguments; add
options. Update.
(vtblprint, objectprint): Don't declare.
(pascal_static_field_print): Remove.
(pascal_object_print_value_fields): Remove format, pretty
arguments; add options. Update.
(pascal_object_print_static_field): Likewise.
(_initialize_pascal_valprint): Use user_print_options. Update.
* p-lang.h (pascal_val_print, pascal_value_print,
pascal_printstr, pascal_object_print_value_fields): Update.
(vtblprint, static_field_print): Don't declare.
* p-lang.c (pascal_printstr): Add options argument. Update.
* objc-lang.c (objc_printstr): Add options argument. Update.
* mt-tdep.c: Include valprint.h.
(mt_registers_info): Use get_raw_print_options.
* mips-tdep.c: Include valprint.h.
(mips_print_fp_register): Use get_formatted_print_options.
(mips_print_register): Likewise.
* mi/mi-main.c: Include valprint.h.
(get_register): Use get_user_print_options.
(mi_cmd_data_evaluate_expression): Likewise.
(mi_cmd_data_read_memory): Use get_formatted_print_options.
* mi/mi-cmd-stack.c: Include valprint.h.
(list_args_or_locals): Use get_raw_print_options.
* m2-valprint.c (print_function_pointer_address): Add addressprint
argument.
(m2_print_long_set): Remove format, pretty arguments.
(m2_print_unbounded_array): Remove format, deref_ref, pretty
arguments; add options. Update.
(print_unpacked_pointer): Remove format argument; add options.
Now static. Update.
(print_variable_at_address): Remove format, deref_ref, pretty
arguments; add options. Update.
(m2_print_array_contents): Likewise.
(m2_val_print): Likewise.
* m2-lang.h (m2_val_print): Update.
* m2-lang.c (m2_printstr): Add options argument. Update.
* language.h (struct value_print_options): Declare.
(struct language_defn) <la_printstr>: Add options argument.
<la_val_print>: Remove format, deref_ref, pretty argument; add
options.
<la_value_print>: Remove format, pretty arguments; add options.
<la_print_array_index>: Likewise.
(LA_VAL_PRINT, LA_VALUE_PRINT, LA_PRINT_STRING,
LA_PRINT_ARRAY_INDEX): Update.
(default_print_array_index): Update.
* language.c (default_print_array_index): Remove format, pretty
arguments; add options. Update.
(unk_lang_printstr): Add options argument.
(unk_lang_val_print): Remove format, deref_ref, pretty arguments;
add options.
(unk_lang_value_print): Remove format, pretty arguments; add
options.
* jv-valprint.c (java_value_print): Remove format, pretty
arguments; add options. Update.
(java_print_value_fields): Likewise.
(java_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
* jv-lang.h (java_val_print, java_value_print): Declare.
* infcmd.c: Include valprint.h.
(print_return_value): Use get_raw_print_options.
(default_print_registers_info): Use get_user_print_options,
get_formatted_print_options.
(registers_info): Use get_formatted_print_options.
* gdbtypes.h (struct value_print_options): Declare.
(print_scalar_formatted): Update.
* f-valprint.c (f77_print_array_1): Remove format, deref_ref,
pretty arguments; add options. Update.
(f77_print_array): Likewise.
(f_val_print): Likewise.
* f-lang.h (f_val_print): Update.
* f-lang.c (f_printstr): Add options argument. Update.
(c_value_print): Update declaration.
* expprint.c: Include valprint.h.
(print_subexp_standard): Use get_raw_print_options,
get_user_print_options.
* eval.c: Include valprint.h.
(objectprint): Don't declare.
(evaluate_subexp_standard): Use get_user_print_options.
* cp-valprint.c (vtblprint, objectprint, static_field_print):
Remove.
(cp_print_value_fields): Remove format, pretty arguments; add
options. Update.
(cp_print_value): Likewise.
(cp_print_static_field): Likewise.
(_initialize_cp_valprint): Use user_print_options. Update.
* c-valprint.c (print_function_pointer_address): Add addressprint
argument.
(c_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(c_value_print): Add options argument. Update.
* c-lang.h (c_val_print, c_value_print, c_printstr): Update.
(vtblprint, static_field_print): Don't declare.
(cp_print_value_fields): Update.
* c-lang.c (c_printstr): Add options argument. Update.
* breakpoint.c: Include valprint.h.
(addressprint): Don't declare.
(watchpoint_value_print): Use get_user_print_options.
(print_one_breakpoint_location): Likewise.
(breakpoint_1, print_it_catch_fork, print_it_catch_vfork, mention,
print_exception_catchpoint): Likewise.
* auxv.c (fprint_target_auxv): Don't declare addressprint. Use
get_user_print_options.
* ada-valprint.c (struct ada_val_print_args): Remove format,
deref_ref, and pretty; add options.
(print_optional_low_bound): Add options argument.
(val_print_packed_array_elements): Remove format and pretty
arguments; add options. Update.
(printstr): Add options argument. Update.
(ada_printstr): Likewise.
(ada_val_print): Remove format, deref_ref, pretty arguments; add
options argument. Update.
(ada_val_print_stub): Update.
(ada_val_print_array): Remove format, deref_ref, pretty arguments;
add options. Update.
(ada_val_print_1): Likewise.
(print_variant_part): Likewise.
(ada_value_print): Remove format, pretty arguments; add options.
Update.
(print_record): Likewise.
(print_field_values): Likewise.
* ada-lang.h (ada_val_print, ada_value_print, ada_printstr):
Update.
* ada-lang.c (ada_print_array_index): Add options argument; remove
format and pretty arguments.
(print_one_exception): Use get_user_print_options.
gdb/testsuite
* gdb.base/exprs.exp (test_expr): Add enum formatting tests.
2008-10-28 18:19:58 +01:00
|
|
|
|
#include "valprint.h"
|
2005-02-20 02:19:24 +01:00
|
|
|
|
|
|
|
|
|
#include "gdb_assert.h"
|
2002-08-02 22:51:21 +02:00
|
|
|
|
#include "gdb_string.h"
|
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 20:51:26 +02:00
|
|
|
|
#include "gdb_regex.h"
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
#include "varobj.h"
|
2007-01-04 20:16:52 +01:00
|
|
|
|
#include "vec.h"
|
2008-03-23 10:53:52 +01:00
|
|
|
|
#include "gdbthread.h"
|
|
|
|
|
#include "inferior.h"
|
2012-03-28 23:31:18 +02:00
|
|
|
|
#include "ada-varobj.h"
|
|
|
|
|
#include "ada-lang.h"
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2009-05-28 03:09:20 +02:00
|
|
|
|
#if HAVE_PYTHON
|
|
|
|
|
#include "python/python.h"
|
|
|
|
|
#include "python/python-internal.h"
|
2010-11-25 14:10:07 +01:00
|
|
|
|
#else
|
|
|
|
|
typedef int PyObject;
|
2009-05-28 03:09:20 +02:00
|
|
|
|
#endif
|
|
|
|
|
|
2012-01-12 23:51:10 +01:00
|
|
|
|
/* The names of varobjs representing anonymous structs or unions. */
|
|
|
|
|
#define ANONYMOUS_STRUCT_NAME _("<anonymous struct>")
|
|
|
|
|
#define ANONYMOUS_UNION_NAME _("<anonymous union>")
|
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
/* Non-zero if we want to see trace of varobj level stuff. */
|
|
|
|
|
|
2012-08-02 11:36:40 +02:00
|
|
|
|
unsigned int varobjdebug = 0;
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 14:51:36 +01:00
|
|
|
|
static void
|
|
|
|
|
show_varobjdebug (struct ui_file *file, int from_tty,
|
|
|
|
|
struct cmd_list_element *c, const char *value)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (file, _("Varobj debugging is %s.\n"), value);
|
|
|
|
|
}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* String representations of gdb's format codes. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
char *varobj_format_string[] =
|
2001-11-01 03:22:21 +01:00
|
|
|
|
{ "natural", "binary", "decimal", "hexadecimal", "octal" };
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* String representations of gdb's known languages. */
|
2001-11-01 03:22:21 +01:00
|
|
|
|
char *varobj_language_string[] = { "unknown", "C", "C++", "Java" };
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
/* True if we want to allow Python-based pretty-printing. */
|
|
|
|
|
static int pretty_printing = 0;
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
varobj_enable_pretty_printing (void)
|
|
|
|
|
{
|
|
|
|
|
pretty_printing = 1;
|
|
|
|
|
}
|
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
/* Data structures */
|
|
|
|
|
|
|
|
|
|
/* Every root variable has one of these structures saved in its
|
2011-01-12 02:23:29 +01:00
|
|
|
|
varobj. Members which must be free'd are noted. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
struct varobj_root
|
2001-11-01 03:22:21 +01:00
|
|
|
|
{
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Alloc'd expression for this parent. */
|
2001-11-01 03:22:21 +01:00
|
|
|
|
struct expression *exp;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Block for which this expression is valid. */
|
2001-11-01 03:22:21 +01:00
|
|
|
|
struct block *valid_block;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2008-03-23 09:59:19 +01:00
|
|
|
|
/* The frame for this expression. This field is set iff valid_block is
|
|
|
|
|
not NULL. */
|
2002-07-03 22:23:04 +02:00
|
|
|
|
struct frame_id frame;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2008-03-24 18:33:30 +01:00
|
|
|
|
/* The thread ID that this varobj_root belong to. This field
|
2011-01-12 02:23:29 +01:00
|
|
|
|
is only valid if valid_block is not NULL.
|
2008-03-24 18:33:30 +01:00
|
|
|
|
When not 0, indicates which thread 'frame' belongs to.
|
|
|
|
|
When 0, indicates that the thread list was empty when the varobj_root
|
|
|
|
|
was created. */
|
|
|
|
|
int thread_id;
|
|
|
|
|
|
2008-03-26 15:11:18 +01:00
|
|
|
|
/* If 1, the -var-update always recomputes the value in the
|
|
|
|
|
current thread and frame. Otherwise, variable object is
|
2011-01-12 02:23:29 +01:00
|
|
|
|
always updated in the specific scope/thread/frame. */
|
2008-03-26 15:11:18 +01:00
|
|
|
|
int floating;
|
2000-03-13 22:51:46 +01:00
|
|
|
|
|
2007-02-13 09:15:49 +01:00
|
|
|
|
/* Flag that indicates validity: set to 0 when this varobj_root refers
|
|
|
|
|
to symbols that do not exist anymore. */
|
|
|
|
|
int is_valid;
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Language info for this variable and its children. */
|
2001-11-01 03:22:21 +01:00
|
|
|
|
struct language_specific *lang;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* The varobj for this root node. */
|
2001-11-01 03:22:21 +01:00
|
|
|
|
struct varobj *rootvar;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2001-11-01 03:22:21 +01:00
|
|
|
|
/* Next root variable */
|
|
|
|
|
struct varobj_root *next;
|
|
|
|
|
};
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
/* Every variable in the system has a structure of this type defined
|
2011-01-12 02:23:29 +01:00
|
|
|
|
for it. This structure holds all information necessary to manipulate
|
|
|
|
|
a particular object variable. Members which must be freed are noted. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
struct varobj
|
2001-11-01 03:22:21 +01:00
|
|
|
|
{
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Alloc'd name of the variable for this object. If this variable is a
|
2001-11-01 03:22:21 +01:00
|
|
|
|
child, then this name will be the child's source name.
|
2011-01-12 02:23:29 +01:00
|
|
|
|
(bar, not foo.bar). */
|
|
|
|
|
/* NOTE: This is the "expression". */
|
2001-11-01 03:22:21 +01:00
|
|
|
|
char *name;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2007-08-31 20:52:05 +02:00
|
|
|
|
/* Alloc'd expression for this child. Can be used to create a
|
|
|
|
|
root variable corresponding to this child. */
|
|
|
|
|
char *path_expr;
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* The alloc'd name for this variable's object. This is here for
|
|
|
|
|
convenience when constructing this object's children. */
|
2001-11-01 03:22:21 +01:00
|
|
|
|
char *obj_name;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Index of this variable in its parent or -1. */
|
2001-11-01 03:22:21 +01:00
|
|
|
|
int index;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2007-08-31 21:01:17 +02:00
|
|
|
|
/* The type of this variable. This can be NULL
|
|
|
|
|
for artifial variable objects -- currently, the "accessibility"
|
|
|
|
|
variable objects in C++. */
|
2001-11-01 03:22:21 +01:00
|
|
|
|
struct type *type;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2007-01-16 03:12:49 +01:00
|
|
|
|
/* The value of this expression or subexpression. A NULL value
|
|
|
|
|
indicates there was an error getting this value.
|
2007-01-04 20:06:15 +01:00
|
|
|
|
Invariant: if varobj_value_is_changeable_p (this) is non-zero,
|
|
|
|
|
the value is either NULL, or not lazy. */
|
2001-11-01 03:37:56 +01:00
|
|
|
|
struct value *value;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* The number of (immediate) children this variable has. */
|
2001-11-01 03:22:21 +01:00
|
|
|
|
int num_children;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* If this object is a child, this points to its immediate parent. */
|
2001-11-01 03:22:21 +01:00
|
|
|
|
struct varobj *parent;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2007-01-04 20:16:52 +01:00
|
|
|
|
/* Children of this object. */
|
|
|
|
|
VEC (varobj_p) *children;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2009-05-28 03:09:20 +02:00
|
|
|
|
/* Whether the children of this varobj were requested. This field is
|
|
|
|
|
used to decide if dynamic varobj should recompute their children.
|
|
|
|
|
In the event that the frontend never asked for the children, we
|
|
|
|
|
can avoid that. */
|
|
|
|
|
int children_requested;
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Description of the root variable. Points to root variable for
|
|
|
|
|
children. */
|
2001-11-01 03:22:21 +01:00
|
|
|
|
struct varobj_root *root;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* The format of the output for this object. */
|
2001-11-01 03:22:21 +01:00
|
|
|
|
enum varobj_display_formats format;
|
2002-10-24 01:54:33 +02:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Was this variable updated via a varobj_set_value operation. */
|
2002-10-24 01:54:33 +02:00
|
|
|
|
int updated;
|
2007-01-05 22:52:33 +01:00
|
|
|
|
|
|
|
|
|
/* Last print value. */
|
|
|
|
|
char *print_value;
|
2007-04-14 11:51:30 +02:00
|
|
|
|
|
|
|
|
|
/* Is this variable frozen. Frozen variables are never implicitly
|
|
|
|
|
updated by -var-update *
|
|
|
|
|
or -var-update <direct-or-indirect-parent>. */
|
|
|
|
|
int frozen;
|
|
|
|
|
|
|
|
|
|
/* Is the value of this variable intentionally not fetched? It is
|
|
|
|
|
not fetched if either the variable is frozen, or any parents is
|
|
|
|
|
frozen. */
|
|
|
|
|
int not_fetched;
|
2009-05-28 03:09:20 +02:00
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
/* Sub-range of children which the MI consumer has requested. If
|
|
|
|
|
FROM < 0 or TO < 0, means that all children have been
|
|
|
|
|
requested. */
|
|
|
|
|
int from;
|
|
|
|
|
int to;
|
|
|
|
|
|
|
|
|
|
/* The pretty-printer constructor. If NULL, then the default
|
|
|
|
|
pretty-printer will be looked up. If None, then no
|
|
|
|
|
pretty-printer will be installed. */
|
|
|
|
|
PyObject *constructor;
|
|
|
|
|
|
2009-05-28 03:09:20 +02:00
|
|
|
|
/* The pretty-printer that has been constructed. If NULL, then a
|
|
|
|
|
new printer object is needed, and one will be constructed. */
|
|
|
|
|
PyObject *pretty_printer;
|
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 20:51:26 +02:00
|
|
|
|
|
|
|
|
|
/* The iterator returned by the printer's 'children' method, or NULL
|
|
|
|
|
if not available. */
|
|
|
|
|
PyObject *child_iter;
|
|
|
|
|
|
|
|
|
|
/* We request one extra item from the iterator, so that we can
|
|
|
|
|
report to the caller whether there are more items than we have
|
|
|
|
|
already reported. However, we don't want to install this value
|
|
|
|
|
when we read it, because that will mess up future updates. So,
|
|
|
|
|
we stash it here instead. */
|
|
|
|
|
PyObject *saved_item;
|
2001-11-01 03:22:21 +01:00
|
|
|
|
};
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
struct cpstack
|
2001-11-01 03:22:21 +01:00
|
|
|
|
{
|
|
|
|
|
char *name;
|
|
|
|
|
struct cpstack *next;
|
|
|
|
|
};
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
/* A list of varobjs */
|
|
|
|
|
|
|
|
|
|
struct vlist
|
2001-11-01 03:22:21 +01:00
|
|
|
|
{
|
|
|
|
|
struct varobj *var;
|
|
|
|
|
struct vlist *next;
|
|
|
|
|
};
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
/* Private function prototypes */
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Helper functions for the above subcommands. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static int delete_variable (struct cpstack **, struct varobj *, int);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void delete_variable_1 (struct cpstack **, int *,
|
|
|
|
|
struct varobj *, int, int);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static int install_variable (struct varobj *);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void uninstall_variable (struct varobj *);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static struct varobj *create_child (struct varobj *, int, char *);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2009-05-28 03:09:20 +02:00
|
|
|
|
static struct varobj *
|
|
|
|
|
create_child_with_value (struct varobj *parent, int index, const char *name,
|
|
|
|
|
struct value *value);
|
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
/* Utility routines */
|
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static struct varobj *new_variable (void);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static struct varobj *new_root_variable (void);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void free_variable (struct varobj *var);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-22 11:02:23 +02:00
|
|
|
|
static struct cleanup *make_cleanup_free_variable (struct varobj *var);
|
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static struct type *get_type (struct varobj *var);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2007-01-24 11:49:31 +01:00
|
|
|
|
static struct type *get_value_type (struct varobj *var);
|
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static struct type *get_target_type (struct type *);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static enum varobj_display_formats variable_default_display (struct varobj *);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void cppush (struct cpstack **pstack, char *name);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static char *cppop (struct cpstack **pstack);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2012-04-14 14:18:50 +02:00
|
|
|
|
static int update_type_if_necessary (struct varobj *var,
|
|
|
|
|
struct value *new_value);
|
|
|
|
|
|
2006-11-28 18:23:10 +01:00
|
|
|
|
static int install_new_value (struct varobj *var, struct value *value,
|
|
|
|
|
int initial);
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Language-specific routines. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static enum varobj_languages variable_language (struct varobj *var);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static int number_of_children (struct varobj *);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static char *name_of_variable (struct varobj *);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static char *name_of_child (struct varobj *, int);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2001-11-01 03:37:56 +01:00
|
|
|
|
static struct value *value_of_root (struct varobj **var_handle, int *);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2001-11-01 03:37:56 +01:00
|
|
|
|
static struct value *value_of_child (struct varobj *parent, int index);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2008-04-09 15:29:55 +02:00
|
|
|
|
static char *my_value_of_variable (struct varobj *var,
|
|
|
|
|
enum varobj_display_formats format);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2007-01-05 22:52:33 +01:00
|
|
|
|
static char *value_get_print_value (struct value *value,
|
2009-05-28 03:09:20 +02:00
|
|
|
|
enum varobj_display_formats format,
|
* python/python-internal.h (struct language_defn): Declare.
(python_gdbarch, python_language): Likewise.
(ensure_python_env): Add prototype.
(make_cleanup_py_restore_gil): Remove prototype.
* python/python.c: Include "arch-utils.h", "value.h" and "language.h".
(python_gdbarch, python_language): New global variables.
(struct python_env): New data type.
(ensure_python_env, restore_python_env): New functions.
(eval_python_from_control_command): Call ensure_python_env to
install current architecture and language.
(python_command, gdbpy_new_objfile): Likewise.
* python/python-cmd.c: Include "arch-utils.h" and "language.h".
(cmdpy_destroyer, cmdpy_function, cmdpy_completer): Call
ensure_python_env.
* python/python-type.c (clean_up_objfile_types): Likewise.
* python/python-objfile.c: Include "language.h".
(clean_up_objfile): Call ensure_python_env.
* python/python-prettyprint.c (apply_val_pretty_printer): Likewise.
(apply_varobj_pretty_printer): Do not call PyGILState_Ensure.
* varobj.c (varobj_ensure_python_env): New helper function.
(varobj_get_display_hint, update_dynamic_varobj_children,
install_default_visualizer, varobj_set_visualizer, free_variable,
value_get_print_value): Call it.
(value_get_print_value): Add varobj argument instead of pretty
printer argument. Update all callers.
* python/python-utils.c (py_gil_restore, make_cleanup_py_restore_gil):
Remove.
* value.h (internal_function_fn): Add GDBARCH and LANGUAGE argument.
(call_internal_function): Likewise.
* value.c (call_internal_function): Likewise. Pass to handler.
* eval.c (evaluate_subexp_standard): Update call.
* python/python-function.c: Include "language.h".
(fnpy_call): Add GDBARCH and LANGAUAGE arguments and call
make_cleanup_python_env.
* python/python-value.c (builtin_type_pyint, builtin_type_pyfloat,
builtin_type_pylong, builtin_type_pybool, builtin_type_pychar,
valpy_str): Use python_gdbarch and python_language instead of
current_gdbarch and current_language.
* python/python-type.c (typy_lookup_typename): Likewise.
2009-07-02 19:04:23 +02:00
|
|
|
|
struct varobj *var);
|
2007-01-05 22:52:33 +01:00
|
|
|
|
|
2007-01-04 20:06:15 +01:00
|
|
|
|
static int varobj_value_is_changeable_p (struct varobj *var);
|
|
|
|
|
|
|
|
|
|
static int is_root_p (struct varobj *var);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2010-01-20 07:36:38 +01:00
|
|
|
|
#if HAVE_PYTHON
|
|
|
|
|
|
2011-03-15 16:52:09 +01:00
|
|
|
|
static struct varobj *varobj_add_child (struct varobj *var,
|
|
|
|
|
const char *name,
|
|
|
|
|
struct value *value);
|
2009-05-28 03:09:20 +02:00
|
|
|
|
|
2010-01-20 07:36:38 +01:00
|
|
|
|
#endif /* HAVE_PYTHON */
|
|
|
|
|
|
2012-03-28 23:31:29 +02:00
|
|
|
|
static int default_value_is_changeable_p (struct varobj *var);
|
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
/* C implementation */
|
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static int c_number_of_children (struct varobj *var);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static char *c_name_of_variable (struct varobj *parent);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static char *c_name_of_child (struct varobj *parent, int index);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2007-08-31 20:52:05 +02:00
|
|
|
|
static char *c_path_expr_of_child (struct varobj *child);
|
|
|
|
|
|
2001-11-01 03:37:56 +01:00
|
|
|
|
static struct value *c_value_of_root (struct varobj **var_handle);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2001-11-01 03:37:56 +01:00
|
|
|
|
static struct value *c_value_of_child (struct varobj *parent, int index);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static struct type *c_type_of_child (struct varobj *parent, int index);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2008-04-09 15:29:55 +02:00
|
|
|
|
static char *c_value_of_variable (struct varobj *var,
|
|
|
|
|
enum varobj_display_formats format);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
/* C++ implementation */
|
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static int cplus_number_of_children (struct varobj *var);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void cplus_class_num_children (struct type *type, int children[3]);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static char *cplus_name_of_variable (struct varobj *parent);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static char *cplus_name_of_child (struct varobj *parent, int index);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2007-08-31 20:52:05 +02:00
|
|
|
|
static char *cplus_path_expr_of_child (struct varobj *child);
|
|
|
|
|
|
2001-11-01 03:37:56 +01:00
|
|
|
|
static struct value *cplus_value_of_root (struct varobj **var_handle);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2001-11-01 03:37:56 +01:00
|
|
|
|
static struct value *cplus_value_of_child (struct varobj *parent, int index);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static struct type *cplus_type_of_child (struct varobj *parent, int index);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2008-04-09 15:29:55 +02:00
|
|
|
|
static char *cplus_value_of_variable (struct varobj *var,
|
|
|
|
|
enum varobj_display_formats format);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
/* Java implementation */
|
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static int java_number_of_children (struct varobj *var);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static char *java_name_of_variable (struct varobj *parent);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static char *java_name_of_child (struct varobj *parent, int index);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2007-08-31 20:52:05 +02:00
|
|
|
|
static char *java_path_expr_of_child (struct varobj *child);
|
|
|
|
|
|
2001-11-01 03:37:56 +01:00
|
|
|
|
static struct value *java_value_of_root (struct varobj **var_handle);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2001-11-01 03:37:56 +01:00
|
|
|
|
static struct value *java_value_of_child (struct varobj *parent, int index);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static struct type *java_type_of_child (struct varobj *parent, int index);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2008-04-09 15:29:55 +02:00
|
|
|
|
static char *java_value_of_variable (struct varobj *var,
|
|
|
|
|
enum varobj_display_formats format);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-07-18 11:21:43 +02:00
|
|
|
|
/* Ada implementation */
|
|
|
|
|
|
|
|
|
|
static int ada_number_of_children (struct varobj *var);
|
|
|
|
|
|
|
|
|
|
static char *ada_name_of_variable (struct varobj *parent);
|
|
|
|
|
|
|
|
|
|
static char *ada_name_of_child (struct varobj *parent, int index);
|
|
|
|
|
|
|
|
|
|
static char *ada_path_expr_of_child (struct varobj *child);
|
|
|
|
|
|
|
|
|
|
static struct value *ada_value_of_root (struct varobj **var_handle);
|
|
|
|
|
|
|
|
|
|
static struct value *ada_value_of_child (struct varobj *parent, int index);
|
|
|
|
|
|
|
|
|
|
static struct type *ada_type_of_child (struct varobj *parent, int index);
|
|
|
|
|
|
|
|
|
|
static char *ada_value_of_variable (struct varobj *var,
|
|
|
|
|
enum varobj_display_formats format);
|
|
|
|
|
|
2012-03-28 23:31:29 +02:00
|
|
|
|
static int ada_value_is_changeable_p (struct varobj *var);
|
|
|
|
|
|
2012-03-28 23:31:05 +02:00
|
|
|
|
static int ada_value_has_mutated (struct varobj *var, struct value *new_val,
|
|
|
|
|
struct type *new_type);
|
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
/* The language specific vector */
|
|
|
|
|
|
|
|
|
|
struct language_specific
|
2001-11-01 03:22:21 +01:00
|
|
|
|
{
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* The language of this variable. */
|
2001-11-01 03:22:21 +01:00
|
|
|
|
enum varobj_languages language;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* The number of children of PARENT. */
|
2001-11-01 03:22:21 +01:00
|
|
|
|
int (*number_of_children) (struct varobj * parent);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* The name (expression) of a root varobj. */
|
2001-11-01 03:22:21 +01:00
|
|
|
|
char *(*name_of_variable) (struct varobj * parent);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* The name of the INDEX'th child of PARENT. */
|
2001-11-01 03:22:21 +01:00
|
|
|
|
char *(*name_of_child) (struct varobj * parent, int index);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2007-08-31 20:52:05 +02:00
|
|
|
|
/* Returns the rooted expression of CHILD, which is a variable
|
|
|
|
|
obtain that has some parent. */
|
|
|
|
|
char *(*path_expr_of_child) (struct varobj * child);
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* The ``struct value *'' of the root variable ROOT. */
|
2001-11-01 03:37:56 +01:00
|
|
|
|
struct value *(*value_of_root) (struct varobj ** root_handle);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* The ``struct value *'' of the INDEX'th child of PARENT. */
|
2001-11-01 03:37:56 +01:00
|
|
|
|
struct value *(*value_of_child) (struct varobj * parent, int index);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* The type of the INDEX'th child of PARENT. */
|
2001-11-01 03:22:21 +01:00
|
|
|
|
struct type *(*type_of_child) (struct varobj * parent, int index);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* The current value of VAR. */
|
2008-04-09 15:29:55 +02:00
|
|
|
|
char *(*value_of_variable) (struct varobj * var,
|
|
|
|
|
enum varobj_display_formats format);
|
2012-03-28 23:31:05 +02:00
|
|
|
|
|
2012-03-28 23:31:29 +02:00
|
|
|
|
/* Return non-zero if changes in value of VAR must be detected and
|
|
|
|
|
reported by -var-update. Return zero if -var-update should never
|
|
|
|
|
report changes of such values. This makes sense for structures
|
|
|
|
|
(since the changes in children values will be reported separately),
|
|
|
|
|
or for artifical objects (like 'public' pseudo-field in C++).
|
|
|
|
|
|
|
|
|
|
Return value of 0 means that gdb need not call value_fetch_lazy
|
|
|
|
|
for the value of this variable object. */
|
|
|
|
|
int (*value_is_changeable_p) (struct varobj *var);
|
|
|
|
|
|
2012-03-28 23:31:05 +02:00
|
|
|
|
/* Return nonzero if the type of VAR has mutated.
|
|
|
|
|
|
|
|
|
|
VAR's value is still the varobj's previous value, while NEW_VALUE
|
|
|
|
|
is VAR's new value and NEW_TYPE is the var's new type. NEW_VALUE
|
|
|
|
|
may be NULL indicating that there is no value available (the varobj
|
|
|
|
|
may be out of scope, of may be the child of a null pointer, for
|
|
|
|
|
instance). NEW_TYPE, on the other hand, must never be NULL.
|
|
|
|
|
|
|
|
|
|
This function should also be able to assume that var's number of
|
|
|
|
|
children is set (not < 0).
|
|
|
|
|
|
|
|
|
|
Languages where types do not mutate can set this to NULL. */
|
|
|
|
|
int (*value_has_mutated) (struct varobj *var, struct value *new_value,
|
|
|
|
|
struct type *new_type);
|
2001-11-01 03:22:21 +01:00
|
|
|
|
};
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Array of known source language routines. */
|
2007-01-03 20:01:25 +01:00
|
|
|
|
static struct language_specific languages[vlang_end] = {
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Unknown (try treating as C). */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2001-11-01 03:22:21 +01:00
|
|
|
|
vlang_unknown,
|
|
|
|
|
c_number_of_children,
|
|
|
|
|
c_name_of_variable,
|
|
|
|
|
c_name_of_child,
|
2007-08-31 20:52:05 +02:00
|
|
|
|
c_path_expr_of_child,
|
2001-11-01 03:22:21 +01:00
|
|
|
|
c_value_of_root,
|
|
|
|
|
c_value_of_child,
|
|
|
|
|
c_type_of_child,
|
2012-03-28 23:31:05 +02:00
|
|
|
|
c_value_of_variable,
|
2012-03-28 23:31:29 +02:00
|
|
|
|
default_value_is_changeable_p,
|
2012-03-28 23:31:05 +02:00
|
|
|
|
NULL /* value_has_mutated */}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
,
|
|
|
|
|
/* C */
|
|
|
|
|
{
|
2001-11-01 03:22:21 +01:00
|
|
|
|
vlang_c,
|
|
|
|
|
c_number_of_children,
|
|
|
|
|
c_name_of_variable,
|
|
|
|
|
c_name_of_child,
|
2007-08-31 20:52:05 +02:00
|
|
|
|
c_path_expr_of_child,
|
2001-11-01 03:22:21 +01:00
|
|
|
|
c_value_of_root,
|
|
|
|
|
c_value_of_child,
|
|
|
|
|
c_type_of_child,
|
2012-03-28 23:31:05 +02:00
|
|
|
|
c_value_of_variable,
|
2012-03-28 23:31:29 +02:00
|
|
|
|
default_value_is_changeable_p,
|
2012-03-28 23:31:05 +02:00
|
|
|
|
NULL /* value_has_mutated */}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
,
|
|
|
|
|
/* C++ */
|
|
|
|
|
{
|
2001-11-01 03:22:21 +01:00
|
|
|
|
vlang_cplus,
|
|
|
|
|
cplus_number_of_children,
|
|
|
|
|
cplus_name_of_variable,
|
|
|
|
|
cplus_name_of_child,
|
2007-08-31 20:52:05 +02:00
|
|
|
|
cplus_path_expr_of_child,
|
2001-11-01 03:22:21 +01:00
|
|
|
|
cplus_value_of_root,
|
|
|
|
|
cplus_value_of_child,
|
|
|
|
|
cplus_type_of_child,
|
2012-03-28 23:31:05 +02:00
|
|
|
|
cplus_value_of_variable,
|
2012-03-28 23:31:29 +02:00
|
|
|
|
default_value_is_changeable_p,
|
2012-03-28 23:31:05 +02:00
|
|
|
|
NULL /* value_has_mutated */}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
,
|
|
|
|
|
/* Java */
|
|
|
|
|
{
|
2001-11-01 03:22:21 +01:00
|
|
|
|
vlang_java,
|
|
|
|
|
java_number_of_children,
|
|
|
|
|
java_name_of_variable,
|
|
|
|
|
java_name_of_child,
|
2007-08-31 20:52:05 +02:00
|
|
|
|
java_path_expr_of_child,
|
2001-11-01 03:22:21 +01:00
|
|
|
|
java_value_of_root,
|
|
|
|
|
java_value_of_child,
|
|
|
|
|
java_type_of_child,
|
2012-03-28 23:31:05 +02:00
|
|
|
|
java_value_of_variable,
|
2012-03-28 23:31:29 +02:00
|
|
|
|
default_value_is_changeable_p,
|
2012-03-28 23:31:05 +02:00
|
|
|
|
NULL /* value_has_mutated */},
|
2011-07-18 11:21:43 +02:00
|
|
|
|
/* Ada */
|
|
|
|
|
{
|
|
|
|
|
vlang_ada,
|
|
|
|
|
ada_number_of_children,
|
|
|
|
|
ada_name_of_variable,
|
|
|
|
|
ada_name_of_child,
|
|
|
|
|
ada_path_expr_of_child,
|
|
|
|
|
ada_value_of_root,
|
|
|
|
|
ada_value_of_child,
|
|
|
|
|
ada_type_of_child,
|
2012-03-28 23:31:05 +02:00
|
|
|
|
ada_value_of_variable,
|
2012-03-28 23:31:29 +02:00
|
|
|
|
ada_value_is_changeable_p,
|
2012-03-28 23:31:05 +02:00
|
|
|
|
ada_value_has_mutated}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
};
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* A little convenience enum for dealing with C++/Java. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
enum vsections
|
2001-11-01 03:22:21 +01:00
|
|
|
|
{
|
|
|
|
|
v_public = 0, v_private, v_protected
|
|
|
|
|
};
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
/* Private data */
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Mappings of varobj_display_formats enums to gdb's format codes. */
|
2001-11-01 03:22:21 +01:00
|
|
|
|
static int format_code[] = { 0, 't', 'd', 'x', 'o' };
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Header of the list of root variable objects. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
static struct varobj_root *rootlist;
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Prime number indicating the number of buckets in the hash table. */
|
|
|
|
|
/* A prime large enough to avoid too many colisions. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
#define VAROBJ_TABLE_SIZE 227
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Pointer to the varobj hash table (built at run time). */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
static struct vlist **varobj_table;
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Is the variable X one of our "fake" children? */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
#define CPLUS_FAKE_CHILD(x) \
|
|
|
|
|
((x) != NULL && (x)->type == NULL && (x)->value == NULL)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* API Implementation */
|
2007-01-04 20:06:15 +01:00
|
|
|
|
static int
|
|
|
|
|
is_root_p (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
return (var->root->rootvar == var);
|
|
|
|
|
}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
* python/python-internal.h (struct language_defn): Declare.
(python_gdbarch, python_language): Likewise.
(ensure_python_env): Add prototype.
(make_cleanup_py_restore_gil): Remove prototype.
* python/python.c: Include "arch-utils.h", "value.h" and "language.h".
(python_gdbarch, python_language): New global variables.
(struct python_env): New data type.
(ensure_python_env, restore_python_env): New functions.
(eval_python_from_control_command): Call ensure_python_env to
install current architecture and language.
(python_command, gdbpy_new_objfile): Likewise.
* python/python-cmd.c: Include "arch-utils.h" and "language.h".
(cmdpy_destroyer, cmdpy_function, cmdpy_completer): Call
ensure_python_env.
* python/python-type.c (clean_up_objfile_types): Likewise.
* python/python-objfile.c: Include "language.h".
(clean_up_objfile): Call ensure_python_env.
* python/python-prettyprint.c (apply_val_pretty_printer): Likewise.
(apply_varobj_pretty_printer): Do not call PyGILState_Ensure.
* varobj.c (varobj_ensure_python_env): New helper function.
(varobj_get_display_hint, update_dynamic_varobj_children,
install_default_visualizer, varobj_set_visualizer, free_variable,
value_get_print_value): Call it.
(value_get_print_value): Add varobj argument instead of pretty
printer argument. Update all callers.
* python/python-utils.c (py_gil_restore, make_cleanup_py_restore_gil):
Remove.
* value.h (internal_function_fn): Add GDBARCH and LANGUAGE argument.
(call_internal_function): Likewise.
* value.c (call_internal_function): Likewise. Pass to handler.
* eval.c (evaluate_subexp_standard): Update call.
* python/python-function.c: Include "language.h".
(fnpy_call): Add GDBARCH and LANGAUAGE arguments and call
make_cleanup_python_env.
* python/python-value.c (builtin_type_pyint, builtin_type_pyfloat,
builtin_type_pylong, builtin_type_pybool, builtin_type_pychar,
valpy_str): Use python_gdbarch and python_language instead of
current_gdbarch and current_language.
* python/python-type.c (typy_lookup_typename): Likewise.
2009-07-02 19:04:23 +02:00
|
|
|
|
#ifdef HAVE_PYTHON
|
|
|
|
|
/* Helper function to install a Python environment suitable for
|
|
|
|
|
use during operations on VAR. */
|
2012-03-01 Pedro Alves <palves@redhat.com>
* amd64-linux-tdep.c (amd64_linux_record_signal): Make static.
* breakpoint.c (create_exception_master_breakpoint, trace_command)
(ftrace_command, strace_command): Make static.
* d-lang.c (_initialize_d_language): Declare.
* dwarf2expr.c (_initialize_dwarf2expr): Declare.
* dwarf2loc.c (_initialize_dwarf2loc):
* dwarf2read.c (process_psymtab_comp_unit): Make static.
* exec.c (exec_get_section_table): Make static.
* i386-linux-tdep.c (i386_linux_record_signal): Make static.
* infcmd.c (ensure_valid_thread, ensure_not_tfind_mode): Make static.
* inferior.c (remove_inferior_command, add_inferior_command)
(clone_inferior_command): Make static.
* linux-nat.c (linux_nat_thread_address_space)
(linux_nat_core_of_thread): Make static.
* linux-tdep.c (_initialize_linux_tdep): Declare.
* objc-lang.c (_initialize_objc_lang): Declare.
* opencl-lang.c (builtin_opencl_type, opencl_language_arch_info):
Make static.
(_initialize_opencl_language): Declare.
* record.c (_initialize_record): Declare.
* remote.c (demand_private_info, remote_get_tib_address)
(remote_supports_cond_tracepoints)
(remote_supports_fast_tracepoints, remote_get_tracepoint_status):
Make static.
* skip.c (_initialize_step_skip): Declare.
* symtab.c (skip_prologue_using_lineinfo): Make static.
* tracepoint.c (delete_trace_state_variable)
(trace_variable_command, delete_trace_variable_command)
(get_uploaded_tsv, find_matching_tracepoint_location)
(find_matching_tsv, create_tsv_from_upload, get_traceframe_info):
Make static.
* value.c (pack_unsigned_long): Make static.
* varobj.c (varobj_ensure_python_env): Make static.
* windows-tdep.c (_initialize_windows_tdep): Declare.
* xml-syscall.c (make_cleanup_free_syscalls_info): Make static.
2012-03-01 22:14:00 +01:00
|
|
|
|
static struct cleanup *
|
* python/python-internal.h (struct language_defn): Declare.
(python_gdbarch, python_language): Likewise.
(ensure_python_env): Add prototype.
(make_cleanup_py_restore_gil): Remove prototype.
* python/python.c: Include "arch-utils.h", "value.h" and "language.h".
(python_gdbarch, python_language): New global variables.
(struct python_env): New data type.
(ensure_python_env, restore_python_env): New functions.
(eval_python_from_control_command): Call ensure_python_env to
install current architecture and language.
(python_command, gdbpy_new_objfile): Likewise.
* python/python-cmd.c: Include "arch-utils.h" and "language.h".
(cmdpy_destroyer, cmdpy_function, cmdpy_completer): Call
ensure_python_env.
* python/python-type.c (clean_up_objfile_types): Likewise.
* python/python-objfile.c: Include "language.h".
(clean_up_objfile): Call ensure_python_env.
* python/python-prettyprint.c (apply_val_pretty_printer): Likewise.
(apply_varobj_pretty_printer): Do not call PyGILState_Ensure.
* varobj.c (varobj_ensure_python_env): New helper function.
(varobj_get_display_hint, update_dynamic_varobj_children,
install_default_visualizer, varobj_set_visualizer, free_variable,
value_get_print_value): Call it.
(value_get_print_value): Add varobj argument instead of pretty
printer argument. Update all callers.
* python/python-utils.c (py_gil_restore, make_cleanup_py_restore_gil):
Remove.
* value.h (internal_function_fn): Add GDBARCH and LANGUAGE argument.
(call_internal_function): Likewise.
* value.c (call_internal_function): Likewise. Pass to handler.
* eval.c (evaluate_subexp_standard): Update call.
* python/python-function.c: Include "language.h".
(fnpy_call): Add GDBARCH and LANGAUAGE arguments and call
make_cleanup_python_env.
* python/python-value.c (builtin_type_pyint, builtin_type_pyfloat,
builtin_type_pylong, builtin_type_pybool, builtin_type_pychar,
valpy_str): Use python_gdbarch and python_language instead of
current_gdbarch and current_language.
* python/python-type.c (typy_lookup_typename): Likewise.
2009-07-02 19:04:23 +02:00
|
|
|
|
varobj_ensure_python_env (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
return ensure_python_env (var->root->exp->gdbarch,
|
|
|
|
|
var->root->exp->language_defn);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Creates a varobj (not its children). */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2002-11-24 15:16:38 +01:00
|
|
|
|
/* Return the full FRAME which corresponds to the given CORE_ADDR
|
|
|
|
|
or NULL if no FRAME on the chain corresponds to CORE_ADDR. */
|
|
|
|
|
|
|
|
|
|
static struct frame_info *
|
|
|
|
|
find_frame_addr_in_frame_chain (CORE_ADDR frame_addr)
|
|
|
|
|
{
|
|
|
|
|
struct frame_info *frame = NULL;
|
|
|
|
|
|
|
|
|
|
if (frame_addr == (CORE_ADDR) 0)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
2009-02-05 18:28:21 +01:00
|
|
|
|
for (frame = get_current_frame ();
|
|
|
|
|
frame != NULL;
|
|
|
|
|
frame = get_prev_frame (frame))
|
2002-11-24 15:16:38 +01:00
|
|
|
|
{
|
2009-06-17 20:49:37 +02:00
|
|
|
|
/* The CORE_ADDR we get as argument was parsed from a string GDB
|
|
|
|
|
output as $fp. This output got truncated to gdbarch_addr_bit.
|
|
|
|
|
Truncate the frame base address in the same manner before
|
|
|
|
|
comparing it against our argument. */
|
|
|
|
|
CORE_ADDR frame_base = get_frame_base_address (frame);
|
|
|
|
|
int addr_bit = gdbarch_addr_bit (get_frame_arch (frame));
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2009-06-17 20:49:37 +02:00
|
|
|
|
if (addr_bit < (sizeof (CORE_ADDR) * HOST_CHAR_BIT))
|
|
|
|
|
frame_base &= ((CORE_ADDR) 1 << addr_bit) - 1;
|
|
|
|
|
|
|
|
|
|
if (frame_base == frame_addr)
|
2002-11-24 15:16:38 +01:00
|
|
|
|
return frame;
|
|
|
|
|
}
|
2009-02-05 18:28:21 +01:00
|
|
|
|
|
|
|
|
|
return NULL;
|
2002-11-24 15:16:38 +01:00
|
|
|
|
}
|
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
struct varobj *
|
|
|
|
|
varobj_create (char *objname,
|
2001-11-01 03:22:21 +01:00
|
|
|
|
char *expression, CORE_ADDR frame, enum varobj_type type)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
struct varobj *var;
|
|
|
|
|
struct cleanup *old_chain;
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Fill out a varobj structure for the (root) variable being constructed. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
var = new_root_variable ();
|
2000-05-22 11:02:23 +02:00
|
|
|
|
old_chain = make_cleanup_free_variable (var);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
if (expression != NULL)
|
|
|
|
|
{
|
2010-08-06 16:17:56 +02:00
|
|
|
|
struct frame_info *fi;
|
2010-08-19 09:34:27 +02:00
|
|
|
|
struct frame_id old_id = null_frame_id;
|
2010-08-06 16:17:56 +02:00
|
|
|
|
struct block *block;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
char *p;
|
|
|
|
|
enum varobj_languages lang;
|
2007-04-01 17:44:54 +02:00
|
|
|
|
struct value *value = NULL;
|
2012-01-09 21:27:49 +01:00
|
|
|
|
volatile struct gdb_exception except;
|
2012-06-27 20:08:41 +02:00
|
|
|
|
CORE_ADDR pc;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2009-02-05 18:28:21 +01:00
|
|
|
|
/* Parse and evaluate the expression, filling in as much of the
|
|
|
|
|
variable's data as possible. */
|
|
|
|
|
|
|
|
|
|
if (has_stack_frames ())
|
|
|
|
|
{
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Allow creator to specify context of variable. */
|
2009-02-05 18:28:21 +01:00
|
|
|
|
if ((type == USE_CURRENT_FRAME) || (type == USE_SELECTED_FRAME))
|
|
|
|
|
fi = get_selected_frame (NULL);
|
|
|
|
|
else
|
|
|
|
|
/* FIXME: cagney/2002-11-23: This code should be doing a
|
|
|
|
|
lookup using the frame ID and not just the frame's
|
|
|
|
|
``address''. This, of course, means an interface
|
|
|
|
|
change. However, with out that interface change ISAs,
|
|
|
|
|
such as the ia64 with its two stacks, won't work.
|
|
|
|
|
Similar goes for the case where there is a frameless
|
|
|
|
|
function. */
|
|
|
|
|
fi = find_frame_addr_in_frame_chain (frame);
|
|
|
|
|
}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
else
|
2009-02-05 18:28:21 +01:00
|
|
|
|
fi = NULL;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* frame = -2 means always use selected frame. */
|
2000-03-13 22:51:46 +01:00
|
|
|
|
if (type == USE_SELECTED_FRAME)
|
2008-03-26 15:11:18 +01:00
|
|
|
|
var->root->floating = 1;
|
2000-03-13 22:51:46 +01:00
|
|
|
|
|
2012-06-27 20:08:41 +02:00
|
|
|
|
pc = 0;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
block = NULL;
|
|
|
|
|
if (fi != NULL)
|
2012-06-27 20:08:41 +02:00
|
|
|
|
{
|
|
|
|
|
block = get_frame_block (fi, 0);
|
|
|
|
|
pc = get_frame_pc (fi);
|
|
|
|
|
}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
p = expression;
|
|
|
|
|
innermost_block = NULL;
|
2000-03-13 22:51:46 +01:00
|
|
|
|
/* Wrap the call to parse expression, so we can
|
2011-01-12 02:23:29 +01:00
|
|
|
|
return a sensible error. */
|
2012-01-09 21:27:49 +01:00
|
|
|
|
TRY_CATCH (except, RETURN_MASK_ERROR)
|
|
|
|
|
{
|
2012-06-27 20:08:41 +02:00
|
|
|
|
var->root->exp = parse_exp_1 (&p, pc, block, 0);
|
2012-01-09 21:27:49 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (except.reason < 0)
|
2000-03-13 22:51:46 +01:00
|
|
|
|
{
|
2011-06-30 21:29:55 +02:00
|
|
|
|
do_cleanups (old_chain);
|
2000-03-13 22:51:46 +01:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Don't allow variables to be created for types. */
|
PR exp/13206:
* ax-gdb.c (gen_expr) <OP_TYPEOF, OP_DECLTYPE>: New cases.
* breakpoint.c (watchpoint_exp_is_const) <OP_TYPEOF,
OP_DECLTYPE>: New cases.
* c-exp.y (TYPEOF, DECLTYPE): New tokens.
(type_exp): Add new productions.
(ident_tokens): Add __typeof__, typeof, __typeof, __decltype,
and decltype.
* eval.c (evaluate_subexp_standard) <OP_TYPEOF, OP_DECLTYPE>:
New case.
* expprint.c (dump_subexp_body_standard) <OP_TYPEOF,
OP_DECLTYPE>: New case.
* parse.c (operator_length_standard) <OP_TYPEOF, OP_DECLTYPE>:
New case.
* std-operator.def (OP_TYPEOF, OP_DECLTYPE): New constants.
* varobj.c (varobj_create): Handle OP_TYPEOF, OP_DECLTYPE.
gdb/testsuite
* gdb.cp/casts.exp: Add tests for typeof and decltype.
* gdb.cp/casts.cc (decltype): New function.
(main): Use it.
2012-07-19 17:38:18 +02:00
|
|
|
|
if (var->root->exp->elts[0].opcode == OP_TYPE
|
|
|
|
|
|| var->root->exp->elts[0].opcode == OP_TYPEOF
|
|
|
|
|
|| var->root->exp->elts[0].opcode == OP_DECLTYPE)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
do_cleanups (old_chain);
|
2005-01-14 19:17:20 +01:00
|
|
|
|
fprintf_unfiltered (gdb_stderr, "Attempt to use a type name"
|
|
|
|
|
" as an expression.\n");
|
2000-02-03 05:14:45 +01:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var->format = variable_default_display (var);
|
|
|
|
|
var->root->valid_block = innermost_block;
|
gdb/
Replace the savestring calls by xstrdup calls where possible.
* breakpoint.c (condition_command, set_raw_breakpoint)
(create_catchpoint, update_breakpoint_locations): Replace the
savestring calls by xstrdup calls where possible.
* buildsym.c (start_subfile, patch_subfile_names, record_debugformat)
(record_producer): Likewise.
* coffread.c (coff_start_symtab, complete_symtab): Likewise.
* corefile.c (set_gnutarget): Likewise.
* dbxread.c (add_new_header_file): Likewise.
* demangle.c (set_demangling_command, set_demangling_style): Likewise.
* event-top.c (push_prompt, pop_prompt, command_line_handler)
(set_async_prompt): Likewise.
* infcmd.c (set_inferior_io_terminal, attach_command_post_wait):
Likewise.
* language.c (set_language_command, _initialize_language): Likewise.
* linespec.c (decode_line_2): Likewise.
* rs6000-nat.c (add_vmap): Likewise.
* top.c (set_prompt, init_history, init_main): Likewise.
* tracepoint.c (stringify_collection_list): Likewise.
* varobj.c (varobj_create): Remove variable expr_len. Replace the
savestring calls by xstrdup calls where possible.
(value_of_root, c_name_of_variable, c_describe_child): Replace the
savestring calls by xstrdup calls where possible.
* xcoffread.c (complete_symtab): Likewise.
* cli/cli-script.c (build_command_line, define_command): Likewise.
* cli/cli-setshow.c (do_setshow_command): Likewise.
2009-05-23 18:17:18 +02:00
|
|
|
|
var->name = xstrdup (expression);
|
2007-08-31 20:52:05 +02:00
|
|
|
|
/* For a root var, the name and the expr are the same. */
|
gdb/
Replace the savestring calls by xstrdup calls where possible.
* breakpoint.c (condition_command, set_raw_breakpoint)
(create_catchpoint, update_breakpoint_locations): Replace the
savestring calls by xstrdup calls where possible.
* buildsym.c (start_subfile, patch_subfile_names, record_debugformat)
(record_producer): Likewise.
* coffread.c (coff_start_symtab, complete_symtab): Likewise.
* corefile.c (set_gnutarget): Likewise.
* dbxread.c (add_new_header_file): Likewise.
* demangle.c (set_demangling_command, set_demangling_style): Likewise.
* event-top.c (push_prompt, pop_prompt, command_line_handler)
(set_async_prompt): Likewise.
* infcmd.c (set_inferior_io_terminal, attach_command_post_wait):
Likewise.
* language.c (set_language_command, _initialize_language): Likewise.
* linespec.c (decode_line_2): Likewise.
* rs6000-nat.c (add_vmap): Likewise.
* top.c (set_prompt, init_history, init_main): Likewise.
* tracepoint.c (stringify_collection_list): Likewise.
* varobj.c (varobj_create): Remove variable expr_len. Replace the
savestring calls by xstrdup calls where possible.
(value_of_root, c_name_of_variable, c_describe_child): Replace the
savestring calls by xstrdup calls where possible.
* xcoffread.c (complete_symtab): Likewise.
* cli/cli-script.c (build_command_line, define_command): Likewise.
* cli/cli-setshow.c (do_setshow_command): Likewise.
2009-05-23 18:17:18 +02:00
|
|
|
|
var->path_expr = xstrdup (expression);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
/* When the frame is different from the current frame,
|
|
|
|
|
we must select the appropriate frame before parsing
|
|
|
|
|
the expression, otherwise the value will not be current.
|
2011-01-12 02:23:29 +01:00
|
|
|
|
Since select_frame is so benign, just call it for all cases. */
|
2009-08-27 08:33:25 +02:00
|
|
|
|
if (innermost_block)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2009-08-27 08:33:25 +02:00
|
|
|
|
/* User could specify explicit FRAME-ADDR which was not found but
|
|
|
|
|
EXPRESSION is frame specific and we would not be able to evaluate
|
|
|
|
|
it correctly next time. With VALID_BLOCK set we must also set
|
|
|
|
|
FRAME and THREAD_ID. */
|
|
|
|
|
if (fi == NULL)
|
|
|
|
|
error (_("Failed to find the specified frame"));
|
|
|
|
|
|
2002-12-04 01:05:54 +01:00
|
|
|
|
var->root->frame = get_frame_id (fi);
|
2008-03-24 18:33:30 +01:00
|
|
|
|
var->root->thread_id = pid_to_thread_id (inferior_ptid);
|
2010-08-19 09:34:27 +02:00
|
|
|
|
old_id = get_frame_id (get_selected_frame (NULL));
|
2008-03-24 18:33:30 +01:00
|
|
|
|
select_frame (fi);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
2007-11-20 20:54:39 +01:00
|
|
|
|
/* We definitely need to catch errors here.
|
2000-02-03 05:14:45 +01:00
|
|
|
|
If evaluate_expression succeeds we got the value we wanted.
|
2011-01-12 02:23:29 +01:00
|
|
|
|
But if it fails, we still go on with a call to evaluate_type(). */
|
2012-01-09 21:27:49 +01:00
|
|
|
|
TRY_CATCH (except, RETURN_MASK_ERROR)
|
|
|
|
|
{
|
|
|
|
|
value = evaluate_expression (var->root->exp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (except.reason < 0)
|
2007-04-01 17:44:54 +02:00
|
|
|
|
{
|
|
|
|
|
/* Error getting the value. Try to at least get the
|
|
|
|
|
right type. */
|
|
|
|
|
struct value *type_only_value = evaluate_type (var->root->exp);
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2007-04-01 17:44:54 +02:00
|
|
|
|
var->type = value_type (type_only_value);
|
|
|
|
|
}
|
2012-04-14 14:18:50 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
int real_type_found = 0;
|
|
|
|
|
|
|
|
|
|
var->type = value_actual_type (value, 0, &real_type_found);
|
|
|
|
|
if (real_type_found)
|
|
|
|
|
value = value_cast (var->type, value);
|
|
|
|
|
}
|
2006-11-28 18:23:10 +01:00
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
/* Set language info */
|
|
|
|
|
lang = variable_language (var);
|
2007-01-03 20:01:25 +01:00
|
|
|
|
var->root->lang = &languages[lang];
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2012-03-28 23:31:29 +02:00
|
|
|
|
install_new_value (var, value, 1 /* Initial assignment */);
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Set ourselves as our root. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
var->root->rootvar = var;
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Reset the selected frame. */
|
2010-08-19 09:34:27 +02:00
|
|
|
|
if (frame_id_p (old_id))
|
|
|
|
|
select_frame (frame_find_by_id (old_id));
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
2000-03-13 22:51:46 +01:00
|
|
|
|
/* If the variable object name is null, that means this
|
2011-01-12 02:23:29 +01:00
|
|
|
|
is a temporary variable, so don't install it. */
|
2000-03-13 22:51:46 +01:00
|
|
|
|
|
|
|
|
|
if ((var != NULL) && (objname != NULL))
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
gdb/
Replace the savestring calls by xstrdup calls where possible.
* breakpoint.c (condition_command, set_raw_breakpoint)
(create_catchpoint, update_breakpoint_locations): Replace the
savestring calls by xstrdup calls where possible.
* buildsym.c (start_subfile, patch_subfile_names, record_debugformat)
(record_producer): Likewise.
* coffread.c (coff_start_symtab, complete_symtab): Likewise.
* corefile.c (set_gnutarget): Likewise.
* dbxread.c (add_new_header_file): Likewise.
* demangle.c (set_demangling_command, set_demangling_style): Likewise.
* event-top.c (push_prompt, pop_prompt, command_line_handler)
(set_async_prompt): Likewise.
* infcmd.c (set_inferior_io_terminal, attach_command_post_wait):
Likewise.
* language.c (set_language_command, _initialize_language): Likewise.
* linespec.c (decode_line_2): Likewise.
* rs6000-nat.c (add_vmap): Likewise.
* top.c (set_prompt, init_history, init_main): Likewise.
* tracepoint.c (stringify_collection_list): Likewise.
* varobj.c (varobj_create): Remove variable expr_len. Replace the
savestring calls by xstrdup calls where possible.
(value_of_root, c_name_of_variable, c_describe_child): Replace the
savestring calls by xstrdup calls where possible.
* xcoffread.c (complete_symtab): Likewise.
* cli/cli-script.c (build_command_line, define_command): Likewise.
* cli/cli-setshow.c (do_setshow_command): Likewise.
2009-05-23 18:17:18 +02:00
|
|
|
|
var->obj_name = xstrdup (objname);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
/* If a varobj name is duplicated, the install will fail so
|
2011-01-12 02:23:29 +01:00
|
|
|
|
we must cleanup. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
if (!install_variable (var))
|
|
|
|
|
{
|
|
|
|
|
do_cleanups (old_chain);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
discard_cleanups (old_chain);
|
|
|
|
|
return var;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Generates an unique name that can be used for a varobj. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
varobj_gen_name (void)
|
|
|
|
|
{
|
|
|
|
|
static int id = 0;
|
2002-07-03 22:23:04 +02:00
|
|
|
|
char *obj_name;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Generate a name for this object. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
id++;
|
2004-06-29 01:59:29 +02:00
|
|
|
|
obj_name = xstrprintf ("var%d", id);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2002-07-03 22:23:04 +02:00
|
|
|
|
return obj_name;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
2009-05-23 17:34:36 +02:00
|
|
|
|
/* Given an OBJNAME, returns the pointer to the corresponding varobj. Call
|
|
|
|
|
error if OBJNAME cannot be found. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
struct varobj *
|
|
|
|
|
varobj_get_handle (char *objname)
|
|
|
|
|
{
|
|
|
|
|
struct vlist *cv;
|
|
|
|
|
const char *chp;
|
|
|
|
|
unsigned int index = 0;
|
|
|
|
|
unsigned int i = 1;
|
|
|
|
|
|
|
|
|
|
for (chp = objname; *chp; chp++)
|
|
|
|
|
{
|
|
|
|
|
index = (index + (i++ * (unsigned int) *chp)) % VAROBJ_TABLE_SIZE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
cv = *(varobj_table + index);
|
|
|
|
|
while ((cv != NULL) && (strcmp (cv->var->obj_name, objname) != 0))
|
|
|
|
|
cv = cv->next;
|
|
|
|
|
|
|
|
|
|
if (cv == NULL)
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 05:06:14 +01:00
|
|
|
|
error (_("Variable object not found"));
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
return cv->var;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Given the handle, return the name of the object. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
varobj_get_objname (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
return var->obj_name;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Given the handle, return the expression represented by the object. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
varobj_get_expression (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
return name_of_variable (var);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Deletes a varobj and all its children if only_children == 0,
|
2011-01-05 23:22:53 +01:00
|
|
|
|
otherwise deletes only the children; returns a malloc'ed list of
|
|
|
|
|
all the (malloc'ed) names of the variables that have been deleted
|
2011-01-12 02:23:29 +01:00
|
|
|
|
(NULL terminated). */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
varobj_delete (struct varobj *var, char ***dellist, int only_children)
|
|
|
|
|
{
|
|
|
|
|
int delcount;
|
|
|
|
|
int mycount;
|
|
|
|
|
struct cpstack *result = NULL;
|
|
|
|
|
char **cp;
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Initialize a stack for temporary results. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
cppush (&result, NULL);
|
|
|
|
|
|
|
|
|
|
if (only_children)
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Delete only the variable children. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
delcount = delete_variable (&result, var, 1 /* only the children */ );
|
|
|
|
|
else
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Delete the variable and all its children. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
delcount = delete_variable (&result, var, 0 /* parent+children */ );
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* We may have been asked to return a list of what has been deleted. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
if (dellist != NULL)
|
|
|
|
|
{
|
|
|
|
|
*dellist = xmalloc ((delcount + 1) * sizeof (char *));
|
|
|
|
|
|
|
|
|
|
cp = *dellist;
|
|
|
|
|
mycount = delcount;
|
|
|
|
|
*cp = cppop (&result);
|
|
|
|
|
while ((*cp != NULL) && (mycount > 0))
|
|
|
|
|
{
|
|
|
|
|
mycount--;
|
|
|
|
|
cp++;
|
|
|
|
|
*cp = cppop (&result);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (mycount || (*cp != NULL))
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 05:06:14 +01:00
|
|
|
|
warning (_("varobj_delete: assertion failed - mycount(=%d) <> 0"),
|
2001-11-01 03:22:21 +01:00
|
|
|
|
mycount);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return delcount;
|
|
|
|
|
}
|
|
|
|
|
|
2010-01-20 07:36:38 +01:00
|
|
|
|
#if HAVE_PYTHON
|
|
|
|
|
|
2009-05-28 03:09:20 +02:00
|
|
|
|
/* Convenience function for varobj_set_visualizer. Instantiate a
|
|
|
|
|
pretty-printer for a given value. */
|
|
|
|
|
static PyObject *
|
|
|
|
|
instantiate_pretty_printer (PyObject *constructor, struct value *value)
|
|
|
|
|
{
|
|
|
|
|
PyObject *val_obj = NULL;
|
|
|
|
|
PyObject *printer;
|
|
|
|
|
|
|
|
|
|
val_obj = value_to_value_object (value);
|
|
|
|
|
if (! val_obj)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
printer = PyObject_CallFunctionObjArgs (constructor, val_obj, NULL);
|
|
|
|
|
Py_DECREF (val_obj);
|
|
|
|
|
return printer;
|
|
|
|
|
}
|
|
|
|
|
|
2010-01-20 07:36:38 +01:00
|
|
|
|
#endif
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Set/Get variable object display format. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
enum varobj_display_formats
|
|
|
|
|
varobj_set_display_format (struct varobj *var,
|
|
|
|
|
enum varobj_display_formats format)
|
|
|
|
|
{
|
|
|
|
|
switch (format)
|
|
|
|
|
{
|
|
|
|
|
case FORMAT_NATURAL:
|
|
|
|
|
case FORMAT_BINARY:
|
|
|
|
|
case FORMAT_DECIMAL:
|
|
|
|
|
case FORMAT_HEXADECIMAL:
|
|
|
|
|
case FORMAT_OCTAL:
|
|
|
|
|
var->format = format;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
var->format = variable_default_display (var);
|
|
|
|
|
}
|
|
|
|
|
|
2008-02-04 07:14:20 +01:00
|
|
|
|
if (varobj_value_is_changeable_p (var)
|
|
|
|
|
&& var->value && !value_lazy (var->value))
|
|
|
|
|
{
|
2008-09-14 01:37:05 +02:00
|
|
|
|
xfree (var->print_value);
|
* python/python-internal.h (struct language_defn): Declare.
(python_gdbarch, python_language): Likewise.
(ensure_python_env): Add prototype.
(make_cleanup_py_restore_gil): Remove prototype.
* python/python.c: Include "arch-utils.h", "value.h" and "language.h".
(python_gdbarch, python_language): New global variables.
(struct python_env): New data type.
(ensure_python_env, restore_python_env): New functions.
(eval_python_from_control_command): Call ensure_python_env to
install current architecture and language.
(python_command, gdbpy_new_objfile): Likewise.
* python/python-cmd.c: Include "arch-utils.h" and "language.h".
(cmdpy_destroyer, cmdpy_function, cmdpy_completer): Call
ensure_python_env.
* python/python-type.c (clean_up_objfile_types): Likewise.
* python/python-objfile.c: Include "language.h".
(clean_up_objfile): Call ensure_python_env.
* python/python-prettyprint.c (apply_val_pretty_printer): Likewise.
(apply_varobj_pretty_printer): Do not call PyGILState_Ensure.
* varobj.c (varobj_ensure_python_env): New helper function.
(varobj_get_display_hint, update_dynamic_varobj_children,
install_default_visualizer, varobj_set_visualizer, free_variable,
value_get_print_value): Call it.
(value_get_print_value): Add varobj argument instead of pretty
printer argument. Update all callers.
* python/python-utils.c (py_gil_restore, make_cleanup_py_restore_gil):
Remove.
* value.h (internal_function_fn): Add GDBARCH and LANGUAGE argument.
(call_internal_function): Likewise.
* value.c (call_internal_function): Likewise. Pass to handler.
* eval.c (evaluate_subexp_standard): Update call.
* python/python-function.c: Include "language.h".
(fnpy_call): Add GDBARCH and LANGAUAGE arguments and call
make_cleanup_python_env.
* python/python-value.c (builtin_type_pyint, builtin_type_pyfloat,
builtin_type_pylong, builtin_type_pybool, builtin_type_pychar,
valpy_str): Use python_gdbarch and python_language instead of
current_gdbarch and current_language.
* python/python-type.c (typy_lookup_typename): Likewise.
2009-07-02 19:04:23 +02:00
|
|
|
|
var->print_value = value_get_print_value (var->value, var->format, var);
|
2008-02-04 07:14:20 +01:00
|
|
|
|
}
|
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
return var->format;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
enum varobj_display_formats
|
|
|
|
|
varobj_get_display_format (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
return var->format;
|
|
|
|
|
}
|
|
|
|
|
|
2009-05-28 03:09:20 +02:00
|
|
|
|
char *
|
|
|
|
|
varobj_get_display_hint (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
char *result = NULL;
|
|
|
|
|
|
|
|
|
|
#if HAVE_PYTHON
|
* python/python-internal.h (struct language_defn): Declare.
(python_gdbarch, python_language): Likewise.
(ensure_python_env): Add prototype.
(make_cleanup_py_restore_gil): Remove prototype.
* python/python.c: Include "arch-utils.h", "value.h" and "language.h".
(python_gdbarch, python_language): New global variables.
(struct python_env): New data type.
(ensure_python_env, restore_python_env): New functions.
(eval_python_from_control_command): Call ensure_python_env to
install current architecture and language.
(python_command, gdbpy_new_objfile): Likewise.
* python/python-cmd.c: Include "arch-utils.h" and "language.h".
(cmdpy_destroyer, cmdpy_function, cmdpy_completer): Call
ensure_python_env.
* python/python-type.c (clean_up_objfile_types): Likewise.
* python/python-objfile.c: Include "language.h".
(clean_up_objfile): Call ensure_python_env.
* python/python-prettyprint.c (apply_val_pretty_printer): Likewise.
(apply_varobj_pretty_printer): Do not call PyGILState_Ensure.
* varobj.c (varobj_ensure_python_env): New helper function.
(varobj_get_display_hint, update_dynamic_varobj_children,
install_default_visualizer, varobj_set_visualizer, free_variable,
value_get_print_value): Call it.
(value_get_print_value): Add varobj argument instead of pretty
printer argument. Update all callers.
* python/python-utils.c (py_gil_restore, make_cleanup_py_restore_gil):
Remove.
* value.h (internal_function_fn): Add GDBARCH and LANGUAGE argument.
(call_internal_function): Likewise.
* value.c (call_internal_function): Likewise. Pass to handler.
* eval.c (evaluate_subexp_standard): Update call.
* python/python-function.c: Include "language.h".
(fnpy_call): Add GDBARCH and LANGAUAGE arguments and call
make_cleanup_python_env.
* python/python-value.c (builtin_type_pyint, builtin_type_pyfloat,
builtin_type_pylong, builtin_type_pybool, builtin_type_pychar,
valpy_str): Use python_gdbarch and python_language instead of
current_gdbarch and current_language.
* python/python-type.c (typy_lookup_typename): Likewise.
2009-07-02 19:04:23 +02:00
|
|
|
|
struct cleanup *back_to = varobj_ensure_python_env (var);
|
|
|
|
|
|
2009-05-28 03:09:20 +02:00
|
|
|
|
if (var->pretty_printer)
|
|
|
|
|
result = gdbpy_get_display_hint (var->pretty_printer);
|
* python/python-internal.h (struct language_defn): Declare.
(python_gdbarch, python_language): Likewise.
(ensure_python_env): Add prototype.
(make_cleanup_py_restore_gil): Remove prototype.
* python/python.c: Include "arch-utils.h", "value.h" and "language.h".
(python_gdbarch, python_language): New global variables.
(struct python_env): New data type.
(ensure_python_env, restore_python_env): New functions.
(eval_python_from_control_command): Call ensure_python_env to
install current architecture and language.
(python_command, gdbpy_new_objfile): Likewise.
* python/python-cmd.c: Include "arch-utils.h" and "language.h".
(cmdpy_destroyer, cmdpy_function, cmdpy_completer): Call
ensure_python_env.
* python/python-type.c (clean_up_objfile_types): Likewise.
* python/python-objfile.c: Include "language.h".
(clean_up_objfile): Call ensure_python_env.
* python/python-prettyprint.c (apply_val_pretty_printer): Likewise.
(apply_varobj_pretty_printer): Do not call PyGILState_Ensure.
* varobj.c (varobj_ensure_python_env): New helper function.
(varobj_get_display_hint, update_dynamic_varobj_children,
install_default_visualizer, varobj_set_visualizer, free_variable,
value_get_print_value): Call it.
(value_get_print_value): Add varobj argument instead of pretty
printer argument. Update all callers.
* python/python-utils.c (py_gil_restore, make_cleanup_py_restore_gil):
Remove.
* value.h (internal_function_fn): Add GDBARCH and LANGUAGE argument.
(call_internal_function): Likewise.
* value.c (call_internal_function): Likewise. Pass to handler.
* eval.c (evaluate_subexp_standard): Update call.
* python/python-function.c: Include "language.h".
(fnpy_call): Add GDBARCH and LANGAUAGE arguments and call
make_cleanup_python_env.
* python/python-value.c (builtin_type_pyint, builtin_type_pyfloat,
builtin_type_pylong, builtin_type_pybool, builtin_type_pychar,
valpy_str): Use python_gdbarch and python_language instead of
current_gdbarch and current_language.
* python/python-type.c (typy_lookup_typename): Likewise.
2009-07-02 19:04:23 +02:00
|
|
|
|
|
|
|
|
|
do_cleanups (back_to);
|
2009-05-28 03:09:20 +02:00
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
/* Return true if the varobj has items after TO, false otherwise. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
varobj_has_more (struct varobj *var, int to)
|
|
|
|
|
{
|
|
|
|
|
if (VEC_length (varobj_p, var->children) > to)
|
|
|
|
|
return 1;
|
|
|
|
|
return ((to == -1 || VEC_length (varobj_p, var->children) == to)
|
|
|
|
|
&& var->saved_item != NULL);
|
|
|
|
|
}
|
|
|
|
|
|
2008-03-24 18:33:30 +01:00
|
|
|
|
/* If the variable object is bound to a specific thread, that
|
|
|
|
|
is its evaluation can always be done in context of a frame
|
|
|
|
|
inside that thread, returns GDB id of the thread -- which
|
2011-01-12 02:23:29 +01:00
|
|
|
|
is always positive. Otherwise, returns -1. */
|
2008-03-24 18:33:30 +01:00
|
|
|
|
int
|
|
|
|
|
varobj_get_thread_id (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
if (var->root->valid_block && var->root->thread_id > 0)
|
|
|
|
|
return var->root->thread_id;
|
|
|
|
|
else
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
2007-04-14 11:51:30 +02:00
|
|
|
|
void
|
|
|
|
|
varobj_set_frozen (struct varobj *var, int frozen)
|
|
|
|
|
{
|
|
|
|
|
/* When a variable is unfrozen, we don't fetch its value.
|
|
|
|
|
The 'not_fetched' flag remains set, so next -var-update
|
|
|
|
|
won't complain.
|
|
|
|
|
|
|
|
|
|
We don't fetch the value, because for structures the client
|
|
|
|
|
should do -var-update anyway. It would be bad to have different
|
|
|
|
|
client-size logic for structure and other types. */
|
|
|
|
|
var->frozen = frozen;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
varobj_get_frozen (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
return var->frozen;
|
|
|
|
|
}
|
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
/* A helper function that restricts a range to what is actually
|
|
|
|
|
available in a VEC. This follows the usual rules for the meaning
|
|
|
|
|
of FROM and TO -- if either is negative, the entire range is
|
|
|
|
|
used. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
restrict_range (VEC (varobj_p) *children, int *from, int *to)
|
|
|
|
|
{
|
|
|
|
|
if (*from < 0 || *to < 0)
|
|
|
|
|
{
|
|
|
|
|
*from = 0;
|
|
|
|
|
*to = VEC_length (varobj_p, children);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (*from > VEC_length (varobj_p, children))
|
|
|
|
|
*from = VEC_length (varobj_p, children);
|
|
|
|
|
if (*to > VEC_length (varobj_p, children))
|
|
|
|
|
*to = VEC_length (varobj_p, children);
|
|
|
|
|
if (*from > *to)
|
|
|
|
|
*from = *to;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2010-01-20 07:36:38 +01:00
|
|
|
|
#if HAVE_PYTHON
|
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
/* A helper for update_dynamic_varobj_children that installs a new
|
|
|
|
|
child when needed. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
install_dynamic_child (struct varobj *var,
|
|
|
|
|
VEC (varobj_p) **changed,
|
2012-04-14 14:18:50 +02:00
|
|
|
|
VEC (varobj_p) **type_changed,
|
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 20:51:26 +02:00
|
|
|
|
VEC (varobj_p) **new,
|
|
|
|
|
VEC (varobj_p) **unchanged,
|
|
|
|
|
int *cchanged,
|
|
|
|
|
int index,
|
|
|
|
|
const char *name,
|
|
|
|
|
struct value *value)
|
|
|
|
|
{
|
|
|
|
|
if (VEC_length (varobj_p, var->children) < index + 1)
|
|
|
|
|
{
|
|
|
|
|
/* There's no child yet. */
|
|
|
|
|
struct varobj *child = varobj_add_child (var, name, value);
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
if (new)
|
|
|
|
|
{
|
|
|
|
|
VEC_safe_push (varobj_p, *new, child);
|
|
|
|
|
*cchanged = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
varobj_p existing = VEC_index (varobj_p, var->children, index);
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2012-04-14 14:18:50 +02:00
|
|
|
|
int type_updated = update_type_if_necessary (existing, value);
|
|
|
|
|
if (type_updated)
|
|
|
|
|
{
|
|
|
|
|
if (type_changed)
|
|
|
|
|
VEC_safe_push (varobj_p, *type_changed, existing);
|
|
|
|
|
}
|
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 20:51:26 +02:00
|
|
|
|
if (install_new_value (existing, value, 0))
|
|
|
|
|
{
|
2012-04-14 14:18:50 +02:00
|
|
|
|
if (!type_updated && changed)
|
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 20:51:26 +02:00
|
|
|
|
VEC_safe_push (varobj_p, *changed, existing);
|
|
|
|
|
}
|
2012-04-14 14:18:50 +02:00
|
|
|
|
else if (!type_updated && unchanged)
|
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 20:51:26 +02:00
|
|
|
|
VEC_safe_push (varobj_p, *unchanged, existing);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
dynamic_varobj_has_child_method (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
struct cleanup *back_to;
|
|
|
|
|
PyObject *printer = var->pretty_printer;
|
|
|
|
|
int result;
|
|
|
|
|
|
|
|
|
|
back_to = varobj_ensure_python_env (var);
|
|
|
|
|
result = PyObject_HasAttr (printer, gdbpy_children_cst);
|
|
|
|
|
do_cleanups (back_to);
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
2009-05-28 03:09:20 +02:00
|
|
|
|
static int
|
|
|
|
|
update_dynamic_varobj_children (struct varobj *var,
|
|
|
|
|
VEC (varobj_p) **changed,
|
2012-04-14 14:18:50 +02:00
|
|
|
|
VEC (varobj_p) **type_changed,
|
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 20:51:26 +02:00
|
|
|
|
VEC (varobj_p) **new,
|
|
|
|
|
VEC (varobj_p) **unchanged,
|
|
|
|
|
int *cchanged,
|
|
|
|
|
int update_children,
|
|
|
|
|
int from,
|
|
|
|
|
int to)
|
2009-05-28 03:09:20 +02:00
|
|
|
|
{
|
|
|
|
|
#if HAVE_PYTHON
|
|
|
|
|
struct cleanup *back_to;
|
|
|
|
|
PyObject *children;
|
|
|
|
|
int i;
|
|
|
|
|
PyObject *printer = var->pretty_printer;
|
|
|
|
|
|
* python/python-internal.h (struct language_defn): Declare.
(python_gdbarch, python_language): Likewise.
(ensure_python_env): Add prototype.
(make_cleanup_py_restore_gil): Remove prototype.
* python/python.c: Include "arch-utils.h", "value.h" and "language.h".
(python_gdbarch, python_language): New global variables.
(struct python_env): New data type.
(ensure_python_env, restore_python_env): New functions.
(eval_python_from_control_command): Call ensure_python_env to
install current architecture and language.
(python_command, gdbpy_new_objfile): Likewise.
* python/python-cmd.c: Include "arch-utils.h" and "language.h".
(cmdpy_destroyer, cmdpy_function, cmdpy_completer): Call
ensure_python_env.
* python/python-type.c (clean_up_objfile_types): Likewise.
* python/python-objfile.c: Include "language.h".
(clean_up_objfile): Call ensure_python_env.
* python/python-prettyprint.c (apply_val_pretty_printer): Likewise.
(apply_varobj_pretty_printer): Do not call PyGILState_Ensure.
* varobj.c (varobj_ensure_python_env): New helper function.
(varobj_get_display_hint, update_dynamic_varobj_children,
install_default_visualizer, varobj_set_visualizer, free_variable,
value_get_print_value): Call it.
(value_get_print_value): Add varobj argument instead of pretty
printer argument. Update all callers.
* python/python-utils.c (py_gil_restore, make_cleanup_py_restore_gil):
Remove.
* value.h (internal_function_fn): Add GDBARCH and LANGUAGE argument.
(call_internal_function): Likewise.
* value.c (call_internal_function): Likewise. Pass to handler.
* eval.c (evaluate_subexp_standard): Update call.
* python/python-function.c: Include "language.h".
(fnpy_call): Add GDBARCH and LANGAUAGE arguments and call
make_cleanup_python_env.
* python/python-value.c (builtin_type_pyint, builtin_type_pyfloat,
builtin_type_pylong, builtin_type_pybool, builtin_type_pychar,
valpy_str): Use python_gdbarch and python_language instead of
current_gdbarch and current_language.
* python/python-type.c (typy_lookup_typename): Likewise.
2009-07-02 19:04:23 +02:00
|
|
|
|
back_to = varobj_ensure_python_env (var);
|
2009-05-28 03:09:20 +02:00
|
|
|
|
|
|
|
|
|
*cchanged = 0;
|
|
|
|
|
if (!PyObject_HasAttr (printer, gdbpy_children_cst))
|
|
|
|
|
{
|
|
|
|
|
do_cleanups (back_to);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
if (update_children || !var->child_iter)
|
2009-05-28 03:09:20 +02:00
|
|
|
|
{
|
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 20:51:26 +02:00
|
|
|
|
children = PyObject_CallMethodObjArgs (printer, gdbpy_children_cst,
|
|
|
|
|
NULL);
|
2009-05-28 03:09:20 +02:00
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
if (!children)
|
|
|
|
|
{
|
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
|
error (_("Null value returned for children"));
|
|
|
|
|
}
|
2009-05-28 03:09:20 +02:00
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
make_cleanup_py_decref (children);
|
2009-05-28 03:09:20 +02:00
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
Py_XDECREF (var->child_iter);
|
|
|
|
|
var->child_iter = PyObject_GetIter (children);
|
|
|
|
|
if (!var->child_iter)
|
|
|
|
|
{
|
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
|
error (_("Could not get children iterator"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Py_XDECREF (var->saved_item);
|
|
|
|
|
var->saved_item = NULL;
|
|
|
|
|
|
|
|
|
|
i = 0;
|
2009-05-28 03:09:20 +02:00
|
|
|
|
}
|
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 20:51:26 +02:00
|
|
|
|
else
|
|
|
|
|
i = VEC_length (varobj_p, var->children);
|
2009-05-28 03:09:20 +02:00
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
/* We ask for one extra child, so that MI can report whether there
|
|
|
|
|
are more children. */
|
|
|
|
|
for (; to < 0 || i < to + 1; ++i)
|
2009-05-28 03:09:20 +02:00
|
|
|
|
{
|
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 20:51:26 +02:00
|
|
|
|
PyObject *item;
|
2011-03-31 21:59:26 +02:00
|
|
|
|
int force_done = 0;
|
2009-05-28 03:09:20 +02:00
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
/* See if there was a leftover from last time. */
|
|
|
|
|
if (var->saved_item)
|
|
|
|
|
{
|
|
|
|
|
item = var->saved_item;
|
|
|
|
|
var->saved_item = NULL;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
item = PyIter_Next (var->child_iter);
|
2009-05-28 03:09:20 +02:00
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
if (!item)
|
2011-03-31 21:59:26 +02:00
|
|
|
|
{
|
|
|
|
|
/* Normal end of iteration. */
|
|
|
|
|
if (!PyErr_Occurred ())
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* If we got a memory error, just use the text as the
|
|
|
|
|
item. */
|
|
|
|
|
if (PyErr_ExceptionMatches (gdbpy_gdb_memory_error))
|
|
|
|
|
{
|
|
|
|
|
PyObject *type, *value, *trace;
|
|
|
|
|
char *name_str, *value_str;
|
|
|
|
|
|
|
|
|
|
PyErr_Fetch (&type, &value, &trace);
|
|
|
|
|
value_str = gdbpy_exception_to_string (type, value);
|
|
|
|
|
Py_XDECREF (type);
|
|
|
|
|
Py_XDECREF (value);
|
|
|
|
|
Py_XDECREF (trace);
|
|
|
|
|
if (!value_str)
|
|
|
|
|
{
|
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
name_str = xstrprintf ("<error at %d>", i);
|
|
|
|
|
item = Py_BuildValue ("(ss)", name_str, value_str);
|
|
|
|
|
xfree (name_str);
|
|
|
|
|
xfree (value_str);
|
|
|
|
|
if (!item)
|
|
|
|
|
{
|
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
force_done = 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Any other kind of error. */
|
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2009-05-28 03:09:20 +02:00
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
/* We don't want to push the extra child on any report list. */
|
|
|
|
|
if (to < 0 || i < to)
|
2009-05-28 03:09:20 +02:00
|
|
|
|
{
|
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 20:51:26 +02:00
|
|
|
|
PyObject *py_v;
|
2011-06-24 21:47:37 +02:00
|
|
|
|
const char *name;
|
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 20:51:26 +02:00
|
|
|
|
struct value *v;
|
|
|
|
|
struct cleanup *inner;
|
|
|
|
|
int can_mention = from < 0 || i >= from;
|
|
|
|
|
|
|
|
|
|
inner = make_cleanup_py_decref (item);
|
|
|
|
|
|
|
|
|
|
if (!PyArg_ParseTuple (item, "sO", &name, &py_v))
|
2011-03-31 21:59:26 +02:00
|
|
|
|
{
|
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
|
error (_("Invalid item from the child list"));
|
|
|
|
|
}
|
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 20:51:26 +02:00
|
|
|
|
|
|
|
|
|
v = convert_value_from_python (py_v);
|
2010-10-13 15:24:40 +02:00
|
|
|
|
if (v == NULL)
|
|
|
|
|
gdbpy_print_stack ();
|
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 20:51:26 +02:00
|
|
|
|
install_dynamic_child (var, can_mention ? changed : NULL,
|
2012-04-14 14:18:50 +02:00
|
|
|
|
can_mention ? type_changed : NULL,
|
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 20:51:26 +02:00
|
|
|
|
can_mention ? new : NULL,
|
|
|
|
|
can_mention ? unchanged : NULL,
|
|
|
|
|
can_mention ? cchanged : NULL, i, name, v);
|
|
|
|
|
do_cleanups (inner);
|
2009-05-28 03:09:20 +02:00
|
|
|
|
}
|
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 20:51:26 +02:00
|
|
|
|
else
|
2009-05-28 03:09:20 +02:00
|
|
|
|
{
|
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 20:51:26 +02:00
|
|
|
|
Py_XDECREF (var->saved_item);
|
|
|
|
|
var->saved_item = item;
|
2009-05-28 03:09:20 +02:00
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
/* We want to truncate the child list just before this
|
|
|
|
|
element. */
|
|
|
|
|
break;
|
|
|
|
|
}
|
2011-03-31 21:59:26 +02:00
|
|
|
|
|
|
|
|
|
if (force_done)
|
|
|
|
|
break;
|
2009-05-28 03:09:20 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (i < VEC_length (varobj_p, var->children))
|
|
|
|
|
{
|
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 20:51:26 +02:00
|
|
|
|
int j;
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
*cchanged = 1;
|
|
|
|
|
for (j = i; j < VEC_length (varobj_p, var->children); ++j)
|
|
|
|
|
varobj_delete (VEC_index (varobj_p, var->children, j), NULL, 0);
|
|
|
|
|
VEC_truncate (varobj_p, var->children, i);
|
2009-05-28 03:09:20 +02:00
|
|
|
|
}
|
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 20:51:26 +02:00
|
|
|
|
|
|
|
|
|
/* If there are fewer children than requested, note that the list of
|
|
|
|
|
children changed. */
|
|
|
|
|
if (to >= 0 && VEC_length (varobj_p, var->children) < to)
|
|
|
|
|
*cchanged = 1;
|
|
|
|
|
|
2009-05-28 03:09:20 +02:00
|
|
|
|
var->num_children = VEC_length (varobj_p, var->children);
|
|
|
|
|
|
|
|
|
|
do_cleanups (back_to);
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
#else
|
|
|
|
|
gdb_assert (0 && "should never be called if Python is not enabled");
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2007-04-14 11:51:30 +02:00
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
int
|
|
|
|
|
varobj_get_num_children (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
if (var->num_children == -1)
|
2009-05-28 03:09:20 +02:00
|
|
|
|
{
|
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 20:51:26 +02:00
|
|
|
|
if (var->pretty_printer)
|
|
|
|
|
{
|
|
|
|
|
int dummy;
|
|
|
|
|
|
|
|
|
|
/* If we have a dynamic varobj, don't report -1 children.
|
|
|
|
|
So, try to fetch some children first. */
|
2012-04-14 14:18:50 +02:00
|
|
|
|
update_dynamic_varobj_children (var, NULL, NULL, NULL, NULL, &dummy,
|
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 20:51:26 +02:00
|
|
|
|
0, 0, 0);
|
|
|
|
|
}
|
|
|
|
|
else
|
2009-05-28 03:09:20 +02:00
|
|
|
|
var->num_children = number_of_children (var);
|
|
|
|
|
}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
return var->num_children >= 0 ? var->num_children : 0;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Creates a list of the immediate children of a variable object;
|
2011-01-12 02:23:29 +01:00
|
|
|
|
the return code is the number of such children or -1 on error. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2008-01-30 08:17:31 +01:00
|
|
|
|
VEC (varobj_p)*
|
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 20:51:26 +02:00
|
|
|
|
varobj_list_children (struct varobj *var, int *from, int *to)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
char *name;
|
2009-05-28 03:09:20 +02:00
|
|
|
|
int i, children_changed;
|
|
|
|
|
|
|
|
|
|
var->children_requested = 1;
|
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
if (var->pretty_printer)
|
|
|
|
|
{
|
2009-05-28 03:09:20 +02:00
|
|
|
|
/* This, in theory, can result in the number of children changing without
|
|
|
|
|
frontend noticing. But well, calling -var-list-children on the same
|
|
|
|
|
varobj twice is not something a sane frontend would do. */
|
2012-04-14 14:18:50 +02:00
|
|
|
|
update_dynamic_varobj_children (var, NULL, NULL, NULL, NULL,
|
|
|
|
|
&children_changed, 0, 0, *to);
|
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 20:51:26 +02:00
|
|
|
|
restrict_range (var->children, from, to);
|
|
|
|
|
return var->children;
|
|
|
|
|
}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
if (var->num_children == -1)
|
|
|
|
|
var->num_children = number_of_children (var);
|
|
|
|
|
|
2007-01-04 22:55:04 +01:00
|
|
|
|
/* If that failed, give up. */
|
|
|
|
|
if (var->num_children == -1)
|
2008-01-30 08:17:31 +01:00
|
|
|
|
return var->children;
|
2007-01-04 22:55:04 +01:00
|
|
|
|
|
2007-01-04 20:16:52 +01:00
|
|
|
|
/* If we're called when the list of children is not yet initialized,
|
|
|
|
|
allocate enough elements in it. */
|
|
|
|
|
while (VEC_length (varobj_p, var->children) < var->num_children)
|
|
|
|
|
VEC_safe_push (varobj_p, var->children, NULL);
|
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
for (i = 0; i < var->num_children; i++)
|
|
|
|
|
{
|
2008-01-30 08:17:31 +01:00
|
|
|
|
varobj_p existing = VEC_index (varobj_p, var->children, i);
|
2007-01-04 20:16:52 +01:00
|
|
|
|
|
|
|
|
|
if (existing == NULL)
|
|
|
|
|
{
|
|
|
|
|
/* Either it's the first call to varobj_list_children for
|
|
|
|
|
this variable object, and the child was never created,
|
|
|
|
|
or it was explicitly deleted by the client. */
|
|
|
|
|
name = name_of_child (var, i);
|
|
|
|
|
existing = create_child (var, i, name);
|
|
|
|
|
VEC_replace (varobj_p, var->children, i, existing);
|
|
|
|
|
}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
restrict_range (var->children, from, to);
|
2008-01-30 08:17:31 +01:00
|
|
|
|
return var->children;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
2010-01-20 07:36:38 +01:00
|
|
|
|
#if HAVE_PYTHON
|
|
|
|
|
|
2009-05-28 03:09:20 +02:00
|
|
|
|
static struct varobj *
|
|
|
|
|
varobj_add_child (struct varobj *var, const char *name, struct value *value)
|
|
|
|
|
{
|
|
|
|
|
varobj_p v = create_child_with_value (var,
|
|
|
|
|
VEC_length (varobj_p, var->children),
|
|
|
|
|
name, value);
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2009-05-28 03:09:20 +02:00
|
|
|
|
VEC_safe_push (varobj_p, var->children, v);
|
|
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
|
2010-01-20 07:36:38 +01:00
|
|
|
|
#endif /* HAVE_PYTHON */
|
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
/* Obtain the type of an object Variable as a string similar to the one gdb
|
2011-01-12 02:23:29 +01:00
|
|
|
|
prints on the console. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
varobj_get_type (struct varobj *var)
|
|
|
|
|
{
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* For the "fake" variables, do not return a type. (It's type is
|
2007-02-13 09:15:49 +01:00
|
|
|
|
NULL, too.)
|
|
|
|
|
Do not return a type for invalid variables as well. */
|
|
|
|
|
if (CPLUS_FAKE_CHILD (var) || !var->root->is_valid)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
return NULL;
|
|
|
|
|
|
2009-06-30 11:24:47 +02:00
|
|
|
|
return type_to_string (var->type);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
2005-07-15 06:12:19 +02:00
|
|
|
|
/* Obtain the type of an object variable. */
|
|
|
|
|
|
|
|
|
|
struct type *
|
|
|
|
|
varobj_get_gdb_type (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
return var->type;
|
|
|
|
|
}
|
|
|
|
|
|
2012-01-12 23:51:10 +01:00
|
|
|
|
/* Is VAR a path expression parent, i.e., can it be used to construct
|
|
|
|
|
a valid path expression? */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
is_path_expr_parent (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
struct type *type;
|
|
|
|
|
|
|
|
|
|
/* "Fake" children are not path_expr parents. */
|
|
|
|
|
if (CPLUS_FAKE_CHILD (var))
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
type = get_value_type (var);
|
|
|
|
|
|
|
|
|
|
/* Anonymous unions and structs are also not path_expr parents. */
|
|
|
|
|
return !((TYPE_CODE (type) == TYPE_CODE_STRUCT
|
|
|
|
|
|| TYPE_CODE (type) == TYPE_CODE_UNION)
|
|
|
|
|
&& TYPE_NAME (type) == NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the path expression parent for VAR. */
|
|
|
|
|
|
|
|
|
|
static struct varobj *
|
|
|
|
|
get_path_expr_parent (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
struct varobj *parent = var;
|
|
|
|
|
|
|
|
|
|
while (!is_root_p (parent) && !is_path_expr_parent (parent))
|
|
|
|
|
parent = parent->parent;
|
|
|
|
|
|
|
|
|
|
return parent;
|
|
|
|
|
}
|
|
|
|
|
|
2007-08-31 20:52:05 +02:00
|
|
|
|
/* Return a pointer to the full rooted expression of varobj VAR.
|
|
|
|
|
If it has not been computed yet, compute it. */
|
|
|
|
|
char *
|
|
|
|
|
varobj_get_path_expr (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
if (var->path_expr != NULL)
|
|
|
|
|
return var->path_expr;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* For root varobjs, we initialize path_expr
|
|
|
|
|
when creating varobj, so here it should be
|
|
|
|
|
child varobj. */
|
|
|
|
|
gdb_assert (!is_root_p (var));
|
|
|
|
|
return (*var->root->lang->path_expr_of_child) (var);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
enum varobj_languages
|
|
|
|
|
varobj_get_language (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
return variable_language (var);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
varobj_get_attributes (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
int attributes = 0;
|
|
|
|
|
|
2007-11-20 20:54:39 +01:00
|
|
|
|
if (varobj_editable_p (var))
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* FIXME: define masks for attributes. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
attributes |= 0x00000001; /* Editable */
|
|
|
|
|
|
|
|
|
|
return attributes;
|
|
|
|
|
}
|
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
int
|
|
|
|
|
varobj_pretty_printed_p (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
return var->pretty_printer != NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2008-04-09 15:29:55 +02:00
|
|
|
|
char *
|
|
|
|
|
varobj_get_formatted_value (struct varobj *var,
|
|
|
|
|
enum varobj_display_formats format)
|
|
|
|
|
{
|
|
|
|
|
return my_value_of_variable (var, format);
|
|
|
|
|
}
|
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
char *
|
|
|
|
|
varobj_get_value (struct varobj *var)
|
|
|
|
|
{
|
2008-04-09 15:29:55 +02:00
|
|
|
|
return my_value_of_variable (var, var->format);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set the value of an object variable (if it is editable) to the
|
2011-01-12 02:23:29 +01:00
|
|
|
|
value of the given expression. */
|
|
|
|
|
/* Note: Invokes functions that can call error(). */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
varobj_set_value (struct varobj *var, char *expression)
|
|
|
|
|
{
|
2012-01-09 23:31:39 +01:00
|
|
|
|
struct value *val = NULL; /* Initialize to keep gcc happy. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
/* The argument "expression" contains the variable's new value.
|
2011-01-12 02:23:29 +01:00
|
|
|
|
We need to first construct a legal expression for this -- ugh! */
|
|
|
|
|
/* Does this cover all the bases? */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
struct expression *exp;
|
2012-01-09 23:31:39 +01:00
|
|
|
|
struct value *value = NULL; /* Initialize to keep gcc happy. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
int saved_input_radix = input_radix;
|
2007-11-20 20:54:39 +01:00
|
|
|
|
char *s = expression;
|
2012-01-09 21:27:49 +01:00
|
|
|
|
volatile struct gdb_exception except;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2007-11-20 20:54:39 +01:00
|
|
|
|
gdb_assert (varobj_editable_p (var));
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
input_radix = 10; /* ALWAYS reset to decimal temporarily. */
|
2012-06-27 20:08:41 +02:00
|
|
|
|
exp = parse_exp_1 (&s, 0, 0, 0);
|
2012-01-09 21:27:49 +01:00
|
|
|
|
TRY_CATCH (except, RETURN_MASK_ERROR)
|
|
|
|
|
{
|
|
|
|
|
value = evaluate_expression (exp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (except.reason < 0)
|
2007-11-20 20:54:39 +01:00
|
|
|
|
{
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* We cannot proceed without a valid expression. */
|
2007-11-20 20:54:39 +01:00
|
|
|
|
xfree (exp);
|
|
|
|
|
return 0;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
2007-11-20 20:54:39 +01:00
|
|
|
|
/* All types that are editable must also be changeable. */
|
|
|
|
|
gdb_assert (varobj_value_is_changeable_p (var));
|
|
|
|
|
|
|
|
|
|
/* The value of a changeable variable object must not be lazy. */
|
|
|
|
|
gdb_assert (!value_lazy (var->value));
|
|
|
|
|
|
|
|
|
|
/* Need to coerce the input. We want to check if the
|
|
|
|
|
value of the variable object will be different
|
|
|
|
|
after assignment, and the first thing value_assign
|
|
|
|
|
does is coerce the input.
|
|
|
|
|
For example, if we are assigning an array to a pointer variable we
|
2011-02-26 03:07:10 +01:00
|
|
|
|
should compare the pointer with the array's address, not with the
|
2007-11-20 20:54:39 +01:00
|
|
|
|
array's content. */
|
|
|
|
|
value = coerce_array (value);
|
|
|
|
|
|
2012-01-09 21:27:49 +01:00
|
|
|
|
/* The new value may be lazy. value_assign, or
|
|
|
|
|
rather value_contents, will take care of this. */
|
|
|
|
|
TRY_CATCH (except, RETURN_MASK_ERROR)
|
|
|
|
|
{
|
|
|
|
|
val = value_assign (var->value, value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (except.reason < 0)
|
2007-11-20 20:54:39 +01:00
|
|
|
|
return 0;
|
2012-01-09 21:27:49 +01:00
|
|
|
|
|
2007-11-20 20:54:39 +01:00
|
|
|
|
/* If the value has changed, record it, so that next -var-update can
|
|
|
|
|
report this change. If a variable had a value of '1', we've set it
|
|
|
|
|
to '333' and then set again to '1', when -var-update will report this
|
|
|
|
|
variable as changed -- because the first assignment has set the
|
|
|
|
|
'updated' flag. There's no need to optimize that, because return value
|
|
|
|
|
of -var-update should be considered an approximation. */
|
2011-01-12 02:23:29 +01:00
|
|
|
|
var->updated = install_new_value (var, val, 0 /* Compare values. */);
|
2007-11-20 20:54:39 +01:00
|
|
|
|
input_radix = saved_input_radix;
|
|
|
|
|
return 1;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
#if HAVE_PYTHON
|
|
|
|
|
|
|
|
|
|
/* A helper function to install a constructor function and visualizer
|
|
|
|
|
in a varobj. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
install_visualizer (struct varobj *var, PyObject *constructor,
|
|
|
|
|
PyObject *visualizer)
|
|
|
|
|
{
|
|
|
|
|
Py_XDECREF (var->constructor);
|
|
|
|
|
var->constructor = constructor;
|
|
|
|
|
|
|
|
|
|
Py_XDECREF (var->pretty_printer);
|
|
|
|
|
var->pretty_printer = visualizer;
|
|
|
|
|
|
|
|
|
|
Py_XDECREF (var->child_iter);
|
|
|
|
|
var->child_iter = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Install the default visualizer for VAR. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
install_default_visualizer (struct varobj *var)
|
|
|
|
|
{
|
2011-04-29 14:45:46 +02:00
|
|
|
|
/* Do not install a visualizer on a CPLUS_FAKE_CHILD. */
|
|
|
|
|
if (CPLUS_FAKE_CHILD (var))
|
|
|
|
|
return;
|
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
if (pretty_printing)
|
|
|
|
|
{
|
|
|
|
|
PyObject *pretty_printer = NULL;
|
|
|
|
|
|
|
|
|
|
if (var->value)
|
|
|
|
|
{
|
|
|
|
|
pretty_printer = gdbpy_get_varobj_pretty_printer (var->value);
|
|
|
|
|
if (! pretty_printer)
|
|
|
|
|
{
|
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
|
error (_("Cannot instantiate printer for default visualizer"));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pretty_printer == Py_None)
|
|
|
|
|
{
|
|
|
|
|
Py_DECREF (pretty_printer);
|
|
|
|
|
pretty_printer = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
install_visualizer (var, NULL, pretty_printer);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Instantiate and install a visualizer for VAR using CONSTRUCTOR to
|
|
|
|
|
make a new object. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
construct_visualizer (struct varobj *var, PyObject *constructor)
|
|
|
|
|
{
|
|
|
|
|
PyObject *pretty_printer;
|
|
|
|
|
|
2011-04-29 14:45:46 +02:00
|
|
|
|
/* Do not install a visualizer on a CPLUS_FAKE_CHILD. */
|
|
|
|
|
if (CPLUS_FAKE_CHILD (var))
|
|
|
|
|
return;
|
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
Py_INCREF (constructor);
|
|
|
|
|
if (constructor == Py_None)
|
|
|
|
|
pretty_printer = NULL;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
pretty_printer = instantiate_pretty_printer (constructor, var->value);
|
|
|
|
|
if (! pretty_printer)
|
|
|
|
|
{
|
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
|
Py_DECREF (constructor);
|
|
|
|
|
constructor = Py_None;
|
|
|
|
|
Py_INCREF (constructor);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pretty_printer == Py_None)
|
|
|
|
|
{
|
|
|
|
|
Py_DECREF (pretty_printer);
|
|
|
|
|
pretty_printer = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
install_visualizer (var, constructor, pretty_printer);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif /* HAVE_PYTHON */
|
|
|
|
|
|
|
|
|
|
/* A helper function for install_new_value. This creates and installs
|
|
|
|
|
a visualizer for VAR, if appropriate. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
install_new_value_visualizer (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
#if HAVE_PYTHON
|
|
|
|
|
/* If the constructor is None, then we want the raw value. If VAR
|
|
|
|
|
does not have a value, just skip this. */
|
|
|
|
|
if (var->constructor != Py_None && var->value)
|
|
|
|
|
{
|
|
|
|
|
struct cleanup *cleanup;
|
|
|
|
|
|
|
|
|
|
cleanup = varobj_ensure_python_env (var);
|
|
|
|
|
|
|
|
|
|
if (!var->constructor)
|
|
|
|
|
install_default_visualizer (var);
|
|
|
|
|
else
|
|
|
|
|
construct_visualizer (var, var->constructor);
|
|
|
|
|
|
|
|
|
|
do_cleanups (cleanup);
|
|
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
/* Do nothing. */
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
2012-04-14 14:18:50 +02:00
|
|
|
|
/* When using RTTI to determine variable type it may be changed in runtime when
|
|
|
|
|
the variable value is changed. This function checks whether type of varobj
|
|
|
|
|
VAR will change when a new value NEW_VALUE is assigned and if it is so
|
|
|
|
|
updates the type of VAR. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
update_type_if_necessary (struct varobj *var, struct value *new_value)
|
|
|
|
|
{
|
|
|
|
|
if (new_value)
|
|
|
|
|
{
|
|
|
|
|
struct value_print_options opts;
|
|
|
|
|
|
|
|
|
|
get_user_print_options (&opts);
|
|
|
|
|
if (opts.objectprint)
|
|
|
|
|
{
|
|
|
|
|
struct type *new_type;
|
|
|
|
|
char *curr_type_str, *new_type_str;
|
|
|
|
|
|
|
|
|
|
new_type = value_actual_type (new_value, 0, 0);
|
|
|
|
|
new_type_str = type_to_string (new_type);
|
|
|
|
|
curr_type_str = varobj_get_type (var);
|
|
|
|
|
if (strcmp (curr_type_str, new_type_str) != 0)
|
|
|
|
|
{
|
|
|
|
|
var->type = new_type;
|
|
|
|
|
|
|
|
|
|
/* This information may be not valid for a new type. */
|
|
|
|
|
varobj_delete (var, NULL, 1);
|
|
|
|
|
VEC_free (varobj_p, var->children);
|
|
|
|
|
var->num_children = -1;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-28 18:23:10 +01:00
|
|
|
|
/* Assign a new value to a variable object. If INITIAL is non-zero,
|
|
|
|
|
this is the first assignement after the variable object was just
|
|
|
|
|
created, or changed type. In that case, just assign the value
|
|
|
|
|
and return 0.
|
2011-01-12 02:23:29 +01:00
|
|
|
|
Otherwise, assign the new value, and return 1 if the value is
|
|
|
|
|
different from the current one, 0 otherwise. The comparison is
|
|
|
|
|
done on textual representation of value. Therefore, some types
|
|
|
|
|
need not be compared. E.g. for structures the reported value is
|
|
|
|
|
always "{...}", so no comparison is necessary here. If the old
|
|
|
|
|
value was NULL and new one is not, or vice versa, we always return 1.
|
2006-12-08 13:44:11 +01:00
|
|
|
|
|
|
|
|
|
The VALUE parameter should not be released -- the function will
|
|
|
|
|
take care of releasing it when needed. */
|
2006-11-28 18:23:10 +01:00
|
|
|
|
static int
|
|
|
|
|
install_new_value (struct varobj *var, struct value *value, int initial)
|
|
|
|
|
{
|
|
|
|
|
int changeable;
|
|
|
|
|
int need_to_fetch;
|
|
|
|
|
int changed = 0;
|
2007-04-14 11:51:30 +02:00
|
|
|
|
int intentionally_not_fetched = 0;
|
2007-09-27 20:04:12 +02:00
|
|
|
|
char *print_value = NULL;
|
2006-11-28 18:23:10 +01:00
|
|
|
|
|
|
|
|
|
/* We need to know the varobj's type to decide if the value should
|
2011-01-05 23:22:53 +01:00
|
|
|
|
be fetched or not. C++ fake children (public/protected/private)
|
2011-01-12 02:23:29 +01:00
|
|
|
|
don't have a type. */
|
2006-11-28 18:23:10 +01:00
|
|
|
|
gdb_assert (var->type || CPLUS_FAKE_CHILD (var));
|
2007-01-04 20:06:15 +01:00
|
|
|
|
changeable = varobj_value_is_changeable_p (var);
|
2009-05-28 03:09:20 +02:00
|
|
|
|
|
|
|
|
|
/* If the type has custom visualizer, we consider it to be always
|
2011-01-12 02:23:29 +01:00
|
|
|
|
changeable. FIXME: need to make sure this behaviour will not
|
2009-05-28 03:09:20 +02:00
|
|
|
|
mess up read-sensitive values. */
|
|
|
|
|
if (var->pretty_printer)
|
|
|
|
|
changeable = 1;
|
|
|
|
|
|
2006-11-28 18:23:10 +01:00
|
|
|
|
need_to_fetch = changeable;
|
|
|
|
|
|
2006-12-08 13:44:11 +01:00
|
|
|
|
/* We are not interested in the address of references, and given
|
|
|
|
|
that in C++ a reference is not rebindable, it cannot
|
|
|
|
|
meaningfully change. So, get hold of the real value. */
|
|
|
|
|
if (value)
|
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 20:51:26 +02:00
|
|
|
|
value = coerce_ref (value);
|
2006-12-08 13:44:11 +01:00
|
|
|
|
|
2006-11-28 18:23:10 +01:00
|
|
|
|
if (var->type && TYPE_CODE (var->type) == TYPE_CODE_UNION)
|
|
|
|
|
/* For unions, we need to fetch the value implicitly because
|
|
|
|
|
of implementation of union member fetch. When gdb
|
|
|
|
|
creates a value for a field and the value of the enclosing
|
|
|
|
|
structure is not lazy, it immediately copies the necessary
|
|
|
|
|
bytes from the enclosing values. If the enclosing value is
|
|
|
|
|
lazy, the call to value_fetch_lazy on the field will read
|
|
|
|
|
the data from memory. For unions, that means we'll read the
|
|
|
|
|
same memory more than once, which is not desirable. So
|
|
|
|
|
fetch now. */
|
|
|
|
|
need_to_fetch = 1;
|
|
|
|
|
|
|
|
|
|
/* The new value might be lazy. If the type is changeable,
|
|
|
|
|
that is we'll be comparing values of this type, fetch the
|
|
|
|
|
value now. Otherwise, on the next update the old value
|
|
|
|
|
will be lazy, which means we've lost that old value. */
|
|
|
|
|
if (need_to_fetch && value && value_lazy (value))
|
|
|
|
|
{
|
2007-04-14 11:51:30 +02:00
|
|
|
|
struct varobj *parent = var->parent;
|
|
|
|
|
int frozen = var->frozen;
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2007-04-14 11:51:30 +02:00
|
|
|
|
for (; !frozen && parent; parent = parent->parent)
|
|
|
|
|
frozen |= parent->frozen;
|
|
|
|
|
|
|
|
|
|
if (frozen && initial)
|
|
|
|
|
{
|
|
|
|
|
/* For variables that are frozen, or are children of frozen
|
|
|
|
|
variables, we don't do fetch on initial assignment.
|
|
|
|
|
For non-initial assignemnt we do the fetch, since it means we're
|
|
|
|
|
explicitly asked to compare the new value with the old one. */
|
|
|
|
|
intentionally_not_fetched = 1;
|
|
|
|
|
}
|
2012-01-09 21:27:49 +01:00
|
|
|
|
else
|
2006-11-28 18:23:10 +01:00
|
|
|
|
{
|
2012-01-09 21:27:49 +01:00
|
|
|
|
volatile struct gdb_exception except;
|
|
|
|
|
|
|
|
|
|
TRY_CATCH (except, RETURN_MASK_ERROR)
|
|
|
|
|
{
|
|
|
|
|
value_fetch_lazy (value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (except.reason < 0)
|
|
|
|
|
{
|
|
|
|
|
/* Set the value to NULL, so that for the next -var-update,
|
|
|
|
|
we don't try to compare the new value with this value,
|
|
|
|
|
that we couldn't even read. */
|
|
|
|
|
value = NULL;
|
|
|
|
|
}
|
2006-11-28 18:23:10 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-12-22 20:51:10 +01:00
|
|
|
|
/* Get a reference now, before possibly passing it to any Python
|
|
|
|
|
code that might release it. */
|
|
|
|
|
if (value != NULL)
|
|
|
|
|
value_incref (value);
|
2009-05-28 03:09:20 +02:00
|
|
|
|
|
2007-09-27 20:04:12 +02:00
|
|
|
|
/* Below, we'll be comparing string rendering of old and new
|
|
|
|
|
values. Don't get string rendering if the value is
|
|
|
|
|
lazy -- if it is, the code above has decided that the value
|
|
|
|
|
should not be fetched. */
|
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 20:51:26 +02:00
|
|
|
|
if (value && !value_lazy (value) && !var->pretty_printer)
|
* python/python-internal.h (struct language_defn): Declare.
(python_gdbarch, python_language): Likewise.
(ensure_python_env): Add prototype.
(make_cleanup_py_restore_gil): Remove prototype.
* python/python.c: Include "arch-utils.h", "value.h" and "language.h".
(python_gdbarch, python_language): New global variables.
(struct python_env): New data type.
(ensure_python_env, restore_python_env): New functions.
(eval_python_from_control_command): Call ensure_python_env to
install current architecture and language.
(python_command, gdbpy_new_objfile): Likewise.
* python/python-cmd.c: Include "arch-utils.h" and "language.h".
(cmdpy_destroyer, cmdpy_function, cmdpy_completer): Call
ensure_python_env.
* python/python-type.c (clean_up_objfile_types): Likewise.
* python/python-objfile.c: Include "language.h".
(clean_up_objfile): Call ensure_python_env.
* python/python-prettyprint.c (apply_val_pretty_printer): Likewise.
(apply_varobj_pretty_printer): Do not call PyGILState_Ensure.
* varobj.c (varobj_ensure_python_env): New helper function.
(varobj_get_display_hint, update_dynamic_varobj_children,
install_default_visualizer, varobj_set_visualizer, free_variable,
value_get_print_value): Call it.
(value_get_print_value): Add varobj argument instead of pretty
printer argument. Update all callers.
* python/python-utils.c (py_gil_restore, make_cleanup_py_restore_gil):
Remove.
* value.h (internal_function_fn): Add GDBARCH and LANGUAGE argument.
(call_internal_function): Likewise.
* value.c (call_internal_function): Likewise. Pass to handler.
* eval.c (evaluate_subexp_standard): Update call.
* python/python-function.c: Include "language.h".
(fnpy_call): Add GDBARCH and LANGAUAGE arguments and call
make_cleanup_python_env.
* python/python-value.c (builtin_type_pyint, builtin_type_pyfloat,
builtin_type_pylong, builtin_type_pybool, builtin_type_pychar,
valpy_str): Use python_gdbarch and python_language instead of
current_gdbarch and current_language.
* python/python-type.c (typy_lookup_typename): Likewise.
2009-07-02 19:04:23 +02:00
|
|
|
|
print_value = value_get_print_value (value, var->format, var);
|
2007-09-27 20:04:12 +02:00
|
|
|
|
|
2006-11-28 18:23:10 +01:00
|
|
|
|
/* If the type is changeable, compare the old and the new values.
|
|
|
|
|
If this is the initial assignment, we don't have any old value
|
|
|
|
|
to compare with. */
|
2007-09-27 20:04:12 +02:00
|
|
|
|
if (!initial && changeable)
|
2006-11-28 18:23:10 +01:00
|
|
|
|
{
|
2011-01-05 23:22:53 +01:00
|
|
|
|
/* If the value of the varobj was changed by -var-set-value,
|
|
|
|
|
then the value in the varobj and in the target is the same.
|
|
|
|
|
However, that value is different from the value that the
|
2011-01-12 02:23:29 +01:00
|
|
|
|
varobj had after the previous -var-update. So need to the
|
2011-01-05 23:22:53 +01:00
|
|
|
|
varobj as changed. */
|
2006-11-28 18:23:10 +01:00
|
|
|
|
if (var->updated)
|
2007-01-09 00:11:47 +01:00
|
|
|
|
{
|
|
|
|
|
changed = 1;
|
|
|
|
|
}
|
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 20:51:26 +02:00
|
|
|
|
else if (! var->pretty_printer)
|
2006-11-28 18:23:10 +01:00
|
|
|
|
{
|
|
|
|
|
/* Try to compare the values. That requires that both
|
|
|
|
|
values are non-lazy. */
|
2007-04-14 11:51:30 +02:00
|
|
|
|
if (var->not_fetched && value_lazy (var->value))
|
|
|
|
|
{
|
|
|
|
|
/* This is a frozen varobj and the value was never read.
|
|
|
|
|
Presumably, UI shows some "never read" indicator.
|
|
|
|
|
Now that we've fetched the real value, we need to report
|
|
|
|
|
this varobj as changed so that UI can show the real
|
|
|
|
|
value. */
|
|
|
|
|
changed = 1;
|
|
|
|
|
}
|
|
|
|
|
else if (var->value == NULL && value == NULL)
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Equal. */
|
2006-11-28 18:23:10 +01:00
|
|
|
|
;
|
|
|
|
|
else if (var->value == NULL || value == NULL)
|
2007-01-09 00:11:47 +01:00
|
|
|
|
{
|
|
|
|
|
changed = 1;
|
|
|
|
|
}
|
2006-11-28 18:23:10 +01:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
gdb_assert (!value_lazy (var->value));
|
|
|
|
|
gdb_assert (!value_lazy (value));
|
2007-01-05 22:52:33 +01:00
|
|
|
|
|
2007-01-09 00:11:47 +01:00
|
|
|
|
gdb_assert (var->print_value != NULL && print_value != NULL);
|
2007-01-05 22:52:33 +01:00
|
|
|
|
if (strcmp (var->print_value, print_value) != 0)
|
2007-09-27 20:04:12 +02:00
|
|
|
|
changed = 1;
|
2006-11-28 18:23:10 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2007-01-05 22:52:33 +01:00
|
|
|
|
|
2009-05-17 09:13:19 +02:00
|
|
|
|
if (!initial && !changeable)
|
|
|
|
|
{
|
|
|
|
|
/* For values that are not changeable, we don't compare the values.
|
|
|
|
|
However, we want to notice if a value was not NULL and now is NULL,
|
|
|
|
|
or vise versa, so that we report when top-level varobjs come in scope
|
|
|
|
|
and leave the scope. */
|
|
|
|
|
changed = (var->value != NULL) != (value != NULL);
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-28 18:23:10 +01:00
|
|
|
|
/* We must always keep the new value, since children depend on it. */
|
2007-04-14 11:51:30 +02:00
|
|
|
|
if (var->value != NULL && var->value != value)
|
2006-11-28 18:23:10 +01:00
|
|
|
|
value_free (var->value);
|
|
|
|
|
var->value = value;
|
2007-04-14 11:51:30 +02:00
|
|
|
|
if (value && value_lazy (value) && intentionally_not_fetched)
|
|
|
|
|
var->not_fetched = 1;
|
|
|
|
|
else
|
|
|
|
|
var->not_fetched = 0;
|
2006-11-28 18:23:10 +01:00
|
|
|
|
var->updated = 0;
|
2007-01-05 22:52:33 +01:00
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
install_new_value_visualizer (var);
|
|
|
|
|
|
|
|
|
|
/* If we installed a pretty-printer, re-compare the printed version
|
|
|
|
|
to see if the variable changed. */
|
|
|
|
|
if (var->pretty_printer)
|
|
|
|
|
{
|
|
|
|
|
xfree (print_value);
|
|
|
|
|
print_value = value_get_print_value (var->value, var->format, var);
|
2010-03-03 19:32:44 +01:00
|
|
|
|
if ((var->print_value == NULL && print_value != NULL)
|
|
|
|
|
|| (var->print_value != NULL && print_value == NULL)
|
|
|
|
|
|| (var->print_value != NULL && print_value != NULL
|
|
|
|
|
&& strcmp (var->print_value, print_value) != 0))
|
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 20:51:26 +02:00
|
|
|
|
changed = 1;
|
|
|
|
|
}
|
|
|
|
|
if (var->print_value)
|
|
|
|
|
xfree (var->print_value);
|
|
|
|
|
var->print_value = print_value;
|
|
|
|
|
|
2006-12-08 13:44:11 +01:00
|
|
|
|
gdb_assert (!var->value || value_type (var->value));
|
2006-11-28 18:23:10 +01:00
|
|
|
|
|
|
|
|
|
return changed;
|
|
|
|
|
}
|
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
/* Return the requested range for a varobj. VAR is the varobj. FROM
|
|
|
|
|
and TO are out parameters; *FROM and *TO will be set to the
|
|
|
|
|
selected sub-range of VAR. If no range was selected using
|
|
|
|
|
-var-set-update-range, then both will be -1. */
|
|
|
|
|
void
|
|
|
|
|
varobj_get_child_range (struct varobj *var, int *from, int *to)
|
2009-05-28 03:09:20 +02:00
|
|
|
|
{
|
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 20:51:26 +02:00
|
|
|
|
*from = var->from;
|
|
|
|
|
*to = var->to;
|
2009-05-28 03:09:20 +02:00
|
|
|
|
}
|
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
/* Set the selected sub-range of children of VAR to start at index
|
|
|
|
|
FROM and end at index TO. If either FROM or TO is less than zero,
|
|
|
|
|
this is interpreted as a request for all children. */
|
|
|
|
|
void
|
|
|
|
|
varobj_set_child_range (struct varobj *var, int from, int to)
|
2009-05-28 03:09:20 +02:00
|
|
|
|
{
|
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 20:51:26 +02:00
|
|
|
|
var->from = from;
|
|
|
|
|
var->to = to;
|
2009-05-28 03:09:20 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
varobj_set_visualizer (struct varobj *var, const char *visualizer)
|
|
|
|
|
{
|
|
|
|
|
#if HAVE_PYTHON
|
2010-05-07 02:01:31 +02:00
|
|
|
|
PyObject *mainmod, *globals, *constructor;
|
|
|
|
|
struct cleanup *back_to;
|
2009-05-28 03:09:20 +02:00
|
|
|
|
|
* python/python-internal.h (struct language_defn): Declare.
(python_gdbarch, python_language): Likewise.
(ensure_python_env): Add prototype.
(make_cleanup_py_restore_gil): Remove prototype.
* python/python.c: Include "arch-utils.h", "value.h" and "language.h".
(python_gdbarch, python_language): New global variables.
(struct python_env): New data type.
(ensure_python_env, restore_python_env): New functions.
(eval_python_from_control_command): Call ensure_python_env to
install current architecture and language.
(python_command, gdbpy_new_objfile): Likewise.
* python/python-cmd.c: Include "arch-utils.h" and "language.h".
(cmdpy_destroyer, cmdpy_function, cmdpy_completer): Call
ensure_python_env.
* python/python-type.c (clean_up_objfile_types): Likewise.
* python/python-objfile.c: Include "language.h".
(clean_up_objfile): Call ensure_python_env.
* python/python-prettyprint.c (apply_val_pretty_printer): Likewise.
(apply_varobj_pretty_printer): Do not call PyGILState_Ensure.
* varobj.c (varobj_ensure_python_env): New helper function.
(varobj_get_display_hint, update_dynamic_varobj_children,
install_default_visualizer, varobj_set_visualizer, free_variable,
value_get_print_value): Call it.
(value_get_print_value): Add varobj argument instead of pretty
printer argument. Update all callers.
* python/python-utils.c (py_gil_restore, make_cleanup_py_restore_gil):
Remove.
* value.h (internal_function_fn): Add GDBARCH and LANGUAGE argument.
(call_internal_function): Likewise.
* value.c (call_internal_function): Likewise. Pass to handler.
* eval.c (evaluate_subexp_standard): Update call.
* python/python-function.c: Include "language.h".
(fnpy_call): Add GDBARCH and LANGAUAGE arguments and call
make_cleanup_python_env.
* python/python-value.c (builtin_type_pyint, builtin_type_pyfloat,
builtin_type_pylong, builtin_type_pybool, builtin_type_pychar,
valpy_str): Use python_gdbarch and python_language instead of
current_gdbarch and current_language.
* python/python-type.c (typy_lookup_typename): Likewise.
2009-07-02 19:04:23 +02:00
|
|
|
|
back_to = varobj_ensure_python_env (var);
|
2009-05-28 03:09:20 +02:00
|
|
|
|
|
|
|
|
|
mainmod = PyImport_AddModule ("__main__");
|
|
|
|
|
globals = PyModule_GetDict (mainmod);
|
|
|
|
|
Py_INCREF (globals);
|
|
|
|
|
make_cleanup_py_decref (globals);
|
|
|
|
|
|
|
|
|
|
constructor = PyRun_String (visualizer, Py_eval_input, globals, globals);
|
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
if (! constructor)
|
2009-05-28 03:09:20 +02:00
|
|
|
|
{
|
|
|
|
|
gdbpy_print_stack ();
|
2009-06-05 21:43:01 +02:00
|
|
|
|
error (_("Could not evaluate visualizer expression: %s"), visualizer);
|
2009-05-28 03:09:20 +02:00
|
|
|
|
}
|
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
construct_visualizer (var, constructor);
|
|
|
|
|
Py_XDECREF (constructor);
|
2009-05-28 03:09:20 +02:00
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
/* If there are any children now, wipe them. */
|
|
|
|
|
varobj_delete (var, NULL, 1 /* children only */);
|
|
|
|
|
var->num_children = -1;
|
2009-05-28 03:09:20 +02:00
|
|
|
|
|
|
|
|
|
do_cleanups (back_to);
|
|
|
|
|
#else
|
2009-06-05 21:43:01 +02:00
|
|
|
|
error (_("Python support required"));
|
2009-05-28 03:09:20 +02:00
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
2012-03-28 23:31:05 +02:00
|
|
|
|
/* If NEW_VALUE is the new value of the given varobj (var), return
|
|
|
|
|
non-zero if var has mutated. In other words, if the type of
|
|
|
|
|
the new value is different from the type of the varobj's old
|
|
|
|
|
value.
|
|
|
|
|
|
|
|
|
|
NEW_VALUE may be NULL, if the varobj is now out of scope. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
varobj_value_has_mutated (struct varobj *var, struct value *new_value,
|
|
|
|
|
struct type *new_type)
|
|
|
|
|
{
|
|
|
|
|
/* If we haven't previously computed the number of children in var,
|
|
|
|
|
it does not matter from the front-end's perspective whether
|
|
|
|
|
the type has mutated or not. For all intents and purposes,
|
|
|
|
|
it has not mutated. */
|
|
|
|
|
if (var->num_children < 0)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
if (var->root->lang->value_has_mutated)
|
|
|
|
|
return var->root->lang->value_has_mutated (var, new_value, new_type);
|
|
|
|
|
else
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
/* Update the values for a variable and its children. This is a
|
|
|
|
|
two-pronged attack. First, re-parse the value for the root's
|
|
|
|
|
expression to see if it's changed. Then go all the way
|
|
|
|
|
through its children, reconstructing them and noting if they've
|
|
|
|
|
changed.
|
|
|
|
|
|
2007-04-14 11:51:30 +02:00
|
|
|
|
The EXPLICIT parameter specifies if this call is result
|
|
|
|
|
of MI request to update this specific variable, or
|
2011-01-12 02:23:29 +01:00
|
|
|
|
result of implicit -var-update *. For implicit request, we don't
|
2007-04-14 11:51:30 +02:00
|
|
|
|
update frozen variables.
|
2001-08-17 20:56:49 +02:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
NOTE: This function may delete the caller's varobj. If it
|
2007-02-13 09:15:49 +01:00
|
|
|
|
returns TYPE_CHANGED, then it has done this and VARP will be modified
|
|
|
|
|
to point to the new varobj. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-12-28 08:05:20 +01:00
|
|
|
|
VEC(varobj_update_result) *
|
|
|
|
|
varobj_update (struct varobj **varp, int explicit)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
int changed = 0;
|
2007-04-14 11:51:30 +02:00
|
|
|
|
int type_changed = 0;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
int i;
|
2001-11-01 03:37:56 +01:00
|
|
|
|
struct value *new;
|
2009-05-28 03:09:20 +02:00
|
|
|
|
VEC (varobj_update_result) *stack = NULL;
|
2008-05-28 14:06:36 +02:00
|
|
|
|
VEC (varobj_update_result) *result = NULL;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2007-04-14 11:51:30 +02:00
|
|
|
|
/* Frozen means frozen -- we don't check for any change in
|
|
|
|
|
this varobj, including its going out of scope, or
|
|
|
|
|
changing type. One use case for frozen varobjs is
|
|
|
|
|
retaining previously evaluated expressions, and we don't
|
|
|
|
|
want them to be reevaluated at all. */
|
|
|
|
|
if (!explicit && (*varp)->frozen)
|
2008-05-28 14:06:36 +02:00
|
|
|
|
return result;
|
2007-02-13 09:15:49 +01:00
|
|
|
|
|
|
|
|
|
if (!(*varp)->root->is_valid)
|
2008-05-28 14:06:36 +02:00
|
|
|
|
{
|
2010-02-23 18:01:54 +01:00
|
|
|
|
varobj_update_result r = {0};
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2010-02-23 18:01:54 +01:00
|
|
|
|
r.varobj = *varp;
|
2008-05-28 14:06:36 +02:00
|
|
|
|
r.status = VAROBJ_INVALID;
|
|
|
|
|
VEC_safe_push (varobj_update_result, result, &r);
|
|
|
|
|
return result;
|
|
|
|
|
}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2007-04-14 11:51:30 +02:00
|
|
|
|
if ((*varp)->root->rootvar == *varp)
|
2000-10-13 22:31:38 +02:00
|
|
|
|
{
|
2010-02-23 18:01:54 +01:00
|
|
|
|
varobj_update_result r = {0};
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2010-02-23 18:01:54 +01:00
|
|
|
|
r.varobj = *varp;
|
2008-05-28 14:06:36 +02:00
|
|
|
|
r.status = VAROBJ_IN_SCOPE;
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Update the root variable. value_of_root can return NULL
|
2007-04-14 11:51:30 +02:00
|
|
|
|
if the variable is no longer around, i.e. we stepped out of
|
2011-01-12 02:23:29 +01:00
|
|
|
|
the frame in which a local existed. We are letting the
|
2007-04-14 11:51:30 +02:00
|
|
|
|
value_of_root variable dispose of the varobj if the type
|
|
|
|
|
has changed. */
|
|
|
|
|
new = value_of_root (varp, &type_changed);
|
2012-04-14 14:18:50 +02:00
|
|
|
|
if (update_type_if_necessary(*varp, new))
|
|
|
|
|
type_changed = 1;
|
2008-05-28 14:06:36 +02:00
|
|
|
|
r.varobj = *varp;
|
|
|
|
|
r.type_changed = type_changed;
|
2008-05-28 08:49:56 +02:00
|
|
|
|
if (install_new_value ((*varp), new, type_changed))
|
2008-05-28 14:06:36 +02:00
|
|
|
|
r.changed = 1;
|
2008-05-28 08:49:56 +02:00
|
|
|
|
|
2007-04-14 11:51:30 +02:00
|
|
|
|
if (new == NULL)
|
2008-05-28 14:06:36 +02:00
|
|
|
|
r.status = VAROBJ_NOT_IN_SCOPE;
|
2009-05-28 03:09:20 +02:00
|
|
|
|
r.value_installed = 1;
|
2008-05-28 14:06:36 +02:00
|
|
|
|
|
|
|
|
|
if (r.status == VAROBJ_NOT_IN_SCOPE)
|
2009-05-28 03:09:20 +02:00
|
|
|
|
{
|
2009-06-04 23:56:22 +02:00
|
|
|
|
if (r.type_changed || r.changed)
|
|
|
|
|
VEC_safe_push (varobj_update_result, result, &r);
|
2009-05-28 03:09:20 +02:00
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
VEC_safe_push (varobj_update_result, stack, &r);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2010-02-23 18:01:54 +01:00
|
|
|
|
varobj_update_result r = {0};
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2010-02-23 18:01:54 +01:00
|
|
|
|
r.varobj = *varp;
|
2009-05-28 03:09:20 +02:00
|
|
|
|
VEC_safe_push (varobj_update_result, stack, &r);
|
2007-01-16 03:12:49 +01:00
|
|
|
|
}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2007-02-13 09:15:49 +01:00
|
|
|
|
/* Walk through the children, reconstructing them all. */
|
2009-05-28 03:09:20 +02:00
|
|
|
|
while (!VEC_empty (varobj_update_result, stack))
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2009-05-28 03:09:20 +02:00
|
|
|
|
varobj_update_result r = *(VEC_last (varobj_update_result, stack));
|
|
|
|
|
struct varobj *v = r.varobj;
|
|
|
|
|
|
|
|
|
|
VEC_pop (varobj_update_result, stack);
|
|
|
|
|
|
|
|
|
|
/* Update this variable, unless it's a root, which is already
|
|
|
|
|
updated. */
|
|
|
|
|
if (!r.value_installed)
|
2012-03-28 23:31:05 +02:00
|
|
|
|
{
|
|
|
|
|
struct type *new_type;
|
|
|
|
|
|
2009-05-28 03:09:20 +02:00
|
|
|
|
new = value_of_child (v->parent, v->index);
|
2012-04-14 14:18:50 +02:00
|
|
|
|
if (update_type_if_necessary(v, new))
|
|
|
|
|
r.type_changed = 1;
|
2012-03-28 23:31:05 +02:00
|
|
|
|
if (new)
|
|
|
|
|
new_type = value_type (new);
|
|
|
|
|
else
|
|
|
|
|
new_type = v->root->lang->type_of_child (v->parent, v->index);
|
|
|
|
|
|
|
|
|
|
if (varobj_value_has_mutated (v, new, new_type))
|
|
|
|
|
{
|
|
|
|
|
/* The children are no longer valid; delete them now.
|
|
|
|
|
Report the fact that its type changed as well. */
|
|
|
|
|
varobj_delete (v, NULL, 1 /* only_children */);
|
|
|
|
|
v->num_children = -1;
|
|
|
|
|
v->to = -1;
|
|
|
|
|
v->from = -1;
|
|
|
|
|
v->type = new_type;
|
|
|
|
|
r.type_changed = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (install_new_value (v, new, r.type_changed))
|
2009-05-28 03:09:20 +02:00
|
|
|
|
{
|
|
|
|
|
r.changed = 1;
|
|
|
|
|
v->updated = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We probably should not get children of a varobj that has a
|
|
|
|
|
pretty-printer, but for which -var-list-children was never
|
2011-01-12 02:23:29 +01:00
|
|
|
|
invoked. */
|
2009-05-28 03:09:20 +02:00
|
|
|
|
if (v->pretty_printer)
|
|
|
|
|
{
|
2012-04-14 14:18:50 +02:00
|
|
|
|
VEC (varobj_p) *changed = 0, *type_changed = 0, *unchanged = 0;
|
|
|
|
|
VEC (varobj_p) *new = 0;
|
2009-09-19 18:02:36 +02:00
|
|
|
|
int i, children_changed = 0;
|
2009-05-28 03:09:20 +02:00
|
|
|
|
|
|
|
|
|
if (v->frozen)
|
|
|
|
|
continue;
|
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
if (!v->children_requested)
|
|
|
|
|
{
|
|
|
|
|
int dummy;
|
|
|
|
|
|
|
|
|
|
/* If we initially did not have potential children, but
|
|
|
|
|
now we do, consider the varobj as changed.
|
|
|
|
|
Otherwise, if children were never requested, consider
|
|
|
|
|
it as unchanged -- presumably, such varobj is not yet
|
|
|
|
|
expanded in the UI, so we need not bother getting
|
|
|
|
|
it. */
|
|
|
|
|
if (!varobj_has_more (v, 0))
|
|
|
|
|
{
|
2012-04-14 14:18:50 +02:00
|
|
|
|
update_dynamic_varobj_children (v, NULL, NULL, NULL, NULL,
|
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 20:51:26 +02:00
|
|
|
|
&dummy, 0, 0, 0);
|
|
|
|
|
if (varobj_has_more (v, 0))
|
|
|
|
|
r.changed = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (r.changed)
|
|
|
|
|
VEC_safe_push (varobj_update_result, result, &r);
|
|
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2009-05-28 03:09:20 +02:00
|
|
|
|
/* If update_dynamic_varobj_children returns 0, then we have
|
|
|
|
|
a non-conforming pretty-printer, so we skip it. */
|
2012-04-14 14:18:50 +02:00
|
|
|
|
if (update_dynamic_varobj_children (v, &changed, &type_changed, &new,
|
|
|
|
|
&unchanged, &children_changed, 1,
|
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 20:51:26 +02:00
|
|
|
|
v->from, v->to))
|
2009-05-28 03:09:20 +02:00
|
|
|
|
{
|
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 20:51:26 +02:00
|
|
|
|
if (children_changed || new)
|
2009-05-28 03:09:20 +02:00
|
|
|
|
{
|
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 20:51:26 +02:00
|
|
|
|
r.children_changed = 1;
|
|
|
|
|
r.new = new;
|
2009-05-28 03:09:20 +02:00
|
|
|
|
}
|
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 20:51:26 +02:00
|
|
|
|
/* Push in reverse order so that the first child is
|
|
|
|
|
popped from the work stack first, and so will be
|
|
|
|
|
added to result first. This does not affect
|
|
|
|
|
correctness, just "nicer". */
|
2012-04-14 14:18:50 +02:00
|
|
|
|
for (i = VEC_length (varobj_p, type_changed) - 1; i >= 0; --i)
|
|
|
|
|
{
|
|
|
|
|
varobj_p tmp = VEC_index (varobj_p, type_changed, i);
|
|
|
|
|
varobj_update_result r = {0};
|
|
|
|
|
|
|
|
|
|
/* Type may change only if value was changed. */
|
|
|
|
|
r.varobj = tmp;
|
|
|
|
|
r.changed = 1;
|
|
|
|
|
r.type_changed = 1;
|
|
|
|
|
r.value_installed = 1;
|
|
|
|
|
VEC_safe_push (varobj_update_result, stack, &r);
|
|
|
|
|
}
|
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 20:51:26 +02:00
|
|
|
|
for (i = VEC_length (varobj_p, changed) - 1; i >= 0; --i)
|
2009-05-28 03:09:20 +02:00
|
|
|
|
{
|
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 20:51:26 +02:00
|
|
|
|
varobj_p tmp = VEC_index (varobj_p, changed, i);
|
2010-02-23 18:01:54 +01:00
|
|
|
|
varobj_update_result r = {0};
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2010-02-23 18:01:54 +01:00
|
|
|
|
r.varobj = tmp;
|
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 20:51:26 +02:00
|
|
|
|
r.changed = 1;
|
2009-05-28 03:09:20 +02:00
|
|
|
|
r.value_installed = 1;
|
|
|
|
|
VEC_safe_push (varobj_update_result, stack, &r);
|
|
|
|
|
}
|
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 20:51:26 +02:00
|
|
|
|
for (i = VEC_length (varobj_p, unchanged) - 1; i >= 0; --i)
|
|
|
|
|
{
|
|
|
|
|
varobj_p tmp = VEC_index (varobj_p, unchanged, i);
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
if (!tmp->frozen)
|
|
|
|
|
{
|
2010-02-23 18:01:54 +01:00
|
|
|
|
varobj_update_result r = {0};
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2010-02-23 18:01:54 +01:00
|
|
|
|
r.varobj = tmp;
|
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 20:51:26 +02:00
|
|
|
|
r.value_installed = 1;
|
|
|
|
|
VEC_safe_push (varobj_update_result, stack, &r);
|
|
|
|
|
}
|
|
|
|
|
}
|
2009-05-28 03:09:20 +02:00
|
|
|
|
if (r.changed || r.children_changed)
|
|
|
|
|
VEC_safe_push (varobj_update_result, result, &r);
|
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 20:51:26 +02:00
|
|
|
|
|
2012-04-14 14:18:50 +02:00
|
|
|
|
/* Free CHANGED, TYPE_CHANGED and UNCHANGED, but not NEW,
|
|
|
|
|
because NEW has been put into the result vector. */
|
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 20:51:26 +02:00
|
|
|
|
VEC_free (varobj_p, changed);
|
2012-04-14 14:18:50 +02:00
|
|
|
|
VEC_free (varobj_p, type_changed);
|
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 20:51:26 +02:00
|
|
|
|
VEC_free (varobj_p, unchanged);
|
|
|
|
|
|
2009-05-28 03:09:20 +02:00
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
2007-01-04 20:16:52 +01:00
|
|
|
|
|
|
|
|
|
/* Push any children. Use reverse order so that the first
|
|
|
|
|
child is popped from the work stack first, and so
|
|
|
|
|
will be added to result first. This does not
|
|
|
|
|
affect correctness, just "nicer". */
|
|
|
|
|
for (i = VEC_length (varobj_p, v->children)-1; i >= 0; --i)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2007-01-04 20:16:52 +01:00
|
|
|
|
varobj_p c = VEC_index (varobj_p, v->children, i);
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2007-01-04 20:16:52 +01:00
|
|
|
|
/* Child may be NULL if explicitly deleted by -var-delete. */
|
2007-04-14 11:51:30 +02:00
|
|
|
|
if (c != NULL && !c->frozen)
|
2007-01-04 20:16:52 +01:00
|
|
|
|
{
|
2010-02-23 18:01:54 +01:00
|
|
|
|
varobj_update_result r = {0};
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2010-02-23 18:01:54 +01:00
|
|
|
|
r.varobj = c;
|
2009-05-28 03:09:20 +02:00
|
|
|
|
VEC_safe_push (varobj_update_result, stack, &r);
|
2007-01-04 20:16:52 +01:00
|
|
|
|
}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
2009-05-28 03:09:20 +02:00
|
|
|
|
|
|
|
|
|
if (r.changed || r.type_changed)
|
|
|
|
|
VEC_safe_push (varobj_update_result, result, &r);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
2009-05-28 03:09:20 +02:00
|
|
|
|
VEC_free (varobj_update_result, stack);
|
|
|
|
|
|
2008-05-28 14:06:36 +02:00
|
|
|
|
return result;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Helper functions */
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Variable object construction/destruction
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
static int
|
2000-07-30 03:48:28 +02:00
|
|
|
|
delete_variable (struct cpstack **resultp, struct varobj *var,
|
|
|
|
|
int only_children_p)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
int delcount = 0;
|
|
|
|
|
|
|
|
|
|
delete_variable_1 (resultp, &delcount, var,
|
|
|
|
|
only_children_p, 1 /* remove_from_parent_p */ );
|
|
|
|
|
|
|
|
|
|
return delcount;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Delete the variable object VAR and its children. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
/* IMPORTANT NOTE: If we delete a variable which is a child
|
|
|
|
|
and the parent is not removed we dump core. It must be always
|
2011-01-12 02:23:29 +01:00
|
|
|
|
initially called with remove_from_parent_p set. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
static void
|
2001-11-01 03:22:21 +01:00
|
|
|
|
delete_variable_1 (struct cpstack **resultp, int *delcountp,
|
|
|
|
|
struct varobj *var, int only_children_p,
|
|
|
|
|
int remove_from_parent_p)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2007-01-04 20:16:52 +01:00
|
|
|
|
int i;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Delete any children of this variable, too. */
|
2007-01-04 20:16:52 +01:00
|
|
|
|
for (i = 0; i < VEC_length (varobj_p, var->children); ++i)
|
|
|
|
|
{
|
|
|
|
|
varobj_p child = VEC_index (varobj_p, var->children, i);
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2007-11-07 21:06:29 +01:00
|
|
|
|
if (!child)
|
|
|
|
|
continue;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
if (!remove_from_parent_p)
|
2007-01-04 20:16:52 +01:00
|
|
|
|
child->parent = NULL;
|
|
|
|
|
delete_variable_1 (resultp, delcountp, child, 0, only_children_p);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
2007-01-04 20:16:52 +01:00
|
|
|
|
VEC_free (varobj_p, var->children);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* if we were called to delete only the children we are done here. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
if (only_children_p)
|
|
|
|
|
return;
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Otherwise, add it to the list of deleted ones and proceed to do so. */
|
2000-03-13 22:51:46 +01:00
|
|
|
|
/* If the name is null, this is a temporary variable, that has not
|
2011-01-12 02:23:29 +01:00
|
|
|
|
yet been installed, don't report it, it belongs to the caller... */
|
2000-03-13 22:51:46 +01:00
|
|
|
|
if (var->obj_name != NULL)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2001-01-26 20:47:23 +01:00
|
|
|
|
cppush (resultp, xstrdup (var->obj_name));
|
2000-02-03 05:14:45 +01:00
|
|
|
|
*delcountp = *delcountp + 1;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* If this variable has a parent, remove it from its parent's list. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
/* OPTIMIZATION: if the parent of this variable is also being deleted,
|
|
|
|
|
(as indicated by remove_from_parent_p) we don't bother doing an
|
|
|
|
|
expensive list search to find the element to remove when we are
|
2011-01-12 02:23:29 +01:00
|
|
|
|
discarding the list afterwards. */
|
2001-11-01 03:22:21 +01:00
|
|
|
|
if ((remove_from_parent_p) && (var->parent != NULL))
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2007-01-04 20:16:52 +01:00
|
|
|
|
VEC_replace (varobj_p, var->parent->children, var->index, NULL);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
2001-11-01 03:22:21 +01:00
|
|
|
|
|
2000-03-13 22:51:46 +01:00
|
|
|
|
if (var->obj_name != NULL)
|
|
|
|
|
uninstall_variable (var);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Free memory associated with this variable. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
free_variable (var);
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Install the given variable VAR with the object name VAR->OBJ_NAME. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
static int
|
2000-07-30 03:48:28 +02:00
|
|
|
|
install_variable (struct varobj *var)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
struct vlist *cv;
|
|
|
|
|
struct vlist *newvl;
|
|
|
|
|
const char *chp;
|
|
|
|
|
unsigned int index = 0;
|
|
|
|
|
unsigned int i = 1;
|
|
|
|
|
|
|
|
|
|
for (chp = var->obj_name; *chp; chp++)
|
|
|
|
|
{
|
|
|
|
|
index = (index + (i++ * (unsigned int) *chp)) % VAROBJ_TABLE_SIZE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
cv = *(varobj_table + index);
|
|
|
|
|
while ((cv != NULL) && (strcmp (cv->var->obj_name, var->obj_name) != 0))
|
|
|
|
|
cv = cv->next;
|
|
|
|
|
|
|
|
|
|
if (cv != NULL)
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 05:06:14 +01:00
|
|
|
|
error (_("Duplicate variable object name"));
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Add varobj to hash table. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
newvl = xmalloc (sizeof (struct vlist));
|
|
|
|
|
newvl->next = *(varobj_table + index);
|
|
|
|
|
newvl->var = var;
|
|
|
|
|
*(varobj_table + index) = newvl;
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* If root, add varobj to root list. */
|
2007-01-04 20:06:15 +01:00
|
|
|
|
if (is_root_p (var))
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Add to list of root variables. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
if (rootlist == NULL)
|
|
|
|
|
var->root->next = NULL;
|
|
|
|
|
else
|
|
|
|
|
var->root->next = rootlist;
|
|
|
|
|
rootlist = var->root;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 1; /* OK */
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Unistall the object VAR. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
uninstall_variable (struct varobj *var)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
struct vlist *cv;
|
|
|
|
|
struct vlist *prev;
|
|
|
|
|
struct varobj_root *cr;
|
|
|
|
|
struct varobj_root *prer;
|
|
|
|
|
const char *chp;
|
|
|
|
|
unsigned int index = 0;
|
|
|
|
|
unsigned int i = 1;
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Remove varobj from hash table. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
for (chp = var->obj_name; *chp; chp++)
|
|
|
|
|
{
|
|
|
|
|
index = (index + (i++ * (unsigned int) *chp)) % VAROBJ_TABLE_SIZE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
cv = *(varobj_table + index);
|
|
|
|
|
prev = NULL;
|
|
|
|
|
while ((cv != NULL) && (strcmp (cv->var->obj_name, var->obj_name) != 0))
|
|
|
|
|
{
|
|
|
|
|
prev = cv;
|
|
|
|
|
cv = cv->next;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (varobjdebug)
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "Deleting %s\n", var->obj_name);
|
|
|
|
|
|
|
|
|
|
if (cv == NULL)
|
|
|
|
|
{
|
2001-11-01 03:22:21 +01:00
|
|
|
|
warning
|
|
|
|
|
("Assertion failed: Could not find variable object \"%s\" to delete",
|
|
|
|
|
var->obj_name);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (prev == NULL)
|
|
|
|
|
*(varobj_table + index) = cv->next;
|
|
|
|
|
else
|
|
|
|
|
prev->next = cv->next;
|
|
|
|
|
|
2000-12-15 02:01:51 +01:00
|
|
|
|
xfree (cv);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* If root, remove varobj from root list. */
|
2007-01-04 20:06:15 +01:00
|
|
|
|
if (is_root_p (var))
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Remove from list of root variables. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
if (rootlist == var->root)
|
|
|
|
|
rootlist = var->root->next;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
prer = NULL;
|
|
|
|
|
cr = rootlist;
|
|
|
|
|
while ((cr != NULL) && (cr->rootvar != var))
|
|
|
|
|
{
|
|
|
|
|
prer = cr;
|
|
|
|
|
cr = cr->next;
|
|
|
|
|
}
|
|
|
|
|
if (cr == NULL)
|
|
|
|
|
{
|
2011-01-06 10:30:35 +01:00
|
|
|
|
warning (_("Assertion failed: Could not find "
|
|
|
|
|
"varobj \"%s\" in root list"),
|
2011-01-05 23:22:53 +01:00
|
|
|
|
var->obj_name);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (prer == NULL)
|
|
|
|
|
rootlist = NULL;
|
|
|
|
|
else
|
|
|
|
|
prer->next = cr->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Create and install a child of the parent of the given name. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
static struct varobj *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
create_child (struct varobj *parent, int index, char *name)
|
2009-05-28 03:09:20 +02:00
|
|
|
|
{
|
|
|
|
|
return create_child_with_value (parent, index, name,
|
|
|
|
|
value_of_child (parent, index));
|
|
|
|
|
}
|
|
|
|
|
|
2012-01-12 23:51:10 +01:00
|
|
|
|
/* Does CHILD represent a child with no name? This happens when
|
|
|
|
|
the child is an anonmous struct or union and it has no field name
|
|
|
|
|
in its parent variable.
|
|
|
|
|
|
|
|
|
|
This has already been determined by *_describe_child. The easiest
|
|
|
|
|
thing to do is to compare the child's name with ANONYMOUS_*_NAME. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
is_anonymous_child (struct varobj *child)
|
|
|
|
|
{
|
|
|
|
|
return (strcmp (child->name, ANONYMOUS_STRUCT_NAME) == 0
|
|
|
|
|
|| strcmp (child->name, ANONYMOUS_UNION_NAME) == 0);
|
|
|
|
|
}
|
|
|
|
|
|
2009-05-28 03:09:20 +02:00
|
|
|
|
static struct varobj *
|
|
|
|
|
create_child_with_value (struct varobj *parent, int index, const char *name,
|
|
|
|
|
struct value *value)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
struct varobj *child;
|
|
|
|
|
char *childs_name;
|
|
|
|
|
|
|
|
|
|
child = new_variable ();
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Name is allocated by name_of_child. */
|
2009-05-28 03:09:20 +02:00
|
|
|
|
/* FIXME: xstrdup should not be here. */
|
|
|
|
|
child->name = xstrdup (name);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
child->index = index;
|
|
|
|
|
child->parent = parent;
|
|
|
|
|
child->root = parent->root;
|
2012-01-12 23:51:10 +01:00
|
|
|
|
|
|
|
|
|
if (is_anonymous_child (child))
|
|
|
|
|
childs_name = xstrprintf ("%s.%d_anonymous", parent->obj_name, index);
|
|
|
|
|
else
|
|
|
|
|
childs_name = xstrprintf ("%s.%s", parent->obj_name, name);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
child->obj_name = childs_name;
|
2012-01-12 23:51:10 +01:00
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
install_variable (child);
|
|
|
|
|
|
2006-11-28 18:23:10 +01:00
|
|
|
|
/* Compute the type of the child. Must do this before
|
|
|
|
|
calling install_new_value. */
|
|
|
|
|
if (value != NULL)
|
|
|
|
|
/* If the child had no evaluation errors, var->value
|
2011-01-12 02:23:29 +01:00
|
|
|
|
will be non-NULL and contain a valid type. */
|
2012-04-14 14:18:50 +02:00
|
|
|
|
child->type = value_actual_type (value, 0, NULL);
|
2006-11-28 18:23:10 +01:00
|
|
|
|
else
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Otherwise, we must compute the type. */
|
2006-11-28 18:23:10 +01:00
|
|
|
|
child->type = (*child->root->lang->type_of_child) (child->parent,
|
|
|
|
|
child->index);
|
|
|
|
|
install_new_value (child, value, 1);
|
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
return child;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Miscellaneous utility functions.
|
|
|
|
|
*/
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Allocate memory and initialize a new variable. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
static struct varobj *
|
|
|
|
|
new_variable (void)
|
|
|
|
|
{
|
|
|
|
|
struct varobj *var;
|
|
|
|
|
|
|
|
|
|
var = (struct varobj *) xmalloc (sizeof (struct varobj));
|
|
|
|
|
var->name = NULL;
|
2007-08-31 20:52:05 +02:00
|
|
|
|
var->path_expr = NULL;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
var->obj_name = NULL;
|
|
|
|
|
var->index = -1;
|
|
|
|
|
var->type = NULL;
|
|
|
|
|
var->value = NULL;
|
|
|
|
|
var->num_children = -1;
|
|
|
|
|
var->parent = NULL;
|
|
|
|
|
var->children = NULL;
|
|
|
|
|
var->format = 0;
|
|
|
|
|
var->root = NULL;
|
2002-10-24 01:54:33 +02:00
|
|
|
|
var->updated = 0;
|
2007-01-05 22:52:33 +01:00
|
|
|
|
var->print_value = NULL;
|
2007-04-14 11:51:30 +02:00
|
|
|
|
var->frozen = 0;
|
|
|
|
|
var->not_fetched = 0;
|
2009-05-28 03:09:20 +02:00
|
|
|
|
var->children_requested = 0;
|
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 20:51:26 +02:00
|
|
|
|
var->from = -1;
|
|
|
|
|
var->to = -1;
|
|
|
|
|
var->constructor = 0;
|
2009-05-28 03:09:20 +02:00
|
|
|
|
var->pretty_printer = 0;
|
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 20:51:26 +02:00
|
|
|
|
var->child_iter = 0;
|
|
|
|
|
var->saved_item = 0;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
return var;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Allocate memory and initialize a new root variable. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
static struct varobj *
|
|
|
|
|
new_root_variable (void)
|
|
|
|
|
{
|
|
|
|
|
struct varobj *var = new_variable ();
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2011-01-05 23:22:53 +01:00
|
|
|
|
var->root = (struct varobj_root *) xmalloc (sizeof (struct varobj_root));
|
2000-02-03 05:14:45 +01:00
|
|
|
|
var->root->lang = NULL;
|
|
|
|
|
var->root->exp = NULL;
|
|
|
|
|
var->root->valid_block = NULL;
|
2002-12-04 01:05:54 +01:00
|
|
|
|
var->root->frame = null_frame_id;
|
2008-03-26 15:11:18 +01:00
|
|
|
|
var->root->floating = 0;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
var->root->rootvar = NULL;
|
2007-02-13 09:15:49 +01:00
|
|
|
|
var->root->is_valid = 1;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
return var;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Free any allocated memory associated with VAR. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
free_variable (struct varobj *var)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
* python/python-internal.h (struct language_defn): Declare.
(python_gdbarch, python_language): Likewise.
(ensure_python_env): Add prototype.
(make_cleanup_py_restore_gil): Remove prototype.
* python/python.c: Include "arch-utils.h", "value.h" and "language.h".
(python_gdbarch, python_language): New global variables.
(struct python_env): New data type.
(ensure_python_env, restore_python_env): New functions.
(eval_python_from_control_command): Call ensure_python_env to
install current architecture and language.
(python_command, gdbpy_new_objfile): Likewise.
* python/python-cmd.c: Include "arch-utils.h" and "language.h".
(cmdpy_destroyer, cmdpy_function, cmdpy_completer): Call
ensure_python_env.
* python/python-type.c (clean_up_objfile_types): Likewise.
* python/python-objfile.c: Include "language.h".
(clean_up_objfile): Call ensure_python_env.
* python/python-prettyprint.c (apply_val_pretty_printer): Likewise.
(apply_varobj_pretty_printer): Do not call PyGILState_Ensure.
* varobj.c (varobj_ensure_python_env): New helper function.
(varobj_get_display_hint, update_dynamic_varobj_children,
install_default_visualizer, varobj_set_visualizer, free_variable,
value_get_print_value): Call it.
(value_get_print_value): Add varobj argument instead of pretty
printer argument. Update all callers.
* python/python-utils.c (py_gil_restore, make_cleanup_py_restore_gil):
Remove.
* value.h (internal_function_fn): Add GDBARCH and LANGUAGE argument.
(call_internal_function): Likewise.
* value.c (call_internal_function): Likewise. Pass to handler.
* eval.c (evaluate_subexp_standard): Update call.
* python/python-function.c: Include "language.h".
(fnpy_call): Add GDBARCH and LANGAUAGE arguments and call
make_cleanup_python_env.
* python/python-value.c (builtin_type_pyint, builtin_type_pyfloat,
builtin_type_pylong, builtin_type_pybool, builtin_type_pychar,
valpy_str): Use python_gdbarch and python_language instead of
current_gdbarch and current_language.
* python/python-type.c (typy_lookup_typename): Likewise.
2009-07-02 19:04:23 +02:00
|
|
|
|
#if HAVE_PYTHON
|
|
|
|
|
if (var->pretty_printer)
|
|
|
|
|
{
|
|
|
|
|
struct cleanup *cleanup = varobj_ensure_python_env (var);
|
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 20:51:26 +02:00
|
|
|
|
Py_XDECREF (var->constructor);
|
|
|
|
|
Py_XDECREF (var->pretty_printer);
|
|
|
|
|
Py_XDECREF (var->child_iter);
|
|
|
|
|
Py_XDECREF (var->saved_item);
|
* python/python-internal.h (struct language_defn): Declare.
(python_gdbarch, python_language): Likewise.
(ensure_python_env): Add prototype.
(make_cleanup_py_restore_gil): Remove prototype.
* python/python.c: Include "arch-utils.h", "value.h" and "language.h".
(python_gdbarch, python_language): New global variables.
(struct python_env): New data type.
(ensure_python_env, restore_python_env): New functions.
(eval_python_from_control_command): Call ensure_python_env to
install current architecture and language.
(python_command, gdbpy_new_objfile): Likewise.
* python/python-cmd.c: Include "arch-utils.h" and "language.h".
(cmdpy_destroyer, cmdpy_function, cmdpy_completer): Call
ensure_python_env.
* python/python-type.c (clean_up_objfile_types): Likewise.
* python/python-objfile.c: Include "language.h".
(clean_up_objfile): Call ensure_python_env.
* python/python-prettyprint.c (apply_val_pretty_printer): Likewise.
(apply_varobj_pretty_printer): Do not call PyGILState_Ensure.
* varobj.c (varobj_ensure_python_env): New helper function.
(varobj_get_display_hint, update_dynamic_varobj_children,
install_default_visualizer, varobj_set_visualizer, free_variable,
value_get_print_value): Call it.
(value_get_print_value): Add varobj argument instead of pretty
printer argument. Update all callers.
* python/python-utils.c (py_gil_restore, make_cleanup_py_restore_gil):
Remove.
* value.h (internal_function_fn): Add GDBARCH and LANGUAGE argument.
(call_internal_function): Likewise.
* value.c (call_internal_function): Likewise. Pass to handler.
* eval.c (evaluate_subexp_standard): Update call.
* python/python-function.c: Include "language.h".
(fnpy_call): Add GDBARCH and LANGAUAGE arguments and call
make_cleanup_python_env.
* python/python-value.c (builtin_type_pyint, builtin_type_pyfloat,
builtin_type_pylong, builtin_type_pybool, builtin_type_pychar,
valpy_str): Use python_gdbarch and python_language instead of
current_gdbarch and current_language.
* python/python-type.c (typy_lookup_typename): Likewise.
2009-07-02 19:04:23 +02:00
|
|
|
|
do_cleanups (cleanup);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2009-03-09 23:35:44 +01:00
|
|
|
|
value_free (var->value);
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Free the expression if this is a root variable. */
|
2007-01-04 20:06:15 +01:00
|
|
|
|
if (is_root_p (var))
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2009-04-22 19:50:54 +02:00
|
|
|
|
xfree (var->root->exp);
|
2001-01-19 06:45:16 +01:00
|
|
|
|
xfree (var->root);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
2001-01-19 06:45:16 +01:00
|
|
|
|
xfree (var->name);
|
|
|
|
|
xfree (var->obj_name);
|
2007-01-05 22:52:33 +01:00
|
|
|
|
xfree (var->print_value);
|
2007-08-31 20:52:05 +02:00
|
|
|
|
xfree (var->path_expr);
|
2001-01-19 06:45:16 +01:00
|
|
|
|
xfree (var);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
2000-05-22 11:02:23 +02:00
|
|
|
|
static void
|
|
|
|
|
do_free_variable_cleanup (void *var)
|
|
|
|
|
{
|
|
|
|
|
free_variable (var);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct cleanup *
|
|
|
|
|
make_cleanup_free_variable (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
return make_cleanup (do_free_variable_cleanup, var);
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* This returns the type of the variable. It also skips past typedefs
|
2003-06-19 22:40:40 +02:00
|
|
|
|
to return the real type of the variable.
|
2002-09-24 20:50:34 +02:00
|
|
|
|
|
|
|
|
|
NOTE: TYPE_TARGET_TYPE should NOT be used anywhere in this file
|
2011-01-12 02:23:29 +01:00
|
|
|
|
except within get_target_type and get_type. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
static struct type *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
get_type (struct varobj *var)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
struct type *type;
|
|
|
|
|
|
2010-05-17 20:48:52 +02:00
|
|
|
|
type = var->type;
|
2003-06-19 22:40:40 +02:00
|
|
|
|
if (type != NULL)
|
|
|
|
|
type = check_typedef (type);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
return type;
|
|
|
|
|
}
|
|
|
|
|
|
2007-01-24 11:49:31 +01:00
|
|
|
|
/* Return the type of the value that's stored in VAR,
|
|
|
|
|
or that would have being stored there if the
|
2011-01-12 02:23:29 +01:00
|
|
|
|
value were accessible.
|
2007-01-24 11:49:31 +01:00
|
|
|
|
|
|
|
|
|
This differs from VAR->type in that VAR->type is always
|
|
|
|
|
the true type of the expession in the source language.
|
|
|
|
|
The return value of this function is the type we're
|
|
|
|
|
actually storing in varobj, and using for displaying
|
|
|
|
|
the values and for comparing previous and new values.
|
|
|
|
|
|
|
|
|
|
For example, top-level references are always stripped. */
|
|
|
|
|
static struct type *
|
|
|
|
|
get_value_type (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
struct type *type;
|
|
|
|
|
|
|
|
|
|
if (var->value)
|
|
|
|
|
type = value_type (var->value);
|
|
|
|
|
else
|
|
|
|
|
type = var->type;
|
|
|
|
|
|
|
|
|
|
type = check_typedef (type);
|
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_REF)
|
|
|
|
|
type = get_target_type (type);
|
|
|
|
|
|
|
|
|
|
type = check_typedef (type);
|
|
|
|
|
|
|
|
|
|
return type;
|
|
|
|
|
}
|
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
/* This returns the target type (or NULL) of TYPE, also skipping
|
2002-09-24 20:50:34 +02:00
|
|
|
|
past typedefs, just like get_type ().
|
|
|
|
|
|
|
|
|
|
NOTE: TYPE_TARGET_TYPE should NOT be used anywhere in this file
|
2011-01-12 02:23:29 +01:00
|
|
|
|
except within get_target_type and get_type. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
static struct type *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
get_target_type (struct type *type)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
if (type != NULL)
|
|
|
|
|
{
|
|
|
|
|
type = TYPE_TARGET_TYPE (type);
|
2003-06-19 22:40:40 +02:00
|
|
|
|
if (type != NULL)
|
|
|
|
|
type = check_typedef (type);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return type;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* What is the default display for this variable? We assume that
|
2011-01-12 02:23:29 +01:00
|
|
|
|
everything is "natural". Any exceptions? */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
static enum varobj_display_formats
|
2000-07-30 03:48:28 +02:00
|
|
|
|
variable_default_display (struct varobj *var)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
return FORMAT_NATURAL;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* FIXME: The following should be generic for any pointer. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
cppush (struct cpstack **pstack, char *name)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
struct cpstack *s;
|
|
|
|
|
|
|
|
|
|
s = (struct cpstack *) xmalloc (sizeof (struct cpstack));
|
|
|
|
|
s->name = name;
|
|
|
|
|
s->next = *pstack;
|
|
|
|
|
*pstack = s;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* FIXME: The following should be generic for any pointer. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
static char *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
cppop (struct cpstack **pstack)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
struct cpstack *s;
|
|
|
|
|
char *v;
|
|
|
|
|
|
|
|
|
|
if ((*pstack)->name == NULL && (*pstack)->next == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
s = *pstack;
|
|
|
|
|
v = s->name;
|
|
|
|
|
*pstack = (*pstack)->next;
|
2000-12-15 02:01:51 +01:00
|
|
|
|
xfree (s);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Language-dependencies
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/* Common entry points */
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Get the language of variable VAR. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
static enum varobj_languages
|
2000-07-30 03:48:28 +02:00
|
|
|
|
variable_language (struct varobj *var)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
enum varobj_languages lang;
|
|
|
|
|
|
|
|
|
|
switch (var->root->exp->language_defn->la_language)
|
|
|
|
|
{
|
|
|
|
|
default:
|
|
|
|
|
case language_c:
|
|
|
|
|
lang = vlang_c;
|
|
|
|
|
break;
|
|
|
|
|
case language_cplus:
|
|
|
|
|
lang = vlang_cplus;
|
|
|
|
|
break;
|
|
|
|
|
case language_java:
|
|
|
|
|
lang = vlang_java;
|
|
|
|
|
break;
|
2011-07-18 11:21:43 +02:00
|
|
|
|
case language_ada:
|
|
|
|
|
lang = vlang_ada;
|
|
|
|
|
break;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return lang;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the number of children for a given variable.
|
|
|
|
|
The result of this function is defined by the language
|
2011-01-12 02:23:29 +01:00
|
|
|
|
implementation. The number of children returned by this function
|
2000-02-03 05:14:45 +01:00
|
|
|
|
is the number of children that the user will see in the variable
|
2011-01-12 02:23:29 +01:00
|
|
|
|
display. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
static int
|
2000-07-30 03:48:28 +02:00
|
|
|
|
number_of_children (struct varobj *var)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2011-03-05 23:02:47 +01:00
|
|
|
|
return (*var->root->lang->number_of_children) (var);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
2011-01-05 23:22:53 +01:00
|
|
|
|
/* What is the expression for the root varobj VAR? Returns a malloc'd
|
2011-01-12 02:23:29 +01:00
|
|
|
|
string. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
static char *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
name_of_variable (struct varobj *var)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
return (*var->root->lang->name_of_variable) (var);
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-05 23:22:53 +01:00
|
|
|
|
/* What is the name of the INDEX'th child of VAR? Returns a malloc'd
|
2011-01-12 02:23:29 +01:00
|
|
|
|
string. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
static char *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
name_of_child (struct varobj *var, int index)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
return (*var->root->lang->name_of_child) (var, index);
|
|
|
|
|
}
|
|
|
|
|
|
2008-03-26 15:11:18 +01:00
|
|
|
|
/* What is the ``struct value *'' of the root variable VAR?
|
|
|
|
|
For floating variable object, evaluation can get us a value
|
|
|
|
|
of different type from what is stored in varobj already. In
|
|
|
|
|
that case:
|
|
|
|
|
- *type_changed will be set to 1
|
|
|
|
|
- old varobj will be freed, and new one will be
|
|
|
|
|
created, with the same name.
|
|
|
|
|
- *var_handle will be set to the new varobj
|
|
|
|
|
Otherwise, *type_changed will be set to 0. */
|
2001-11-01 03:37:56 +01:00
|
|
|
|
static struct value *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
value_of_root (struct varobj **var_handle, int *type_changed)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2000-03-13 22:51:46 +01:00
|
|
|
|
struct varobj *var;
|
|
|
|
|
|
|
|
|
|
if (var_handle == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
var = *var_handle;
|
|
|
|
|
|
|
|
|
|
/* This should really be an exception, since this should
|
2011-01-12 02:23:29 +01:00
|
|
|
|
only get called with a root variable. */
|
2000-03-13 22:51:46 +01:00
|
|
|
|
|
2007-01-04 20:06:15 +01:00
|
|
|
|
if (!is_root_p (var))
|
2000-03-13 22:51:46 +01:00
|
|
|
|
return NULL;
|
|
|
|
|
|
2008-03-26 15:11:18 +01:00
|
|
|
|
if (var->root->floating)
|
2000-03-13 22:51:46 +01:00
|
|
|
|
{
|
|
|
|
|
struct varobj *tmp_var;
|
|
|
|
|
char *old_type, *new_type;
|
2007-08-08 23:46:37 +02:00
|
|
|
|
|
2000-03-13 22:51:46 +01:00
|
|
|
|
tmp_var = varobj_create (NULL, var->name, (CORE_ADDR) 0,
|
|
|
|
|
USE_SELECTED_FRAME);
|
|
|
|
|
if (tmp_var == NULL)
|
|
|
|
|
{
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2007-08-08 23:46:37 +02:00
|
|
|
|
old_type = varobj_get_type (var);
|
2000-03-13 22:51:46 +01:00
|
|
|
|
new_type = varobj_get_type (tmp_var);
|
2001-11-01 03:22:21 +01:00
|
|
|
|
if (strcmp (old_type, new_type) == 0)
|
2000-03-13 22:51:46 +01:00
|
|
|
|
{
|
2008-04-13 11:33:49 +02:00
|
|
|
|
/* The expression presently stored inside var->root->exp
|
|
|
|
|
remembers the locations of local variables relatively to
|
|
|
|
|
the frame where the expression was created (in DWARF location
|
|
|
|
|
button, for example). Naturally, those locations are not
|
|
|
|
|
correct in other frames, so update the expression. */
|
|
|
|
|
|
|
|
|
|
struct expression *tmp_exp = var->root->exp;
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2008-04-13 11:33:49 +02:00
|
|
|
|
var->root->exp = tmp_var->root->exp;
|
|
|
|
|
tmp_var->root->exp = tmp_exp;
|
|
|
|
|
|
2000-03-13 22:51:46 +01:00
|
|
|
|
varobj_delete (tmp_var, NULL, 0);
|
|
|
|
|
*type_changed = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
gdb/
Replace the savestring calls by xstrdup calls where possible.
* breakpoint.c (condition_command, set_raw_breakpoint)
(create_catchpoint, update_breakpoint_locations): Replace the
savestring calls by xstrdup calls where possible.
* buildsym.c (start_subfile, patch_subfile_names, record_debugformat)
(record_producer): Likewise.
* coffread.c (coff_start_symtab, complete_symtab): Likewise.
* corefile.c (set_gnutarget): Likewise.
* dbxread.c (add_new_header_file): Likewise.
* demangle.c (set_demangling_command, set_demangling_style): Likewise.
* event-top.c (push_prompt, pop_prompt, command_line_handler)
(set_async_prompt): Likewise.
* infcmd.c (set_inferior_io_terminal, attach_command_post_wait):
Likewise.
* language.c (set_language_command, _initialize_language): Likewise.
* linespec.c (decode_line_2): Likewise.
* rs6000-nat.c (add_vmap): Likewise.
* top.c (set_prompt, init_history, init_main): Likewise.
* tracepoint.c (stringify_collection_list): Likewise.
* varobj.c (varobj_create): Remove variable expr_len. Replace the
savestring calls by xstrdup calls where possible.
(value_of_root, c_name_of_variable, c_describe_child): Replace the
savestring calls by xstrdup calls where possible.
* xcoffread.c (complete_symtab): Likewise.
* cli/cli-script.c (build_command_line, define_command): Likewise.
* cli/cli-setshow.c (do_setshow_command): Likewise.
2009-05-23 18:17:18 +02:00
|
|
|
|
tmp_var->obj_name = xstrdup (var->obj_name);
|
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 20:51:26 +02:00
|
|
|
|
tmp_var->from = var->from;
|
|
|
|
|
tmp_var->to = var->to;
|
2008-03-26 15:11:18 +01:00
|
|
|
|
varobj_delete (var, NULL, 0);
|
|
|
|
|
|
2000-03-13 22:51:46 +01:00
|
|
|
|
install_variable (tmp_var);
|
|
|
|
|
*var_handle = tmp_var;
|
2001-08-17 20:56:49 +02:00
|
|
|
|
var = *var_handle;
|
2000-03-13 22:51:46 +01:00
|
|
|
|
*type_changed = 1;
|
|
|
|
|
}
|
2007-08-18 01:17:30 +02:00
|
|
|
|
xfree (old_type);
|
|
|
|
|
xfree (new_type);
|
2000-03-13 22:51:46 +01:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
*type_changed = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2012-03-28 23:31:05 +02:00
|
|
|
|
{
|
|
|
|
|
struct value *value;
|
|
|
|
|
|
|
|
|
|
value = (*var->root->lang->value_of_root) (var_handle);
|
|
|
|
|
if (var->value == NULL || value == NULL)
|
|
|
|
|
{
|
|
|
|
|
/* For root varobj-s, a NULL value indicates a scoping issue.
|
|
|
|
|
So, nothing to do in terms of checking for mutations. */
|
|
|
|
|
}
|
|
|
|
|
else if (varobj_value_has_mutated (var, value, value_type (value)))
|
|
|
|
|
{
|
|
|
|
|
/* The type has mutated, so the children are no longer valid.
|
|
|
|
|
Just delete them, and tell our caller that the type has
|
|
|
|
|
changed. */
|
|
|
|
|
varobj_delete (var, NULL, 1 /* only_children */);
|
|
|
|
|
var->num_children = -1;
|
|
|
|
|
var->to = -1;
|
|
|
|
|
var->from = -1;
|
|
|
|
|
*type_changed = 1;
|
|
|
|
|
}
|
|
|
|
|
return value;
|
|
|
|
|
}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* What is the ``struct value *'' for the INDEX'th child of PARENT? */
|
2001-11-01 03:37:56 +01:00
|
|
|
|
static struct value *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
value_of_child (struct varobj *parent, int index)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2001-11-01 03:37:56 +01:00
|
|
|
|
struct value *value;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
value = (*parent->root->lang->value_of_child) (parent, index);
|
|
|
|
|
|
|
|
|
|
return value;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* GDB already has a command called "value_of_variable". Sigh. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
static char *
|
2008-04-09 15:29:55 +02:00
|
|
|
|
my_value_of_variable (struct varobj *var, enum varobj_display_formats format)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2007-02-13 09:15:49 +01:00
|
|
|
|
if (var->root->is_valid)
|
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 20:51:26 +02:00
|
|
|
|
{
|
|
|
|
|
if (var->pretty_printer)
|
|
|
|
|
return value_get_print_value (var->value, var->format, var);
|
|
|
|
|
return (*var->root->lang->value_of_variable) (var, format);
|
|
|
|
|
}
|
2007-02-13 09:15:49 +01:00
|
|
|
|
else
|
|
|
|
|
return NULL;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
2007-01-05 22:52:33 +01:00
|
|
|
|
static char *
|
2009-05-28 03:09:20 +02:00
|
|
|
|
value_get_print_value (struct value *value, enum varobj_display_formats format,
|
* python/python-internal.h (struct language_defn): Declare.
(python_gdbarch, python_language): Likewise.
(ensure_python_env): Add prototype.
(make_cleanup_py_restore_gil): Remove prototype.
* python/python.c: Include "arch-utils.h", "value.h" and "language.h".
(python_gdbarch, python_language): New global variables.
(struct python_env): New data type.
(ensure_python_env, restore_python_env): New functions.
(eval_python_from_control_command): Call ensure_python_env to
install current architecture and language.
(python_command, gdbpy_new_objfile): Likewise.
* python/python-cmd.c: Include "arch-utils.h" and "language.h".
(cmdpy_destroyer, cmdpy_function, cmdpy_completer): Call
ensure_python_env.
* python/python-type.c (clean_up_objfile_types): Likewise.
* python/python-objfile.c: Include "language.h".
(clean_up_objfile): Call ensure_python_env.
* python/python-prettyprint.c (apply_val_pretty_printer): Likewise.
(apply_varobj_pretty_printer): Do not call PyGILState_Ensure.
* varobj.c (varobj_ensure_python_env): New helper function.
(varobj_get_display_hint, update_dynamic_varobj_children,
install_default_visualizer, varobj_set_visualizer, free_variable,
value_get_print_value): Call it.
(value_get_print_value): Add varobj argument instead of pretty
printer argument. Update all callers.
* python/python-utils.c (py_gil_restore, make_cleanup_py_restore_gil):
Remove.
* value.h (internal_function_fn): Add GDBARCH and LANGUAGE argument.
(call_internal_function): Likewise.
* value.c (call_internal_function): Likewise. Pass to handler.
* eval.c (evaluate_subexp_standard): Update call.
* python/python-function.c: Include "language.h".
(fnpy_call): Add GDBARCH and LANGAUAGE arguments and call
make_cleanup_python_env.
* python/python-value.c (builtin_type_pyint, builtin_type_pyfloat,
builtin_type_pylong, builtin_type_pybool, builtin_type_pychar,
valpy_str): Use python_gdbarch and python_language instead of
current_gdbarch and current_language.
* python/python-type.c (typy_lookup_typename): Likewise.
2009-07-02 19:04:23 +02:00
|
|
|
|
struct varobj *var)
|
2007-01-05 22:52:33 +01:00
|
|
|
|
{
|
2007-01-09 00:11:47 +01:00
|
|
|
|
struct ui_file *stb;
|
2010-11-12 21:49:43 +01:00
|
|
|
|
struct cleanup *old_chain;
|
2009-07-10 12:35:17 +02:00
|
|
|
|
gdb_byte *thevalue = NULL;
|
gdb
* varobj.c (value_get_print_value): Include valprint.h.
(value_get_print_value): Use get_formatted_print_options.
* value.h (struct value_print_options): Declare.
(value_print, val_print, common_val_print, val_print_string):
Update.
* value.c: Include valprint.h.
(show_values): Use get_user_print_options.
(show_convenience): Likewise.
* valprint.h (prettyprint_arrays, prettyprint_structs): Don't
declare.
(struct value_print_options): New type.
(vtblprint, unionprint, addressprint, objectprint, print_max,
inspect_it, repeat_count_threshold, output_format,
stop_print_at_null): Don't declare.
(user_print_options, get_user_print_options,
get_raw_print_options, get_formatted_print_options): Declare.
(print_array_indexes_p): Don't declare.
(maybe_print_array_index, val_print_array_elements): Update.
* valprint.c (print_max): Remove.
(user_print_options): New global.
(get_user_print_options, get_raw_print_options,
get_formatted_print_options): New functions.
(print_array_indexes, repeat_count_threshold, stop_print_at_null,
prettyprint_structs, prettyprint_arrays, unionprint,
addressprint): Remove.
(val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(common_val_print): Likewise.
(print_array_indexes_p): Remove.
(maybe_print_array_index): Remove format, pretty arguments; add
options. Update.
(val_print_array_elements): Remove format, deref_ref, pretty
arguments; add options. Update.
(val_print_string): Add options argument. Update.
(_initialize_valprint): Use user_print_options.
(output_format): Remove.
(set_output_radix_1): Use user_print_options.
* typeprint.c: Include valprint.h.
(objectprint): Don't declare.
(whatis_exp): Use get_user_print_options.
* tui/tui-regs.c: Include valprint.h.
(tui_register_format): Use get_formatted_print_options.
* tracepoint.c: Include valprint.h.
(addressprint): Don't declare.
(trace_mention): Use get_user_print_options.
(tracepoints_info): Likewise.
* stack.c (print_frame_args): Use get_raw_print_options.
(print_frame_info): Use get_user_print_options.
(print_frame): Likewise.
* sh64-tdep.c: Include valprint.h
(sh64_do_register): Use get_formatted_print_options.
* scm-valprint.c (scm_inferior_print): Remove format, deref_ref,
pretty arguments; add options.
(scm_scmlist_print): Likewise. Update.
(scm_scmval_print): Likewise.
(scm_val_print): Likewise.
(scm_value_print): Remove format, pretty arguments; add options.
Update.
* scm-lang.h (scm_value_print, scm_val_print, scm_scmval_print):
Update.
* scm-lang.c (scm_printstr): Add options argument.
* python/python-value.c: Include valprint.h.
(valpy_str): Use get_user_print_options.
* printcmd.c: Include valprint.h.
(addressprint): Don't declare.
(inspect_it): Remove.
(print_formatted): Remove format option; add options. Update.
(print_scalar_formatted): Likewise.
(print_address_demangle): Use get_user_print_options.
(do_examine): Use get_formatted_print_options.
(print_command_1): Likewise.
(output_command): Use get_formatted_print_options.
(do_one_display): Likewise.
(print_variable_value): Use get_user_print_options.
* p-valprint.c (pascal_val_print): Remove format, deref_ref,
pretty arguments; add options. Update.
(pascal_value_print): Remove format, pretty arguments; add
options. Update.
(vtblprint, objectprint): Don't declare.
(pascal_static_field_print): Remove.
(pascal_object_print_value_fields): Remove format, pretty
arguments; add options. Update.
(pascal_object_print_static_field): Likewise.
(_initialize_pascal_valprint): Use user_print_options. Update.
* p-lang.h (pascal_val_print, pascal_value_print,
pascal_printstr, pascal_object_print_value_fields): Update.
(vtblprint, static_field_print): Don't declare.
* p-lang.c (pascal_printstr): Add options argument. Update.
* objc-lang.c (objc_printstr): Add options argument. Update.
* mt-tdep.c: Include valprint.h.
(mt_registers_info): Use get_raw_print_options.
* mips-tdep.c: Include valprint.h.
(mips_print_fp_register): Use get_formatted_print_options.
(mips_print_register): Likewise.
* mi/mi-main.c: Include valprint.h.
(get_register): Use get_user_print_options.
(mi_cmd_data_evaluate_expression): Likewise.
(mi_cmd_data_read_memory): Use get_formatted_print_options.
* mi/mi-cmd-stack.c: Include valprint.h.
(list_args_or_locals): Use get_raw_print_options.
* m2-valprint.c (print_function_pointer_address): Add addressprint
argument.
(m2_print_long_set): Remove format, pretty arguments.
(m2_print_unbounded_array): Remove format, deref_ref, pretty
arguments; add options. Update.
(print_unpacked_pointer): Remove format argument; add options.
Now static. Update.
(print_variable_at_address): Remove format, deref_ref, pretty
arguments; add options. Update.
(m2_print_array_contents): Likewise.
(m2_val_print): Likewise.
* m2-lang.h (m2_val_print): Update.
* m2-lang.c (m2_printstr): Add options argument. Update.
* language.h (struct value_print_options): Declare.
(struct language_defn) <la_printstr>: Add options argument.
<la_val_print>: Remove format, deref_ref, pretty argument; add
options.
<la_value_print>: Remove format, pretty arguments; add options.
<la_print_array_index>: Likewise.
(LA_VAL_PRINT, LA_VALUE_PRINT, LA_PRINT_STRING,
LA_PRINT_ARRAY_INDEX): Update.
(default_print_array_index): Update.
* language.c (default_print_array_index): Remove format, pretty
arguments; add options. Update.
(unk_lang_printstr): Add options argument.
(unk_lang_val_print): Remove format, deref_ref, pretty arguments;
add options.
(unk_lang_value_print): Remove format, pretty arguments; add
options.
* jv-valprint.c (java_value_print): Remove format, pretty
arguments; add options. Update.
(java_print_value_fields): Likewise.
(java_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
* jv-lang.h (java_val_print, java_value_print): Declare.
* infcmd.c: Include valprint.h.
(print_return_value): Use get_raw_print_options.
(default_print_registers_info): Use get_user_print_options,
get_formatted_print_options.
(registers_info): Use get_formatted_print_options.
* gdbtypes.h (struct value_print_options): Declare.
(print_scalar_formatted): Update.
* f-valprint.c (f77_print_array_1): Remove format, deref_ref,
pretty arguments; add options. Update.
(f77_print_array): Likewise.
(f_val_print): Likewise.
* f-lang.h (f_val_print): Update.
* f-lang.c (f_printstr): Add options argument. Update.
(c_value_print): Update declaration.
* expprint.c: Include valprint.h.
(print_subexp_standard): Use get_raw_print_options,
get_user_print_options.
* eval.c: Include valprint.h.
(objectprint): Don't declare.
(evaluate_subexp_standard): Use get_user_print_options.
* cp-valprint.c (vtblprint, objectprint, static_field_print):
Remove.
(cp_print_value_fields): Remove format, pretty arguments; add
options. Update.
(cp_print_value): Likewise.
(cp_print_static_field): Likewise.
(_initialize_cp_valprint): Use user_print_options. Update.
* c-valprint.c (print_function_pointer_address): Add addressprint
argument.
(c_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(c_value_print): Add options argument. Update.
* c-lang.h (c_val_print, c_value_print, c_printstr): Update.
(vtblprint, static_field_print): Don't declare.
(cp_print_value_fields): Update.
* c-lang.c (c_printstr): Add options argument. Update.
* breakpoint.c: Include valprint.h.
(addressprint): Don't declare.
(watchpoint_value_print): Use get_user_print_options.
(print_one_breakpoint_location): Likewise.
(breakpoint_1, print_it_catch_fork, print_it_catch_vfork, mention,
print_exception_catchpoint): Likewise.
* auxv.c (fprint_target_auxv): Don't declare addressprint. Use
get_user_print_options.
* ada-valprint.c (struct ada_val_print_args): Remove format,
deref_ref, and pretty; add options.
(print_optional_low_bound): Add options argument.
(val_print_packed_array_elements): Remove format and pretty
arguments; add options. Update.
(printstr): Add options argument. Update.
(ada_printstr): Likewise.
(ada_val_print): Remove format, deref_ref, pretty arguments; add
options argument. Update.
(ada_val_print_stub): Update.
(ada_val_print_array): Remove format, deref_ref, pretty arguments;
add options. Update.
(ada_val_print_1): Likewise.
(print_variant_part): Likewise.
(ada_value_print): Remove format, pretty arguments; add options.
Update.
(print_record): Likewise.
(print_field_values): Likewise.
* ada-lang.h (ada_val_print, ada_value_print, ada_printstr):
Update.
* ada-lang.c (ada_print_array_index): Add options argument; remove
format and pretty arguments.
(print_one_exception): Use get_user_print_options.
gdb/testsuite
* gdb.base/exprs.exp (test_expr): Add enum formatting tests.
2008-10-28 18:19:58 +01:00
|
|
|
|
struct value_print_options opts;
|
2010-01-14 09:03:37 +01:00
|
|
|
|
struct type *type = NULL;
|
|
|
|
|
long len = 0;
|
|
|
|
|
char *encoding = NULL;
|
|
|
|
|
struct gdbarch *gdbarch = NULL;
|
2010-10-17 10:43:46 +02:00
|
|
|
|
/* Initialize it just to avoid a GCC false warning. */
|
|
|
|
|
CORE_ADDR str_addr = 0;
|
2010-10-15 20:54:13 +02:00
|
|
|
|
int string_print = 0;
|
2007-01-09 00:11:47 +01:00
|
|
|
|
|
|
|
|
|
if (value == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
2010-11-12 21:49:43 +01:00
|
|
|
|
stb = mem_fileopen ();
|
|
|
|
|
old_chain = make_cleanup_ui_file_delete (stb);
|
|
|
|
|
|
2010-01-14 09:03:37 +01:00
|
|
|
|
gdbarch = get_type_arch (value_type (value));
|
2009-05-28 03:09:20 +02:00
|
|
|
|
#if HAVE_PYTHON
|
|
|
|
|
{
|
* python/python-internal.h (struct language_defn): Declare.
(python_gdbarch, python_language): Likewise.
(ensure_python_env): Add prototype.
(make_cleanup_py_restore_gil): Remove prototype.
* python/python.c: Include "arch-utils.h", "value.h" and "language.h".
(python_gdbarch, python_language): New global variables.
(struct python_env): New data type.
(ensure_python_env, restore_python_env): New functions.
(eval_python_from_control_command): Call ensure_python_env to
install current architecture and language.
(python_command, gdbpy_new_objfile): Likewise.
* python/python-cmd.c: Include "arch-utils.h" and "language.h".
(cmdpy_destroyer, cmdpy_function, cmdpy_completer): Call
ensure_python_env.
* python/python-type.c (clean_up_objfile_types): Likewise.
* python/python-objfile.c: Include "language.h".
(clean_up_objfile): Call ensure_python_env.
* python/python-prettyprint.c (apply_val_pretty_printer): Likewise.
(apply_varobj_pretty_printer): Do not call PyGILState_Ensure.
* varobj.c (varobj_ensure_python_env): New helper function.
(varobj_get_display_hint, update_dynamic_varobj_children,
install_default_visualizer, varobj_set_visualizer, free_variable,
value_get_print_value): Call it.
(value_get_print_value): Add varobj argument instead of pretty
printer argument. Update all callers.
* python/python-utils.c (py_gil_restore, make_cleanup_py_restore_gil):
Remove.
* value.h (internal_function_fn): Add GDBARCH and LANGUAGE argument.
(call_internal_function): Likewise.
* value.c (call_internal_function): Likewise. Pass to handler.
* eval.c (evaluate_subexp_standard): Update call.
* python/python-function.c: Include "language.h".
(fnpy_call): Add GDBARCH and LANGAUAGE arguments and call
make_cleanup_python_env.
* python/python-value.c (builtin_type_pyint, builtin_type_pyfloat,
builtin_type_pylong, builtin_type_pybool, builtin_type_pychar,
valpy_str): Use python_gdbarch and python_language instead of
current_gdbarch and current_language.
* python/python-type.c (typy_lookup_typename): Likewise.
2009-07-02 19:04:23 +02:00
|
|
|
|
PyObject *value_formatter = var->pretty_printer;
|
|
|
|
|
|
2010-10-15 20:54:13 +02:00
|
|
|
|
varobj_ensure_python_env (var);
|
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
if (value_formatter)
|
2009-05-28 03:09:20 +02:00
|
|
|
|
{
|
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 20:51:26 +02:00
|
|
|
|
/* First check to see if we have any children at all. If so,
|
|
|
|
|
we simply return {...}. */
|
|
|
|
|
if (dynamic_varobj_has_child_method (var))
|
2010-11-12 21:49:43 +01:00
|
|
|
|
{
|
|
|
|
|
do_cleanups (old_chain);
|
|
|
|
|
return xstrdup ("{...}");
|
|
|
|
|
}
|
2009-05-28 03:09:20 +02:00
|
|
|
|
|
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 20:51:26 +02:00
|
|
|
|
if (PyObject_HasAttr (value_formatter, gdbpy_to_string_cst))
|
2009-05-28 03:09:20 +02:00
|
|
|
|
{
|
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 20:51:26 +02:00
|
|
|
|
struct value *replacement;
|
|
|
|
|
PyObject *output = NULL;
|
|
|
|
|
|
|
|
|
|
output = apply_varobj_pretty_printer (value_formatter,
|
2010-11-12 21:49:43 +01:00
|
|
|
|
&replacement,
|
|
|
|
|
stb);
|
2011-07-28 12:36:40 +02:00
|
|
|
|
|
|
|
|
|
/* If we have string like output ... */
|
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 20:51:26 +02:00
|
|
|
|
if (output)
|
|
|
|
|
{
|
2010-10-15 20:54:13 +02:00
|
|
|
|
make_cleanup_py_decref (output);
|
|
|
|
|
|
2011-07-28 12:36:40 +02:00
|
|
|
|
/* If this is a lazy string, extract it. For lazy
|
|
|
|
|
strings we always print as a string, so set
|
|
|
|
|
string_print. */
|
2010-01-14 09:03:37 +01:00
|
|
|
|
if (gdbpy_is_lazy_string (output))
|
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 20:51:26 +02:00
|
|
|
|
{
|
2010-10-15 20:54:13 +02:00
|
|
|
|
gdbpy_extract_lazy_string (output, &str_addr, &type,
|
|
|
|
|
&len, &encoding);
|
|
|
|
|
make_cleanup (free_current_contents, &encoding);
|
2010-01-14 09:03:37 +01:00
|
|
|
|
string_print = 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2011-07-28 12:36:40 +02:00
|
|
|
|
/* If it is a regular (non-lazy) string, extract
|
|
|
|
|
it and copy the contents into THEVALUE. If the
|
|
|
|
|
hint says to print it as a string, set
|
|
|
|
|
string_print. Otherwise just return the extracted
|
|
|
|
|
string as a value. */
|
|
|
|
|
|
2010-01-14 09:03:37 +01:00
|
|
|
|
PyObject *py_str
|
|
|
|
|
= python_string_to_target_python_string (output);
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2010-01-14 09:03:37 +01:00
|
|
|
|
if (py_str)
|
|
|
|
|
{
|
|
|
|
|
char *s = PyString_AsString (py_str);
|
2011-07-28 12:36:40 +02:00
|
|
|
|
char *hint;
|
|
|
|
|
|
|
|
|
|
hint = gdbpy_get_display_hint (value_formatter);
|
|
|
|
|
if (hint)
|
|
|
|
|
{
|
|
|
|
|
if (!strcmp (hint, "string"))
|
|
|
|
|
string_print = 1;
|
|
|
|
|
xfree (hint);
|
|
|
|
|
}
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2010-01-14 09:03:37 +01:00
|
|
|
|
len = PyString_Size (py_str);
|
|
|
|
|
thevalue = xmemdup (s, len + 1, len + 1);
|
|
|
|
|
type = builtin_type (gdbarch)->builtin_char;
|
|
|
|
|
Py_DECREF (py_str);
|
2010-10-15 20:54:13 +02:00
|
|
|
|
|
|
|
|
|
if (!string_print)
|
|
|
|
|
{
|
|
|
|
|
do_cleanups (old_chain);
|
|
|
|
|
return thevalue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
make_cleanup (xfree, thevalue);
|
2010-01-14 09:03:37 +01:00
|
|
|
|
}
|
2010-10-13 15:24:40 +02:00
|
|
|
|
else
|
|
|
|
|
gdbpy_print_stack ();
|
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 20:51:26 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
2011-07-28 12:36:40 +02:00
|
|
|
|
/* If the printer returned a replacement value, set VALUE
|
|
|
|
|
to REPLACEMENT. If there is not a replacement value,
|
|
|
|
|
just use the value passed to this function. */
|
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 20:51:26 +02:00
|
|
|
|
if (replacement)
|
|
|
|
|
value = replacement;
|
2009-05-28 03:09:20 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
gdb
* varobj.c (value_get_print_value): Include valprint.h.
(value_get_print_value): Use get_formatted_print_options.
* value.h (struct value_print_options): Declare.
(value_print, val_print, common_val_print, val_print_string):
Update.
* value.c: Include valprint.h.
(show_values): Use get_user_print_options.
(show_convenience): Likewise.
* valprint.h (prettyprint_arrays, prettyprint_structs): Don't
declare.
(struct value_print_options): New type.
(vtblprint, unionprint, addressprint, objectprint, print_max,
inspect_it, repeat_count_threshold, output_format,
stop_print_at_null): Don't declare.
(user_print_options, get_user_print_options,
get_raw_print_options, get_formatted_print_options): Declare.
(print_array_indexes_p): Don't declare.
(maybe_print_array_index, val_print_array_elements): Update.
* valprint.c (print_max): Remove.
(user_print_options): New global.
(get_user_print_options, get_raw_print_options,
get_formatted_print_options): New functions.
(print_array_indexes, repeat_count_threshold, stop_print_at_null,
prettyprint_structs, prettyprint_arrays, unionprint,
addressprint): Remove.
(val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(common_val_print): Likewise.
(print_array_indexes_p): Remove.
(maybe_print_array_index): Remove format, pretty arguments; add
options. Update.
(val_print_array_elements): Remove format, deref_ref, pretty
arguments; add options. Update.
(val_print_string): Add options argument. Update.
(_initialize_valprint): Use user_print_options.
(output_format): Remove.
(set_output_radix_1): Use user_print_options.
* typeprint.c: Include valprint.h.
(objectprint): Don't declare.
(whatis_exp): Use get_user_print_options.
* tui/tui-regs.c: Include valprint.h.
(tui_register_format): Use get_formatted_print_options.
* tracepoint.c: Include valprint.h.
(addressprint): Don't declare.
(trace_mention): Use get_user_print_options.
(tracepoints_info): Likewise.
* stack.c (print_frame_args): Use get_raw_print_options.
(print_frame_info): Use get_user_print_options.
(print_frame): Likewise.
* sh64-tdep.c: Include valprint.h
(sh64_do_register): Use get_formatted_print_options.
* scm-valprint.c (scm_inferior_print): Remove format, deref_ref,
pretty arguments; add options.
(scm_scmlist_print): Likewise. Update.
(scm_scmval_print): Likewise.
(scm_val_print): Likewise.
(scm_value_print): Remove format, pretty arguments; add options.
Update.
* scm-lang.h (scm_value_print, scm_val_print, scm_scmval_print):
Update.
* scm-lang.c (scm_printstr): Add options argument.
* python/python-value.c: Include valprint.h.
(valpy_str): Use get_user_print_options.
* printcmd.c: Include valprint.h.
(addressprint): Don't declare.
(inspect_it): Remove.
(print_formatted): Remove format option; add options. Update.
(print_scalar_formatted): Likewise.
(print_address_demangle): Use get_user_print_options.
(do_examine): Use get_formatted_print_options.
(print_command_1): Likewise.
(output_command): Use get_formatted_print_options.
(do_one_display): Likewise.
(print_variable_value): Use get_user_print_options.
* p-valprint.c (pascal_val_print): Remove format, deref_ref,
pretty arguments; add options. Update.
(pascal_value_print): Remove format, pretty arguments; add
options. Update.
(vtblprint, objectprint): Don't declare.
(pascal_static_field_print): Remove.
(pascal_object_print_value_fields): Remove format, pretty
arguments; add options. Update.
(pascal_object_print_static_field): Likewise.
(_initialize_pascal_valprint): Use user_print_options. Update.
* p-lang.h (pascal_val_print, pascal_value_print,
pascal_printstr, pascal_object_print_value_fields): Update.
(vtblprint, static_field_print): Don't declare.
* p-lang.c (pascal_printstr): Add options argument. Update.
* objc-lang.c (objc_printstr): Add options argument. Update.
* mt-tdep.c: Include valprint.h.
(mt_registers_info): Use get_raw_print_options.
* mips-tdep.c: Include valprint.h.
(mips_print_fp_register): Use get_formatted_print_options.
(mips_print_register): Likewise.
* mi/mi-main.c: Include valprint.h.
(get_register): Use get_user_print_options.
(mi_cmd_data_evaluate_expression): Likewise.
(mi_cmd_data_read_memory): Use get_formatted_print_options.
* mi/mi-cmd-stack.c: Include valprint.h.
(list_args_or_locals): Use get_raw_print_options.
* m2-valprint.c (print_function_pointer_address): Add addressprint
argument.
(m2_print_long_set): Remove format, pretty arguments.
(m2_print_unbounded_array): Remove format, deref_ref, pretty
arguments; add options. Update.
(print_unpacked_pointer): Remove format argument; add options.
Now static. Update.
(print_variable_at_address): Remove format, deref_ref, pretty
arguments; add options. Update.
(m2_print_array_contents): Likewise.
(m2_val_print): Likewise.
* m2-lang.h (m2_val_print): Update.
* m2-lang.c (m2_printstr): Add options argument. Update.
* language.h (struct value_print_options): Declare.
(struct language_defn) <la_printstr>: Add options argument.
<la_val_print>: Remove format, deref_ref, pretty argument; add
options.
<la_value_print>: Remove format, pretty arguments; add options.
<la_print_array_index>: Likewise.
(LA_VAL_PRINT, LA_VALUE_PRINT, LA_PRINT_STRING,
LA_PRINT_ARRAY_INDEX): Update.
(default_print_array_index): Update.
* language.c (default_print_array_index): Remove format, pretty
arguments; add options. Update.
(unk_lang_printstr): Add options argument.
(unk_lang_val_print): Remove format, deref_ref, pretty arguments;
add options.
(unk_lang_value_print): Remove format, pretty arguments; add
options.
* jv-valprint.c (java_value_print): Remove format, pretty
arguments; add options. Update.
(java_print_value_fields): Likewise.
(java_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
* jv-lang.h (java_val_print, java_value_print): Declare.
* infcmd.c: Include valprint.h.
(print_return_value): Use get_raw_print_options.
(default_print_registers_info): Use get_user_print_options,
get_formatted_print_options.
(registers_info): Use get_formatted_print_options.
* gdbtypes.h (struct value_print_options): Declare.
(print_scalar_formatted): Update.
* f-valprint.c (f77_print_array_1): Remove format, deref_ref,
pretty arguments; add options. Update.
(f77_print_array): Likewise.
(f_val_print): Likewise.
* f-lang.h (f_val_print): Update.
* f-lang.c (f_printstr): Add options argument. Update.
(c_value_print): Update declaration.
* expprint.c: Include valprint.h.
(print_subexp_standard): Use get_raw_print_options,
get_user_print_options.
* eval.c: Include valprint.h.
(objectprint): Don't declare.
(evaluate_subexp_standard): Use get_user_print_options.
* cp-valprint.c (vtblprint, objectprint, static_field_print):
Remove.
(cp_print_value_fields): Remove format, pretty arguments; add
options. Update.
(cp_print_value): Likewise.
(cp_print_static_field): Likewise.
(_initialize_cp_valprint): Use user_print_options. Update.
* c-valprint.c (print_function_pointer_address): Add addressprint
argument.
(c_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(c_value_print): Add options argument. Update.
* c-lang.h (c_val_print, c_value_print, c_printstr): Update.
(vtblprint, static_field_print): Don't declare.
(cp_print_value_fields): Update.
* c-lang.c (c_printstr): Add options argument. Update.
* breakpoint.c: Include valprint.h.
(addressprint): Don't declare.
(watchpoint_value_print): Use get_user_print_options.
(print_one_breakpoint_location): Likewise.
(breakpoint_1, print_it_catch_fork, print_it_catch_vfork, mention,
print_exception_catchpoint): Likewise.
* auxv.c (fprint_target_auxv): Don't declare addressprint. Use
get_user_print_options.
* ada-valprint.c (struct ada_val_print_args): Remove format,
deref_ref, and pretty; add options.
(print_optional_low_bound): Add options argument.
(val_print_packed_array_elements): Remove format and pretty
arguments; add options. Update.
(printstr): Add options argument. Update.
(ada_printstr): Likewise.
(ada_val_print): Remove format, deref_ref, pretty arguments; add
options argument. Update.
(ada_val_print_stub): Update.
(ada_val_print_array): Remove format, deref_ref, pretty arguments;
add options. Update.
(ada_val_print_1): Likewise.
(print_variant_part): Likewise.
(ada_value_print): Remove format, pretty arguments; add options.
Update.
(print_record): Likewise.
(print_field_values): Likewise.
* ada-lang.h (ada_val_print, ada_value_print, ada_printstr):
Update.
* ada-lang.c (ada_print_array_index): Add options argument; remove
format and pretty arguments.
(print_one_exception): Use get_user_print_options.
gdb/testsuite
* gdb.base/exprs.exp (test_expr): Add enum formatting tests.
2008-10-28 18:19:58 +01:00
|
|
|
|
get_formatted_print_options (&opts, format_code[(int) format]);
|
|
|
|
|
opts.deref_ref = 0;
|
2009-05-28 03:09:20 +02:00
|
|
|
|
opts.raw = 1;
|
2011-07-28 12:36:40 +02:00
|
|
|
|
|
|
|
|
|
/* If the THEVALUE has contents, it is a regular string. */
|
2009-05-28 03:09:20 +02:00
|
|
|
|
if (thevalue)
|
2010-10-15 20:54:13 +02:00
|
|
|
|
LA_PRINT_STRING (stb, type, thevalue, len, encoding, 0, &opts);
|
|
|
|
|
else if (string_print)
|
2011-07-28 12:36:40 +02:00
|
|
|
|
/* Otherwise, if string_print is set, and it is not a regular
|
|
|
|
|
string, it is a lazy string. */
|
2010-10-15 20:54:13 +02:00
|
|
|
|
val_print_string (type, encoding, str_addr, len, stb, &opts);
|
2009-05-28 03:09:20 +02:00
|
|
|
|
else
|
2011-07-28 12:36:40 +02:00
|
|
|
|
/* All other cases. */
|
2009-05-28 03:09:20 +02:00
|
|
|
|
common_val_print (value, stb, 0, &opts, current_language);
|
2011-07-28 12:36:40 +02:00
|
|
|
|
|
2009-08-14 02:32:33 +02:00
|
|
|
|
thevalue = ui_file_xstrdup (stb, NULL);
|
2007-01-09 00:11:47 +01:00
|
|
|
|
|
2007-01-05 22:52:33 +01:00
|
|
|
|
do_cleanups (old_chain);
|
|
|
|
|
return thevalue;
|
|
|
|
|
}
|
|
|
|
|
|
2007-11-20 20:54:39 +01:00
|
|
|
|
int
|
|
|
|
|
varobj_editable_p (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
struct type *type;
|
|
|
|
|
|
|
|
|
|
if (!(var->root->is_valid && var->value && VALUE_LVAL (var->value)))
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
type = get_value_type (var);
|
|
|
|
|
|
|
|
|
|
switch (TYPE_CODE (type))
|
|
|
|
|
{
|
|
|
|
|
case TYPE_CODE_STRUCT:
|
|
|
|
|
case TYPE_CODE_UNION:
|
|
|
|
|
case TYPE_CODE_ARRAY:
|
|
|
|
|
case TYPE_CODE_FUNC:
|
|
|
|
|
case TYPE_CODE_METHOD:
|
|
|
|
|
return 0;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
return 1;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-03-28 23:31:29 +02:00
|
|
|
|
/* Call VAR's value_is_changeable_p language-specific callback. */
|
2006-11-28 18:23:10 +01:00
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
static int
|
2007-01-04 20:06:15 +01:00
|
|
|
|
varobj_value_is_changeable_p (struct varobj *var)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2012-03-28 23:31:29 +02:00
|
|
|
|
return var->root->lang->value_is_changeable_p (var);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
2008-03-26 15:51:28 +01:00
|
|
|
|
/* Return 1 if that varobj is floating, that is is always evaluated in the
|
|
|
|
|
selected frame, and not bound to thread/frame. Such variable objects
|
|
|
|
|
are created using '@' as frame specifier to -var-create. */
|
|
|
|
|
int
|
|
|
|
|
varobj_floating_p (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
return var->root->floating;
|
|
|
|
|
}
|
|
|
|
|
|
2007-01-24 12:08:47 +01:00
|
|
|
|
/* Given the value and the type of a variable object,
|
|
|
|
|
adjust the value and type to those necessary
|
|
|
|
|
for getting children of the variable object.
|
|
|
|
|
This includes dereferencing top-level references
|
|
|
|
|
to all types and dereferencing pointers to
|
2011-01-12 02:23:29 +01:00
|
|
|
|
structures.
|
2007-01-24 12:08:47 +01:00
|
|
|
|
|
2012-04-14 14:18:50 +02:00
|
|
|
|
If LOOKUP_ACTUAL_TYPE is set the enclosing type of the
|
|
|
|
|
value will be fetched and if it differs from static type
|
|
|
|
|
the value will be casted to it.
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
Both TYPE and *TYPE should be non-null. VALUE
|
2007-01-24 12:08:47 +01:00
|
|
|
|
can be null if we want to only translate type.
|
|
|
|
|
*VALUE can be null as well -- if the parent
|
2011-01-12 02:23:29 +01:00
|
|
|
|
value is not known.
|
2007-08-31 20:52:05 +02:00
|
|
|
|
|
|
|
|
|
If WAS_PTR is not NULL, set *WAS_PTR to 0 or 1
|
2009-05-28 03:09:20 +02:00
|
|
|
|
depending on whether pointer was dereferenced
|
2007-08-31 20:52:05 +02:00
|
|
|
|
in this function. */
|
2007-01-24 12:08:47 +01:00
|
|
|
|
static void
|
|
|
|
|
adjust_value_for_child_access (struct value **value,
|
2007-08-31 20:52:05 +02:00
|
|
|
|
struct type **type,
|
2012-04-14 14:18:50 +02:00
|
|
|
|
int *was_ptr,
|
|
|
|
|
int lookup_actual_type)
|
2007-01-24 12:08:47 +01:00
|
|
|
|
{
|
|
|
|
|
gdb_assert (type && *type);
|
|
|
|
|
|
2007-08-31 20:52:05 +02:00
|
|
|
|
if (was_ptr)
|
|
|
|
|
*was_ptr = 0;
|
|
|
|
|
|
2007-01-24 12:08:47 +01:00
|
|
|
|
*type = check_typedef (*type);
|
|
|
|
|
|
|
|
|
|
/* The type of value stored in varobj, that is passed
|
|
|
|
|
to us, is already supposed to be
|
|
|
|
|
reference-stripped. */
|
|
|
|
|
|
|
|
|
|
gdb_assert (TYPE_CODE (*type) != TYPE_CODE_REF);
|
|
|
|
|
|
|
|
|
|
/* Pointers to structures are treated just like
|
|
|
|
|
structures when accessing children. Don't
|
|
|
|
|
dererences pointers to other types. */
|
|
|
|
|
if (TYPE_CODE (*type) == TYPE_CODE_PTR)
|
|
|
|
|
{
|
|
|
|
|
struct type *target_type = get_target_type (*type);
|
|
|
|
|
if (TYPE_CODE (target_type) == TYPE_CODE_STRUCT
|
|
|
|
|
|| TYPE_CODE (target_type) == TYPE_CODE_UNION)
|
|
|
|
|
{
|
|
|
|
|
if (value && *value)
|
2008-01-29 20:18:18 +01:00
|
|
|
|
{
|
2012-01-09 21:27:49 +01:00
|
|
|
|
volatile struct gdb_exception except;
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2012-01-09 21:27:49 +01:00
|
|
|
|
TRY_CATCH (except, RETURN_MASK_ERROR)
|
|
|
|
|
{
|
|
|
|
|
*value = value_ind (*value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (except.reason < 0)
|
2008-01-29 20:18:18 +01:00
|
|
|
|
*value = NULL;
|
|
|
|
|
}
|
2007-01-24 12:08:47 +01:00
|
|
|
|
*type = target_type;
|
2007-08-31 20:52:05 +02:00
|
|
|
|
if (was_ptr)
|
|
|
|
|
*was_ptr = 1;
|
2007-01-24 12:08:47 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The 'get_target_type' function calls check_typedef on
|
|
|
|
|
result, so we can immediately check type code. No
|
|
|
|
|
need to call check_typedef here. */
|
2012-04-14 14:18:50 +02:00
|
|
|
|
|
|
|
|
|
/* Access a real type of the value (if necessary and possible). */
|
|
|
|
|
if (value && *value && lookup_actual_type)
|
|
|
|
|
{
|
|
|
|
|
struct type *enclosing_type;
|
|
|
|
|
int real_type_found = 0;
|
|
|
|
|
|
|
|
|
|
enclosing_type = value_actual_type (*value, 1, &real_type_found);
|
|
|
|
|
if (real_type_found)
|
|
|
|
|
{
|
|
|
|
|
*type = enclosing_type;
|
|
|
|
|
*value = value_cast (enclosing_type, *value);
|
|
|
|
|
}
|
|
|
|
|
}
|
2007-01-24 12:08:47 +01:00
|
|
|
|
}
|
|
|
|
|
|
2012-03-28 23:31:29 +02:00
|
|
|
|
/* Implement the "value_is_changeable_p" varobj callback for most
|
|
|
|
|
languages. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
default_value_is_changeable_p (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
int r;
|
|
|
|
|
struct type *type;
|
|
|
|
|
|
|
|
|
|
if (CPLUS_FAKE_CHILD (var))
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
type = get_value_type (var);
|
|
|
|
|
|
|
|
|
|
switch (TYPE_CODE (type))
|
|
|
|
|
{
|
|
|
|
|
case TYPE_CODE_STRUCT:
|
|
|
|
|
case TYPE_CODE_UNION:
|
|
|
|
|
case TYPE_CODE_ARRAY:
|
|
|
|
|
r = 0;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
r = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return r;
|
|
|
|
|
}
|
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
/* C */
|
2012-03-28 23:31:29 +02:00
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
static int
|
2000-07-30 03:48:28 +02:00
|
|
|
|
c_number_of_children (struct varobj *var)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2007-01-24 12:08:47 +01:00
|
|
|
|
struct type *type = get_value_type (var);
|
|
|
|
|
int children = 0;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
struct type *target;
|
|
|
|
|
|
2012-04-14 14:18:50 +02:00
|
|
|
|
adjust_value_for_child_access (NULL, &type, NULL, 0);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
target = get_target_type (type);
|
|
|
|
|
|
|
|
|
|
switch (TYPE_CODE (type))
|
|
|
|
|
{
|
|
|
|
|
case TYPE_CODE_ARRAY:
|
|
|
|
|
if (TYPE_LENGTH (type) > 0 && TYPE_LENGTH (target) > 0
|
gdb/
Replace TYPE_ARRAY_{UPPER,LOWER}_BOUND_TYPE by a bit if {un,}defined.
* c-typeprint.c (c_type_print_varspec_suffix), m2-typeprint.c
(m2_array), p-typeprint.c (pascal_type_print_varspec_prefix),
valops.c (value_cast), varobj.c (c_number_of_children): Replace
TYPE_ARRAY_UPPER_BOUND_TYPE compared to BOUND_CANNOT_BE_DETERMINED by
TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED.
* parse.c (follow_types): Use TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED.
* f-valprint.c (f77_get_dynamic_upperbound): Replace with ...
(f77_get_upperbound): ... this function handling now only
TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED.
(f77_get_dynamic_lowerbound): Replace with ...
(f77_get_lowerbound): ... this function handling now only
TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED.
(f77_get_dynamic_length_of_aggregate, f77_create_arrayprint_offset_tbl):
Update their callers.
* eval.c (evaluate_subexp_standard): Update their callers.
* f-lang.h (f77_get_dynamic_upperbound, f77_get_upperbound)
(f77_get_dynamic_lowerbound, f77_get_lowerbound): Update their
prototypes.
(BOUND_FETCH_OK, BOUND_FETCH_ERROR): Remove.
* f-typeprint.c (f_type_print_varspec_suffix, f_type_print_base): Remove
the lower_bound_was_default variable. Update the
f77_get_dynamic_upperbound, f77_get_upperbound and
TYPE_ARRAY_UPPER_BOUND_TYPE calls.
* gdbtypes.c (print_bound_type): Remove the function.
(recursive_dump_type): Remove its calls printing UPPER_BOUND_TYPE and
LOWER_BOUND_TYPE.
* gdbtypes.h (enum array_bound_type): Remove.
(struct main_type): Remove the fields upper_bound_type and
lower_bound_type. Comment the new overload of the field artificial.
(TYPE_ARRAY_UPPER_BOUND_TYPE): Replace by ...
(TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED): ... this macro.
(TYPE_ARRAY_LOWER_BOUND_TYPE): Replace by ...
(TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED): ... this macro.
gdb/testsuite/
* gdb.base/maint.exp (maint print type): Remove printing
UPPER_BOUND_TYPE and LOWER_BOUND_TYPE.
2008-10-03 00:06:08 +02:00
|
|
|
|
&& !TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (type))
|
2000-02-03 05:14:45 +01:00
|
|
|
|
children = TYPE_LENGTH (type) / TYPE_LENGTH (target);
|
|
|
|
|
else
|
2007-01-04 22:55:04 +01:00
|
|
|
|
/* If we don't know how many elements there are, don't display
|
|
|
|
|
any. */
|
|
|
|
|
children = 0;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_STRUCT:
|
|
|
|
|
case TYPE_CODE_UNION:
|
|
|
|
|
children = TYPE_NFIELDS (type);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_PTR:
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* The type here is a pointer to non-struct. Typically, pointers
|
2007-01-24 12:08:47 +01:00
|
|
|
|
have one child, except for function ptrs, which have no children,
|
|
|
|
|
and except for void*, as we don't know what to show.
|
|
|
|
|
|
2001-05-10 18:44:56 +02:00
|
|
|
|
We can show char* so we allow it to be dereferenced. If you decide
|
|
|
|
|
to test for it, please mind that a little magic is necessary to
|
|
|
|
|
properly identify it: char* has TYPE_CODE == TYPE_CODE_INT and
|
2011-01-12 02:23:29 +01:00
|
|
|
|
TYPE_NAME == "char". */
|
2007-01-24 12:08:47 +01:00
|
|
|
|
if (TYPE_CODE (target) == TYPE_CODE_FUNC
|
|
|
|
|
|| TYPE_CODE (target) == TYPE_CODE_VOID)
|
|
|
|
|
children = 0;
|
|
|
|
|
else
|
|
|
|
|
children = 1;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Other types have no children. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return children;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static char *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
c_name_of_variable (struct varobj *parent)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
gdb/
Replace the savestring calls by xstrdup calls where possible.
* breakpoint.c (condition_command, set_raw_breakpoint)
(create_catchpoint, update_breakpoint_locations): Replace the
savestring calls by xstrdup calls where possible.
* buildsym.c (start_subfile, patch_subfile_names, record_debugformat)
(record_producer): Likewise.
* coffread.c (coff_start_symtab, complete_symtab): Likewise.
* corefile.c (set_gnutarget): Likewise.
* dbxread.c (add_new_header_file): Likewise.
* demangle.c (set_demangling_command, set_demangling_style): Likewise.
* event-top.c (push_prompt, pop_prompt, command_line_handler)
(set_async_prompt): Likewise.
* infcmd.c (set_inferior_io_terminal, attach_command_post_wait):
Likewise.
* language.c (set_language_command, _initialize_language): Likewise.
* linespec.c (decode_line_2): Likewise.
* rs6000-nat.c (add_vmap): Likewise.
* top.c (set_prompt, init_history, init_main): Likewise.
* tracepoint.c (stringify_collection_list): Likewise.
* varobj.c (varobj_create): Remove variable expr_len. Replace the
savestring calls by xstrdup calls where possible.
(value_of_root, c_name_of_variable, c_describe_child): Replace the
savestring calls by xstrdup calls where possible.
* xcoffread.c (complete_symtab): Likewise.
* cli/cli-script.c (build_command_line, define_command): Likewise.
* cli/cli-setshow.c (do_setshow_command): Likewise.
2009-05-23 18:17:18 +02:00
|
|
|
|
return xstrdup (parent->name);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
2007-01-04 20:27:50 +01:00
|
|
|
|
/* Return the value of element TYPE_INDEX of a structure
|
|
|
|
|
value VALUE. VALUE's type should be a structure,
|
2011-01-12 02:23:29 +01:00
|
|
|
|
or union, or a typedef to struct/union.
|
2007-01-04 20:27:50 +01:00
|
|
|
|
|
|
|
|
|
Returns NULL if getting the value fails. Never throws. */
|
|
|
|
|
static struct value *
|
|
|
|
|
value_struct_element_index (struct value *value, int type_index)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2007-01-04 20:27:50 +01:00
|
|
|
|
struct value *result = NULL;
|
|
|
|
|
volatile struct gdb_exception e;
|
|
|
|
|
struct type *type = value_type (value);
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2007-01-04 20:27:50 +01:00
|
|
|
|
type = check_typedef (type);
|
|
|
|
|
|
|
|
|
|
gdb_assert (TYPE_CODE (type) == TYPE_CODE_STRUCT
|
|
|
|
|
|| TYPE_CODE (type) == TYPE_CODE_UNION);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2007-01-04 20:27:50 +01:00
|
|
|
|
TRY_CATCH (e, RETURN_MASK_ERROR)
|
|
|
|
|
{
|
Convert static_kind into loc_kind enum.
* gdbtypes.h (enum field_loc_kind): New.
(union field_location): New field dwarf_block.
(struct field): Rename static_kind as loc_kind.
(FIELD_STATIC_KIND): Rename to ...
(FIELD_LOC_KIND): ... here.
(TYPE_FIELD_STATIC_KIND): Rename to ...
(TYPE_FIELD_LOC_KIND): ... here and use there now new FIELD_LOC_KIND.
(TYPE_FIELD_STATIC_HAS_ADDR): Remove.
(TYPE_FIELD_STATIC): Remove.
(TYPE_FIELD_BITPOS): Reformat.
(SET_FIELD_BITPOS): New.
(FIELD_PHYSADDR): Rename to ...
(FIELD_STATIC_PHYSADDR): ... here.
(TYPE_FIELD_STATIC_PHYSADDR): Follow the FIELD_PHYSADDR rename.
(SET_FIELD_PHYSADDR): Use new FIELD_LOC_KIND.
(FIELD_PHYSNAME): Rename to ...
(FIELD_STATIC_PHYSNAME): ... here.
(TYPE_FIELD_STATIC_PHYSNAME): Follow the FIELD_PHYSNAME rename.
(SET_FIELD_PHYSNAME): Use new FIELD_LOC_KIND.
(FIELD_DWARF_BLOCK, TYPE_FIELD_DWARF_BLOCK, SET_FIELD_DWARF_BLOCK): New.
(field_is_static): New declaration.
* gdbtypes.c (field_is_static): New function.
(copy_type_recursive): Update throughout.
* amd64-tdep.c, c-typeprint.c, coffread.c, cp-valprint.c, dwarf2read.c,
eval.c, jv-typeprint.c, jv-valprint.c, mdebugread.c, p-typeprint.c,
p-valprint.c, valops.c, value.c, varobj.c: Update throughout.
2008-10-08 14:49:13 +02:00
|
|
|
|
if (field_is_static (&TYPE_FIELD (type, type_index)))
|
2007-01-04 20:27:50 +01:00
|
|
|
|
result = value_static_field (type, type_index);
|
|
|
|
|
else
|
|
|
|
|
result = value_primitive_field (value, 0, type_index, type);
|
|
|
|
|
}
|
|
|
|
|
if (e.reason < 0)
|
|
|
|
|
{
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Obtain the information about child INDEX of the variable
|
2011-01-12 02:23:29 +01:00
|
|
|
|
object PARENT.
|
2007-01-04 20:27:50 +01:00
|
|
|
|
If CNAME is not null, sets *CNAME to the name of the child relative
|
|
|
|
|
to the parent.
|
|
|
|
|
If CVALUE is not null, sets *CVALUE to the value of the child.
|
|
|
|
|
If CTYPE is not null, sets *CTYPE to the type of the child.
|
|
|
|
|
|
|
|
|
|
If any of CNAME, CVALUE, or CTYPE is not null, but the corresponding
|
|
|
|
|
information cannot be determined, set *CNAME, *CVALUE, or *CTYPE
|
|
|
|
|
to NULL. */
|
|
|
|
|
static void
|
|
|
|
|
c_describe_child (struct varobj *parent, int index,
|
2007-08-31 20:52:05 +02:00
|
|
|
|
char **cname, struct value **cvalue, struct type **ctype,
|
|
|
|
|
char **cfull_expression)
|
2007-01-04 20:27:50 +01:00
|
|
|
|
{
|
|
|
|
|
struct value *value = parent->value;
|
2007-01-24 12:08:47 +01:00
|
|
|
|
struct type *type = get_value_type (parent);
|
2007-08-31 20:52:05 +02:00
|
|
|
|
char *parent_expression = NULL;
|
|
|
|
|
int was_ptr;
|
2012-01-09 21:27:49 +01:00
|
|
|
|
volatile struct gdb_exception except;
|
2007-01-04 20:27:50 +01:00
|
|
|
|
|
|
|
|
|
if (cname)
|
|
|
|
|
*cname = NULL;
|
|
|
|
|
if (cvalue)
|
|
|
|
|
*cvalue = NULL;
|
|
|
|
|
if (ctype)
|
|
|
|
|
*ctype = NULL;
|
2007-08-31 20:52:05 +02:00
|
|
|
|
if (cfull_expression)
|
|
|
|
|
{
|
|
|
|
|
*cfull_expression = NULL;
|
2012-01-12 23:51:10 +01:00
|
|
|
|
parent_expression = varobj_get_path_expr (get_path_expr_parent (parent));
|
2007-08-31 20:52:05 +02:00
|
|
|
|
}
|
2012-04-14 14:18:50 +02:00
|
|
|
|
adjust_value_for_child_access (&value, &type, &was_ptr, 0);
|
2007-01-04 20:27:50 +01:00
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
switch (TYPE_CODE (type))
|
|
|
|
|
{
|
|
|
|
|
case TYPE_CODE_ARRAY:
|
2007-01-04 20:27:50 +01:00
|
|
|
|
if (cname)
|
2011-01-05 23:22:53 +01:00
|
|
|
|
*cname
|
|
|
|
|
= xstrdup (int_string (index
|
|
|
|
|
+ TYPE_LOW_BOUND (TYPE_INDEX_TYPE (type)),
|
|
|
|
|
10, 1, 0, 0));
|
2007-01-04 20:27:50 +01:00
|
|
|
|
|
|
|
|
|
if (cvalue && value)
|
|
|
|
|
{
|
|
|
|
|
int real_index = index + TYPE_LOW_BOUND (TYPE_INDEX_TYPE (type));
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2012-01-09 21:27:49 +01:00
|
|
|
|
TRY_CATCH (except, RETURN_MASK_ERROR)
|
|
|
|
|
{
|
|
|
|
|
*cvalue = value_subscript (value, real_index);
|
|
|
|
|
}
|
2007-01-04 20:27:50 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ctype)
|
|
|
|
|
*ctype = get_target_type (type);
|
|
|
|
|
|
2007-08-31 20:52:05 +02:00
|
|
|
|
if (cfull_expression)
|
* dwarf2read.c (struct attribute): Increase sizes of unsnd and snd
fields to allow larger integer sizes.
(read_subrange_type): Increase size of bound values.
Add logic to determine signedness based on base-type size, signedness.
(read_attribute_value): Change format for bad byte size in message.
(read_8_bytes): Increase size of result type.
(dump_die_shallow): Change format for value.
(dwarf2_get_attr_constant_value): Increase size of return type.
Correct comment.
* gdbtypes.c (create_range_type): Change API to increase size of
bounds. struct field -> union field.
Always take signedness from base type.
(check_typedef): Use new API for TYPE_LOW_BOUND, TYPE_HIGH_BOUND.
(recursive_dump_type, copy_type_recursive): Adjust to new
representation of range types.
* gdbtypes.h (fields_or_bounds): New union containing struct field and
new struct range_bounds, used for range types.
(TYPE_RANGE_DATA): New macro to access range_bounds member.
(TYPE_LOW_BOUND, TYPE_HIGH_BOUND): Represent with new TYPE_RANGE_DATA.
(TYPE_LOW_BOUND_UNDEFINED, TYPE_HIGH_BOUND_UNDEFINED): New macros,
taking over the job of TYPE_FIELD_ARTIFICIAL for range bounds.
(SET_TYPE_LOW_BOUND, SET_TYPE_HIGH_BOUND, SET_TYPE_LOW_BOUND_DEFINED)
(SET_TYPE_HIGH_BOUND_DEFINED): New macros.
(TYPE_FIELDS, TYPE_BASECLASS, TYPE_BASECLASS_NAME, TYPE_FIELD)
(TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED)
(TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED, TYPE_ARRAY_UPPER_BOUND_VALUE)
(TYPE_ARRAY_LOWER_BOUND_VALUE): Adjust to new representation.
(create_range_type): Adjust API.
* ada-lang.c (ada_modulus): Use new extended bound values.
(discrete_type_low_bound): Rename to...
(ada_discrete_type_low_bound): ... and make external.
(discrete_type_high_bound): Rename to...
(ada_discrete_type_high_bound): ... and make external.
(ada_value_slice_from_ptr, ada_array_bound_from_type)
(ada_evaluate_subexp, to_fixed_range_type):
Use ada_discrete_type_low_bound, ada_discrete_type_high_bound.
* ada-typeprint.c (print_range): Use ada_discrete_type_low_bound,
ada_discrete_type_high_bound. Don't look at field count, which
is no longer meaningful. Print bounds whenever argument is a range
or enumeration.
* ada-lang.h (ada_discrete_type_low_bound,ada_discrete_type_high_bound):
Declare.
* varobj.c (c_describe_child): Adjust to render larger values.
* mdebugread.c (parse_type): Use proper abstractions for range types:
TYPE_RANGE_DATA, SET_TYPE_LOW_BOUND_DEFINED,
SET_TYPE_HIGH_BOUND_DEFINED.
* p-typeprint.c (pascal_type_print_varspec_prefix): Use larger format
for bounds.
2009-12-14 07:19:13 +01:00
|
|
|
|
*cfull_expression =
|
|
|
|
|
xstrprintf ("(%s)[%s]", parent_expression,
|
|
|
|
|
int_string (index
|
|
|
|
|
+ TYPE_LOW_BOUND (TYPE_INDEX_TYPE (type)),
|
|
|
|
|
10, 1, 0, 0));
|
2007-08-31 20:52:05 +02:00
|
|
|
|
|
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_STRUCT:
|
|
|
|
|
case TYPE_CODE_UNION:
|
2012-01-12 23:51:10 +01:00
|
|
|
|
{
|
* gdbtypes.h (struct main_type): Change type of name,tag_name,
and fields.name members from char * to const char *. All uses updated.
(struct cplus_struct_type): Change type of fn_fieldlists.name member
from char * to const char *. All uses updated.
(type_name_no_tag): Update.
(lookup_unsigned_typename, lookup_signed_typename): Update.
* gdbtypes.c (type_name_no_tag): Change result type
from char * to const char *. All callers updated.
(lookup_unsigned_typename, lookup_signed_typename): Change type of
name parameter from char * to const char *.
* symtab.h (struct cplus_specific): Change type of demangled_name
member from char * to const char *. All uses updated.
(struct general_symbol_info): Change type of name and
mangled_lang.demangled_name members from char * to const char *.
All uses updated.
(symbol_get_demangled_name, symbol_natural_name): Update.
(symbol_demangled_name, symbol_search_name): Update.
* symtab.c (symbol_get_demangled_name): Change result type
from char * to const char *. All callers updated.
(symbol_natural_name, symbol_demangled_name): Ditto.
(symbol_search_name): Ditto.
(completion_list_add_name): Change type of symname,sym_text,
text,word parameters from char * to const char *.
(completion_list_objc_symbol): Change type of sym_text,
text,word parameters from char * to const char *.
* ada-lang.c (find_struct_field): Change type of name parameter
from char * to const char *.
(encoded_ordered_before): Similarly for N0,N1 parameters.
(old_renaming_is_invisible): Similarly for function_name parameter.
(ada_type_name): Change result type from char * to const char *.
All callers updated.
* ada-lang.h (ada_type_name): Update.
* buildsym.c (hashname): Change type of name parameter
from char * to const char *.
* buildsym.h (hashname): Update.
* dbxread.c (end_psymtab): Change type of include_list parameter
from char ** to const char **.
* dwarf2read.c (determine_prefix): Change result type
from char * to const char *. All callers updated.
* f-lang.c (find_common_for_function): Change type of name, funcname
parameters from char * to const char *.
* f-lang.c (find_common_for_function): Update.
* f-valprint.c (list_all_visible_commons): Change type of funcname
parameters from char * to const char *.
* gdbarch.sh (static_transform_name): Change type of name parameter
and result from char * to const char *.
* gdbarch.c: Regenerate.
* gdbarch.h: Regenerate.
* i386-sol2-tdep.c (i386_sol2_static_transform_name): Change type
of name parameter from char * to const char *.
* jv-lang.c (java_primitive_type_from_name): Ditto.
(java_demangled_signature_length): Similarly for signature parameter.
(java_demangled_signature_copy): Ditto.
(java_demangle_type_signature): Ditto.
* jv-lang.h (java_primitive_type_from_name): Update.
(java_demangle_type_signature): Update.
* objc-lang.c (specialcmp): Change type of a,b parameters
from char * to const char *.
* p-lang.c (is_pascal_string_type): Change type of arrayname parameter
from char * to const char *. All callers updated.
* p-lang.h (is_pascal_string_type): Update.
* solib-frv.c (find_canonical_descriptor_in_load_object): Change type
of name parameter from char * to const char *.
* sparc-sol2-tdep.c (sparc_sol2_static_transform_name): Ditto.
* utils.c (fprintf_symbol_filtered): Ditto.
* defs.h (fprintf_symbol_filtered): Update.
* sparc-tdep.h (sparc_sol2_static_transform_name): Update.
* stabsread.h (end_psymtab): Update.
* stack.c (find_frame_funname): Change type of funname parameter
from char ** to const char **.
* stack.h (find_frame_funname): Update.
* typeprint.c (type_print): Change type of varstring parameter
from char * to const char *.
* value.h (type_print): Update.
* xcoffread.c (xcoff_start_psymtab): Change type of filename parameter
from char * to const char *. All callers updated.
(xcoff_end_psymtab): Change type of include_list parameter
from char ** to const char **. All callers updated.
(swap_sym): Similarly for name parameter. All callers updated.
* coffread.c (patch_type): Add (char*) cast to xfree parameter.
Use xstrdup.
(process_coff_symbol): Use xstrdup.
* stabsread.c (stabs_method_name_from_physname): Renamed from
update_method_name_from_physname. Change result type from void
to char *. All callers updated.
(read_member_functions): In has_destructor case, store name in objfile
obstack instead of malloc space. In !has_stub case, fix mem leak.
2012-02-07 05:48:23 +01:00
|
|
|
|
const char *field_name;
|
2007-01-04 20:27:50 +01:00
|
|
|
|
|
2012-01-12 23:51:10 +01:00
|
|
|
|
/* If the type is anonymous and the field has no name,
|
|
|
|
|
set an appropriate name. */
|
|
|
|
|
field_name = TYPE_FIELD_NAME (type, index);
|
|
|
|
|
if (field_name == NULL || *field_name == '\0')
|
|
|
|
|
{
|
|
|
|
|
if (cname)
|
|
|
|
|
{
|
|
|
|
|
if (TYPE_CODE (TYPE_FIELD_TYPE (type, index))
|
|
|
|
|
== TYPE_CODE_STRUCT)
|
|
|
|
|
*cname = xstrdup (ANONYMOUS_STRUCT_NAME);
|
|
|
|
|
else
|
|
|
|
|
*cname = xstrdup (ANONYMOUS_UNION_NAME);
|
|
|
|
|
}
|
2007-01-04 20:27:50 +01:00
|
|
|
|
|
2012-01-12 23:51:10 +01:00
|
|
|
|
if (cfull_expression)
|
|
|
|
|
*cfull_expression = xstrdup ("");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (cname)
|
|
|
|
|
*cname = xstrdup (field_name);
|
2007-01-04 20:27:50 +01:00
|
|
|
|
|
2012-01-12 23:51:10 +01:00
|
|
|
|
if (cfull_expression)
|
|
|
|
|
{
|
|
|
|
|
char *join = was_ptr ? "->" : ".";
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2012-01-12 23:51:10 +01:00
|
|
|
|
*cfull_expression = xstrprintf ("(%s)%s%s", parent_expression,
|
|
|
|
|
join, field_name);
|
|
|
|
|
}
|
|
|
|
|
}
|
2007-08-31 20:52:05 +02:00
|
|
|
|
|
2012-01-12 23:51:10 +01:00
|
|
|
|
if (cvalue && value)
|
|
|
|
|
{
|
|
|
|
|
/* For C, varobj index is the same as type index. */
|
|
|
|
|
*cvalue = value_struct_element_index (value, index);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ctype)
|
|
|
|
|
*ctype = TYPE_FIELD_TYPE (type, index);
|
|
|
|
|
}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_PTR:
|
2007-01-04 20:27:50 +01:00
|
|
|
|
if (cname)
|
|
|
|
|
*cname = xstrprintf ("*%s", parent->name);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2007-01-04 20:27:50 +01:00
|
|
|
|
if (cvalue && value)
|
2008-01-29 20:18:18 +01:00
|
|
|
|
{
|
2012-01-09 21:27:49 +01:00
|
|
|
|
TRY_CATCH (except, RETURN_MASK_ERROR)
|
|
|
|
|
{
|
|
|
|
|
*cvalue = value_ind (value);
|
|
|
|
|
}
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2012-01-09 21:27:49 +01:00
|
|
|
|
if (except.reason < 0)
|
2008-01-29 20:18:18 +01:00
|
|
|
|
*cvalue = NULL;
|
|
|
|
|
}
|
2007-01-04 20:27:50 +01:00
|
|
|
|
|
2007-01-24 12:08:47 +01:00
|
|
|
|
/* Don't use get_target_type because it calls
|
|
|
|
|
check_typedef and here, we want to show the true
|
|
|
|
|
declared type of the variable. */
|
2007-01-04 20:27:50 +01:00
|
|
|
|
if (ctype)
|
2007-01-24 12:08:47 +01:00
|
|
|
|
*ctype = TYPE_TARGET_TYPE (type);
|
2007-08-31 20:52:05 +02:00
|
|
|
|
|
|
|
|
|
if (cfull_expression)
|
|
|
|
|
*cfull_expression = xstrprintf ("*(%s)", parent_expression);
|
2007-01-04 20:27:50 +01:00
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* This should not happen. */
|
2007-01-04 20:27:50 +01:00
|
|
|
|
if (cname)
|
|
|
|
|
*cname = xstrdup ("???");
|
2007-08-31 20:52:05 +02:00
|
|
|
|
if (cfull_expression)
|
|
|
|
|
*cfull_expression = xstrdup ("???");
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Don't set value and type, we don't know then. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
2007-01-04 20:27:50 +01:00
|
|
|
|
}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2007-01-04 20:27:50 +01:00
|
|
|
|
static char *
|
|
|
|
|
c_name_of_child (struct varobj *parent, int index)
|
|
|
|
|
{
|
|
|
|
|
char *name;
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2007-08-31 20:52:05 +02:00
|
|
|
|
c_describe_child (parent, index, &name, NULL, NULL, NULL);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
return name;
|
|
|
|
|
}
|
|
|
|
|
|
2007-08-31 20:52:05 +02:00
|
|
|
|
static char *
|
|
|
|
|
c_path_expr_of_child (struct varobj *child)
|
|
|
|
|
{
|
|
|
|
|
c_describe_child (child->parent, child->index, NULL, NULL, NULL,
|
|
|
|
|
&child->path_expr);
|
|
|
|
|
return child->path_expr;
|
|
|
|
|
}
|
|
|
|
|
|
2008-03-24 18:33:30 +01:00
|
|
|
|
/* If frame associated with VAR can be found, switch
|
|
|
|
|
to it and return 1. Otherwise, return 0. */
|
|
|
|
|
static int
|
|
|
|
|
check_scope (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
struct frame_info *fi;
|
|
|
|
|
int scope;
|
|
|
|
|
|
|
|
|
|
fi = frame_find_by_id (var->root->frame);
|
|
|
|
|
scope = fi != NULL;
|
|
|
|
|
|
|
|
|
|
if (fi)
|
|
|
|
|
{
|
|
|
|
|
CORE_ADDR pc = get_frame_pc (fi);
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2008-03-24 18:33:30 +01:00
|
|
|
|
if (pc < BLOCK_START (var->root->valid_block) ||
|
|
|
|
|
pc >= BLOCK_END (var->root->valid_block))
|
|
|
|
|
scope = 0;
|
|
|
|
|
else
|
|
|
|
|
select_frame (fi);
|
|
|
|
|
}
|
|
|
|
|
return scope;
|
|
|
|
|
}
|
|
|
|
|
|
2001-11-01 03:37:56 +01:00
|
|
|
|
static struct value *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
c_value_of_root (struct varobj **var_handle)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2007-01-04 22:59:10 +01:00
|
|
|
|
struct value *new_val = NULL;
|
2000-03-13 22:51:46 +01:00
|
|
|
|
struct varobj *var = *var_handle;
|
2008-03-24 18:33:30 +01:00
|
|
|
|
int within_scope = 0;
|
2008-03-23 10:53:52 +01:00
|
|
|
|
struct cleanup *back_to;
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Only root variables can be updated... */
|
2007-01-04 20:06:15 +01:00
|
|
|
|
if (!is_root_p (var))
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Not a root var. */
|
2000-03-13 22:51:46 +01:00
|
|
|
|
return NULL;
|
|
|
|
|
|
Exited threads.
* thread.c (enum thread_state): New.
(thread_state main_thread_running): Delete, in favor of...
(thread_state main_thread_state): ... this. Update throughout.
(clear_thread_inferior_resources): New, split from free_thread.
(free_thread): Call clear_thread_inferior_resources.
(init_thread_list): Set main thread to stopped state.
(add_thread_silent): Take care of PTID reuses.
(delete_thread): If deleting inferior_ptid or a thread with
refcount > 0, mark it as exited, but still keep it in the list.
Only notify of thread exits, if we haven't done so yet.
(iterate_over_threads): Make it safe to delete threads while
iterating over them.
(do_captured_list_thread_ids): Don't account for exited threads.
(thread_alive): Check for the THREAD_EXITED state, and don't set
ptid to -1 on exited threads.
(set_running): Update to account for extra possible states.
(is_thread_state): New.
(is_stopped, is_exited): New.
(is_running): Implement in terms of is_thread_state.
(any_running): Update.
(print_thread_info): Update. Account for exited threads. Don't
warn about missed frame restoring here, its done in the cleanup.
(switch_to_thread): Don't read from a thread that has gone.
(restore_current_thread): In non-stop mode, do a full context
switch.
(restore_selected_frame): Add a frame_level argument. Rewrite.
(struct current_thread_cleanup): Add selected_frame_level and
was_stopped members.
(do_restore_current_thread_cleanup): Check if thread was stopped
and still is, and if the target has registers, stack and memory
before restoring the selected frame. Don't delete the cleanup
argument here.
(restore_current_thread_cleanup_dtor): New.
(make_cleanup_restore_current_thread): Remove all arguments.
Rewrite.
(thread_apply_all_command): Update. Prune threads.
(thread_apply_command): Update.
(thread_command): Account for currently selected exited thread.
(do_captured_thread_select): Check for a running thread. Prune
threads.
(_initialize_thread): Make "info threads", "thread", "thread
apply", and "thread apply all" appliable without a selected thread.
* gdbthread.h (struct thread_info): Replace running_ by state_.
Add refcount.
(is_exited, is_stopped): Declare.
(make_cleanup_restore_current_thread): Remove all arguments.
* infrun.c: Include "event-top.h".
(fetch_inferior_event): In non-stop mode, restore selected thread
and frame after handling the event and running breakpoint
commands. Display GDB prompt if needed.
(normal_stop): In non-stop mode, don't print thread switching
notice.
* cli/cli-decode.c (set_cmd_no_selected_thread_ok)
(get_cmd_no_selected_thread_ok): New.
* cli/cli-decode.h (CMD_NO_SELECTED_THREAD_OK): New.
(set_cmd_no_selected_thread_ok, get_cmd_no_selected_thread_ok):
Declare.
* cli/cli-cmds.c: Set "pwd", "help", "info", "show" as
no-selected-thread ok.
* top.c (execute_command): Check for non no-selected-thread-ok
commands.
* linux-nat.c (struct saved_ptids, threads_to_delete)
(record_dead_thread, prune_lwps): Delete.
(exit_lwp): Unconditionally delete thread.
(linux_nat_resume): Remove prune_lwps call.
* infcmd.c (proceed_thread_callback): Check if !is_stopped instead
of is_running. Adjust to make_cleanup_restore_current_thread
interface change.
* mi/mi-main.c (mi_cmd_execute): Only allow a few commands if the
selected thread has exited.
* inf-loop.c (inferior_event_handler): Don't display the prompt
here.
* varobj.c (c_value_of_root): Update.
* defs.h (make_cleanup_dtor): Declare.
* utils.c (make_cleanup_dtor): New.
* Makefile.in (infrun.o): Depend on $(event_top_h).
2008-07-11 13:07:39 +02:00
|
|
|
|
back_to = make_cleanup_restore_current_thread ();
|
2001-11-01 03:22:21 +01:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Determine whether the variable is still around. */
|
2008-03-26 15:11:18 +01:00
|
|
|
|
if (var->root->valid_block == NULL || var->root->floating)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
within_scope = 1;
|
2008-03-24 18:33:30 +01:00
|
|
|
|
else if (var->root->thread_id == 0)
|
|
|
|
|
{
|
|
|
|
|
/* The program was single-threaded when the variable object was
|
|
|
|
|
created. Technically, it's possible that the program became
|
|
|
|
|
multi-threaded since then, but we don't support such
|
|
|
|
|
scenario yet. */
|
|
|
|
|
within_scope = check_scope (var);
|
|
|
|
|
}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
else
|
|
|
|
|
{
|
2008-03-24 18:33:30 +01:00
|
|
|
|
ptid_t ptid = thread_id_to_pid (var->root->thread_id);
|
|
|
|
|
if (in_thread_list (ptid))
|
2007-01-01 13:01:04 +01:00
|
|
|
|
{
|
2008-03-24 18:33:30 +01:00
|
|
|
|
switch_to_thread (ptid);
|
|
|
|
|
within_scope = check_scope (var);
|
|
|
|
|
}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
2001-11-01 03:22:21 +01:00
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
if (within_scope)
|
|
|
|
|
{
|
2012-01-09 21:27:49 +01:00
|
|
|
|
volatile struct gdb_exception except;
|
|
|
|
|
|
2000-03-13 22:51:46 +01:00
|
|
|
|
/* We need to catch errors here, because if evaluate
|
2007-01-24 20:54:13 +01:00
|
|
|
|
expression fails we want to just return NULL. */
|
2012-01-09 21:27:49 +01:00
|
|
|
|
TRY_CATCH (except, RETURN_MASK_ERROR)
|
|
|
|
|
{
|
|
|
|
|
new_val = evaluate_expression (var->root->exp);
|
|
|
|
|
}
|
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
return new_val;
|
|
|
|
|
}
|
|
|
|
|
|
2008-03-23 10:53:52 +01:00
|
|
|
|
do_cleanups (back_to);
|
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2001-11-01 03:37:56 +01:00
|
|
|
|
static struct value *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
c_value_of_child (struct varobj *parent, int index)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2007-01-04 20:27:50 +01:00
|
|
|
|
struct value *value = NULL;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2010-05-17 20:48:52 +02:00
|
|
|
|
c_describe_child (parent, index, NULL, &value, NULL, NULL);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
return value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct type *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
c_type_of_child (struct varobj *parent, int index)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2007-01-04 20:27:50 +01:00
|
|
|
|
struct type *type = NULL;
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2007-08-31 20:52:05 +02:00
|
|
|
|
c_describe_child (parent, index, NULL, NULL, &type, NULL);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
return type;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static char *
|
2008-04-09 15:29:55 +02:00
|
|
|
|
c_value_of_variable (struct varobj *var, enum varobj_display_formats format)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2006-05-04 00:59:38 +02:00
|
|
|
|
/* BOGUS: if val_print sees a struct/class, or a reference to one,
|
|
|
|
|
it will print out its children instead of "{...}". So we need to
|
|
|
|
|
catch that case explicitly. */
|
|
|
|
|
struct type *type = get_type (var);
|
2002-07-03 22:23:04 +02:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Strip top-level references. */
|
2006-05-04 00:59:38 +02:00
|
|
|
|
while (TYPE_CODE (type) == TYPE_CODE_REF)
|
|
|
|
|
type = check_typedef (TYPE_TARGET_TYPE (type));
|
|
|
|
|
|
|
|
|
|
switch (TYPE_CODE (type))
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
case TYPE_CODE_STRUCT:
|
|
|
|
|
case TYPE_CODE_UNION:
|
|
|
|
|
return xstrdup ("{...}");
|
|
|
|
|
/* break; */
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_ARRAY:
|
|
|
|
|
{
|
2002-07-03 22:23:04 +02:00
|
|
|
|
char *number;
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2004-06-29 01:59:29 +02:00
|
|
|
|
number = xstrprintf ("[%d]", var->num_children);
|
2002-07-03 22:23:04 +02:00
|
|
|
|
return (number);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
/* break; */
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
{
|
2002-01-13 21:17:55 +01:00
|
|
|
|
if (var->value == NULL)
|
|
|
|
|
{
|
|
|
|
|
/* This can happen if we attempt to get the value of a struct
|
2011-01-12 02:23:29 +01:00
|
|
|
|
member when the parent is an invalid pointer. This is an
|
|
|
|
|
error condition, so we should tell the caller. */
|
2002-01-13 21:17:55 +01:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2007-04-14 11:51:30 +02:00
|
|
|
|
if (var->not_fetched && value_lazy (var->value))
|
|
|
|
|
/* Frozen variable and no value yet. We don't
|
|
|
|
|
implicitly fetch the value. MI response will
|
|
|
|
|
use empty string for the value, which is OK. */
|
|
|
|
|
return NULL;
|
|
|
|
|
|
2007-01-04 20:06:15 +01:00
|
|
|
|
gdb_assert (varobj_value_is_changeable_p (var));
|
2006-11-28 18:23:10 +01:00
|
|
|
|
gdb_assert (!value_lazy (var->value));
|
2008-04-09 15:29:55 +02:00
|
|
|
|
|
|
|
|
|
/* If the specified format is the current one,
|
2011-01-12 02:23:29 +01:00
|
|
|
|
we can reuse print_value. */
|
2008-04-09 15:29:55 +02:00
|
|
|
|
if (format == var->format)
|
|
|
|
|
return xstrdup (var->print_value);
|
|
|
|
|
else
|
* python/python-internal.h (struct language_defn): Declare.
(python_gdbarch, python_language): Likewise.
(ensure_python_env): Add prototype.
(make_cleanup_py_restore_gil): Remove prototype.
* python/python.c: Include "arch-utils.h", "value.h" and "language.h".
(python_gdbarch, python_language): New global variables.
(struct python_env): New data type.
(ensure_python_env, restore_python_env): New functions.
(eval_python_from_control_command): Call ensure_python_env to
install current architecture and language.
(python_command, gdbpy_new_objfile): Likewise.
* python/python-cmd.c: Include "arch-utils.h" and "language.h".
(cmdpy_destroyer, cmdpy_function, cmdpy_completer): Call
ensure_python_env.
* python/python-type.c (clean_up_objfile_types): Likewise.
* python/python-objfile.c: Include "language.h".
(clean_up_objfile): Call ensure_python_env.
* python/python-prettyprint.c (apply_val_pretty_printer): Likewise.
(apply_varobj_pretty_printer): Do not call PyGILState_Ensure.
* varobj.c (varobj_ensure_python_env): New helper function.
(varobj_get_display_hint, update_dynamic_varobj_children,
install_default_visualizer, varobj_set_visualizer, free_variable,
value_get_print_value): Call it.
(value_get_print_value): Add varobj argument instead of pretty
printer argument. Update all callers.
* python/python-utils.c (py_gil_restore, make_cleanup_py_restore_gil):
Remove.
* value.h (internal_function_fn): Add GDBARCH and LANGUAGE argument.
(call_internal_function): Likewise.
* value.c (call_internal_function): Likewise. Pass to handler.
* eval.c (evaluate_subexp_standard): Update call.
* python/python-function.c: Include "language.h".
(fnpy_call): Add GDBARCH and LANGAUAGE arguments and call
make_cleanup_python_env.
* python/python-value.c (builtin_type_pyint, builtin_type_pyfloat,
builtin_type_pylong, builtin_type_pybool, builtin_type_pychar,
valpy_str): Use python_gdbarch and python_language instead of
current_gdbarch and current_language.
* python/python-type.c (typy_lookup_typename): Likewise.
2009-07-02 19:04:23 +02:00
|
|
|
|
return value_get_print_value (var->value, format, var);
|
2007-01-05 22:52:33 +01:00
|
|
|
|
}
|
2002-07-03 22:23:04 +02:00
|
|
|
|
}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* C++ */
|
|
|
|
|
|
|
|
|
|
static int
|
2000-07-30 03:48:28 +02:00
|
|
|
|
cplus_number_of_children (struct varobj *var)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2012-04-14 14:18:50 +02:00
|
|
|
|
struct value *value = NULL;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
struct type *type;
|
|
|
|
|
int children, dont_know;
|
2012-04-14 14:18:50 +02:00
|
|
|
|
int lookup_actual_type = 0;
|
|
|
|
|
struct value_print_options opts;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
dont_know = 1;
|
|
|
|
|
children = 0;
|
|
|
|
|
|
2012-04-14 14:18:50 +02:00
|
|
|
|
get_user_print_options (&opts);
|
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
if (!CPLUS_FAKE_CHILD (var))
|
|
|
|
|
{
|
2007-01-24 12:08:47 +01:00
|
|
|
|
type = get_value_type (var);
|
2012-04-14 14:18:50 +02:00
|
|
|
|
|
|
|
|
|
/* It is necessary to access a real type (via RTTI). */
|
|
|
|
|
if (opts.objectprint)
|
|
|
|
|
{
|
|
|
|
|
value = var->value;
|
|
|
|
|
lookup_actual_type = (TYPE_CODE (var->type) == TYPE_CODE_REF
|
|
|
|
|
|| TYPE_CODE (var->type) == TYPE_CODE_PTR);
|
|
|
|
|
}
|
|
|
|
|
adjust_value_for_child_access (&value, &type, NULL, lookup_actual_type);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
if (((TYPE_CODE (type)) == TYPE_CODE_STRUCT) ||
|
2001-11-01 03:22:21 +01:00
|
|
|
|
((TYPE_CODE (type)) == TYPE_CODE_UNION))
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
int kids[3];
|
|
|
|
|
|
|
|
|
|
cplus_class_num_children (type, kids);
|
|
|
|
|
if (kids[v_public] != 0)
|
|
|
|
|
children++;
|
|
|
|
|
if (kids[v_private] != 0)
|
|
|
|
|
children++;
|
|
|
|
|
if (kids[v_protected] != 0)
|
|
|
|
|
children++;
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Add any baseclasses. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
children += TYPE_N_BASECLASSES (type);
|
|
|
|
|
dont_know = 0;
|
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* FIXME: save children in var. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
int kids[3];
|
|
|
|
|
|
2007-01-24 12:08:47 +01:00
|
|
|
|
type = get_value_type (var->parent);
|
2012-04-14 14:18:50 +02:00
|
|
|
|
|
|
|
|
|
/* It is necessary to access a real type (via RTTI). */
|
|
|
|
|
if (opts.objectprint)
|
|
|
|
|
{
|
|
|
|
|
struct varobj *parent = var->parent;
|
|
|
|
|
|
|
|
|
|
value = parent->value;
|
|
|
|
|
lookup_actual_type = (TYPE_CODE (parent->type) == TYPE_CODE_REF
|
|
|
|
|
|| TYPE_CODE (parent->type) == TYPE_CODE_PTR);
|
|
|
|
|
}
|
|
|
|
|
adjust_value_for_child_access (&value, &type, NULL, lookup_actual_type);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
cplus_class_num_children (type, kids);
|
2002-11-05 23:31:00 +01:00
|
|
|
|
if (strcmp (var->name, "public") == 0)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
children = kids[v_public];
|
2002-11-05 23:31:00 +01:00
|
|
|
|
else if (strcmp (var->name, "private") == 0)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
children = kids[v_private];
|
|
|
|
|
else
|
|
|
|
|
children = kids[v_protected];
|
|
|
|
|
dont_know = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (dont_know)
|
|
|
|
|
children = c_number_of_children (var);
|
|
|
|
|
|
|
|
|
|
return children;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Compute # of public, private, and protected variables in this class.
|
|
|
|
|
That means we need to descend into all baseclasses and find out
|
2011-01-12 02:23:29 +01:00
|
|
|
|
how many are there, too. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
static void
|
2000-11-10 02:19:47 +01:00
|
|
|
|
cplus_class_num_children (struct type *type, int children[3])
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2009-11-12 20:47:25 +01:00
|
|
|
|
int i, vptr_fieldno;
|
|
|
|
|
struct type *basetype = NULL;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
children[v_public] = 0;
|
|
|
|
|
children[v_private] = 0;
|
|
|
|
|
children[v_protected] = 0;
|
|
|
|
|
|
2009-11-12 20:47:25 +01:00
|
|
|
|
vptr_fieldno = get_vptr_fieldno (type, &basetype);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
for (i = TYPE_N_BASECLASSES (type); i < TYPE_NFIELDS (type); i++)
|
|
|
|
|
{
|
2009-11-12 20:47:25 +01:00
|
|
|
|
/* If we have a virtual table pointer, omit it. Even if virtual
|
|
|
|
|
table pointers are not specifically marked in the debug info,
|
|
|
|
|
they should be artificial. */
|
|
|
|
|
if ((type == basetype && i == vptr_fieldno)
|
|
|
|
|
|| TYPE_FIELD_ARTIFICIAL (type, i))
|
2000-02-03 05:14:45 +01:00
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
if (TYPE_FIELD_PROTECTED (type, i))
|
|
|
|
|
children[v_protected]++;
|
|
|
|
|
else if (TYPE_FIELD_PRIVATE (type, i))
|
|
|
|
|
children[v_private]++;
|
|
|
|
|
else
|
|
|
|
|
children[v_public]++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static char *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
cplus_name_of_variable (struct varobj *parent)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
return c_name_of_variable (parent);
|
|
|
|
|
}
|
|
|
|
|
|
2007-01-24 12:08:47 +01:00
|
|
|
|
enum accessibility { private_field, protected_field, public_field };
|
|
|
|
|
|
|
|
|
|
/* Check if field INDEX of TYPE has the specified accessibility.
|
|
|
|
|
Return 0 if so and 1 otherwise. */
|
|
|
|
|
static int
|
|
|
|
|
match_accessibility (struct type *type, int index, enum accessibility acc)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2007-01-24 12:08:47 +01:00
|
|
|
|
if (acc == private_field && TYPE_FIELD_PRIVATE (type, index))
|
|
|
|
|
return 1;
|
|
|
|
|
else if (acc == protected_field && TYPE_FIELD_PROTECTED (type, index))
|
|
|
|
|
return 1;
|
|
|
|
|
else if (acc == public_field && !TYPE_FIELD_PRIVATE (type, index)
|
|
|
|
|
&& !TYPE_FIELD_PROTECTED (type, index))
|
|
|
|
|
return 1;
|
|
|
|
|
else
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
cplus_describe_child (struct varobj *parent, int index,
|
2007-08-31 20:52:05 +02:00
|
|
|
|
char **cname, struct value **cvalue, struct type **ctype,
|
|
|
|
|
char **cfull_expression)
|
2007-01-24 12:08:47 +01:00
|
|
|
|
{
|
|
|
|
|
struct value *value;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
struct type *type;
|
2007-08-31 20:52:05 +02:00
|
|
|
|
int was_ptr;
|
2012-04-14 14:18:50 +02:00
|
|
|
|
int lookup_actual_type = 0;
|
2007-08-31 20:52:05 +02:00
|
|
|
|
char *parent_expression = NULL;
|
2012-04-14 14:18:50 +02:00
|
|
|
|
struct varobj *var;
|
|
|
|
|
struct value_print_options opts;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2007-01-24 12:08:47 +01:00
|
|
|
|
if (cname)
|
|
|
|
|
*cname = NULL;
|
|
|
|
|
if (cvalue)
|
|
|
|
|
*cvalue = NULL;
|
|
|
|
|
if (ctype)
|
|
|
|
|
*ctype = NULL;
|
2007-08-31 20:52:05 +02:00
|
|
|
|
if (cfull_expression)
|
|
|
|
|
*cfull_expression = NULL;
|
2007-01-24 12:08:47 +01:00
|
|
|
|
|
2012-04-14 14:18:50 +02:00
|
|
|
|
get_user_print_options (&opts);
|
|
|
|
|
|
|
|
|
|
var = (CPLUS_FAKE_CHILD (parent)) ? parent->parent : parent;
|
|
|
|
|
if (opts.objectprint)
|
|
|
|
|
lookup_actual_type = (TYPE_CODE (var->type) == TYPE_CODE_REF
|
|
|
|
|
|| TYPE_CODE (var->type) == TYPE_CODE_PTR);
|
|
|
|
|
value = var->value;
|
|
|
|
|
type = get_value_type (var);
|
|
|
|
|
if (cfull_expression)
|
|
|
|
|
parent_expression = varobj_get_path_expr (get_path_expr_parent (var));
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2012-04-14 14:18:50 +02:00
|
|
|
|
adjust_value_for_child_access (&value, &type, &was_ptr, lookup_actual_type);
|
2007-01-24 12:08:47 +01:00
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_STRUCT
|
2008-01-29 20:18:18 +01:00
|
|
|
|
|| TYPE_CODE (type) == TYPE_CODE_UNION)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2007-08-31 20:52:05 +02:00
|
|
|
|
char *join = was_ptr ? "->" : ".";
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
if (CPLUS_FAKE_CHILD (parent))
|
|
|
|
|
{
|
2002-11-05 23:31:00 +01:00
|
|
|
|
/* The fields of the class type are ordered as they
|
|
|
|
|
appear in the class. We are given an index for a
|
|
|
|
|
particular access control type ("public","protected",
|
|
|
|
|
or "private"). We must skip over fields that don't
|
|
|
|
|
have the access control we are looking for to properly
|
2011-01-12 02:23:29 +01:00
|
|
|
|
find the indexed field. */
|
2002-11-05 23:31:00 +01:00
|
|
|
|
int type_index = TYPE_N_BASECLASSES (type);
|
2007-01-24 12:08:47 +01:00
|
|
|
|
enum accessibility acc = public_field;
|
2009-11-12 20:47:25 +01:00
|
|
|
|
int vptr_fieldno;
|
|
|
|
|
struct type *basetype = NULL;
|
* gdbtypes.h (struct main_type): Change type of name,tag_name,
and fields.name members from char * to const char *. All uses updated.
(struct cplus_struct_type): Change type of fn_fieldlists.name member
from char * to const char *. All uses updated.
(type_name_no_tag): Update.
(lookup_unsigned_typename, lookup_signed_typename): Update.
* gdbtypes.c (type_name_no_tag): Change result type
from char * to const char *. All callers updated.
(lookup_unsigned_typename, lookup_signed_typename): Change type of
name parameter from char * to const char *.
* symtab.h (struct cplus_specific): Change type of demangled_name
member from char * to const char *. All uses updated.
(struct general_symbol_info): Change type of name and
mangled_lang.demangled_name members from char * to const char *.
All uses updated.
(symbol_get_demangled_name, symbol_natural_name): Update.
(symbol_demangled_name, symbol_search_name): Update.
* symtab.c (symbol_get_demangled_name): Change result type
from char * to const char *. All callers updated.
(symbol_natural_name, symbol_demangled_name): Ditto.
(symbol_search_name): Ditto.
(completion_list_add_name): Change type of symname,sym_text,
text,word parameters from char * to const char *.
(completion_list_objc_symbol): Change type of sym_text,
text,word parameters from char * to const char *.
* ada-lang.c (find_struct_field): Change type of name parameter
from char * to const char *.
(encoded_ordered_before): Similarly for N0,N1 parameters.
(old_renaming_is_invisible): Similarly for function_name parameter.
(ada_type_name): Change result type from char * to const char *.
All callers updated.
* ada-lang.h (ada_type_name): Update.
* buildsym.c (hashname): Change type of name parameter
from char * to const char *.
* buildsym.h (hashname): Update.
* dbxread.c (end_psymtab): Change type of include_list parameter
from char ** to const char **.
* dwarf2read.c (determine_prefix): Change result type
from char * to const char *. All callers updated.
* f-lang.c (find_common_for_function): Change type of name, funcname
parameters from char * to const char *.
* f-lang.c (find_common_for_function): Update.
* f-valprint.c (list_all_visible_commons): Change type of funcname
parameters from char * to const char *.
* gdbarch.sh (static_transform_name): Change type of name parameter
and result from char * to const char *.
* gdbarch.c: Regenerate.
* gdbarch.h: Regenerate.
* i386-sol2-tdep.c (i386_sol2_static_transform_name): Change type
of name parameter from char * to const char *.
* jv-lang.c (java_primitive_type_from_name): Ditto.
(java_demangled_signature_length): Similarly for signature parameter.
(java_demangled_signature_copy): Ditto.
(java_demangle_type_signature): Ditto.
* jv-lang.h (java_primitive_type_from_name): Update.
(java_demangle_type_signature): Update.
* objc-lang.c (specialcmp): Change type of a,b parameters
from char * to const char *.
* p-lang.c (is_pascal_string_type): Change type of arrayname parameter
from char * to const char *. All callers updated.
* p-lang.h (is_pascal_string_type): Update.
* solib-frv.c (find_canonical_descriptor_in_load_object): Change type
of name parameter from char * to const char *.
* sparc-sol2-tdep.c (sparc_sol2_static_transform_name): Ditto.
* utils.c (fprintf_symbol_filtered): Ditto.
* defs.h (fprintf_symbol_filtered): Update.
* sparc-tdep.h (sparc_sol2_static_transform_name): Update.
* stabsread.h (end_psymtab): Update.
* stack.c (find_frame_funname): Change type of funname parameter
from char ** to const char **.
* stack.h (find_frame_funname): Update.
* typeprint.c (type_print): Change type of varstring parameter
from char * to const char *.
* value.h (type_print): Update.
* xcoffread.c (xcoff_start_psymtab): Change type of filename parameter
from char * to const char *. All callers updated.
(xcoff_end_psymtab): Change type of include_list parameter
from char ** to const char **. All callers updated.
(swap_sym): Similarly for name parameter. All callers updated.
* coffread.c (patch_type): Add (char*) cast to xfree parameter.
Use xstrdup.
(process_coff_symbol): Use xstrdup.
* stabsread.c (stabs_method_name_from_physname): Renamed from
update_method_name_from_physname. Change result type from void
to char *. All callers updated.
(read_member_functions): In has_destructor case, store name in objfile
obstack instead of malloc space. In !has_stub case, fix mem leak.
2012-02-07 05:48:23 +01:00
|
|
|
|
const char *field_name;
|
2009-11-12 20:47:25 +01:00
|
|
|
|
|
|
|
|
|
vptr_fieldno = get_vptr_fieldno (type, &basetype);
|
2002-11-05 23:31:00 +01:00
|
|
|
|
if (strcmp (parent->name, "private") == 0)
|
2007-01-24 12:08:47 +01:00
|
|
|
|
acc = private_field;
|
2002-11-05 23:31:00 +01:00
|
|
|
|
else if (strcmp (parent->name, "protected") == 0)
|
2007-01-24 12:08:47 +01:00
|
|
|
|
acc = protected_field;
|
|
|
|
|
|
|
|
|
|
while (index >= 0)
|
2002-11-05 23:31:00 +01:00
|
|
|
|
{
|
2009-11-12 20:47:25 +01:00
|
|
|
|
if ((type == basetype && type_index == vptr_fieldno)
|
|
|
|
|
|| TYPE_FIELD_ARTIFICIAL (type, type_index))
|
2007-01-24 12:08:47 +01:00
|
|
|
|
; /* ignore vptr */
|
|
|
|
|
else if (match_accessibility (type, type_index, acc))
|
2002-11-05 23:31:00 +01:00
|
|
|
|
--index;
|
|
|
|
|
++type_index;
|
|
|
|
|
}
|
2007-01-24 12:08:47 +01:00
|
|
|
|
--type_index;
|
|
|
|
|
|
2012-01-12 23:51:10 +01:00
|
|
|
|
/* If the type is anonymous and the field has no name,
|
|
|
|
|
set an appopriate name. */
|
|
|
|
|
field_name = TYPE_FIELD_NAME (type, type_index);
|
|
|
|
|
if (field_name == NULL || *field_name == '\0')
|
|
|
|
|
{
|
|
|
|
|
if (cname)
|
|
|
|
|
{
|
|
|
|
|
if (TYPE_CODE (TYPE_FIELD_TYPE (type, type_index))
|
|
|
|
|
== TYPE_CODE_STRUCT)
|
|
|
|
|
*cname = xstrdup (ANONYMOUS_STRUCT_NAME);
|
|
|
|
|
else if (TYPE_CODE (TYPE_FIELD_TYPE (type, type_index))
|
|
|
|
|
== TYPE_CODE_UNION)
|
|
|
|
|
*cname = xstrdup (ANONYMOUS_UNION_NAME);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (cfull_expression)
|
|
|
|
|
*cfull_expression = xstrdup ("");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (cname)
|
|
|
|
|
*cname = xstrdup (TYPE_FIELD_NAME (type, type_index));
|
|
|
|
|
|
|
|
|
|
if (cfull_expression)
|
|
|
|
|
*cfull_expression
|
|
|
|
|
= xstrprintf ("((%s)%s%s)", parent_expression, join,
|
|
|
|
|
field_name);
|
|
|
|
|
}
|
2007-01-24 12:08:47 +01:00
|
|
|
|
|
|
|
|
|
if (cvalue && value)
|
|
|
|
|
*cvalue = value_struct_element_index (value, type_index);
|
|
|
|
|
|
|
|
|
|
if (ctype)
|
|
|
|
|
*ctype = TYPE_FIELD_TYPE (type, type_index);
|
|
|
|
|
}
|
|
|
|
|
else if (index < TYPE_N_BASECLASSES (type))
|
|
|
|
|
{
|
|
|
|
|
/* This is a baseclass. */
|
|
|
|
|
if (cname)
|
|
|
|
|
*cname = xstrdup (TYPE_FIELD_NAME (type, index));
|
|
|
|
|
|
|
|
|
|
if (cvalue && value)
|
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 20:51:26 +02:00
|
|
|
|
*cvalue = value_cast (TYPE_FIELD_TYPE (type, index), value);
|
2002-11-05 23:31:00 +01:00
|
|
|
|
|
2007-01-24 12:08:47 +01:00
|
|
|
|
if (ctype)
|
|
|
|
|
{
|
|
|
|
|
*ctype = TYPE_FIELD_TYPE (type, index);
|
|
|
|
|
}
|
2007-08-31 20:52:05 +02:00
|
|
|
|
|
|
|
|
|
if (cfull_expression)
|
|
|
|
|
{
|
|
|
|
|
char *ptr = was_ptr ? "*" : "";
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Cast the parent to the base' type. Note that in gdb,
|
2007-08-31 20:52:05 +02:00
|
|
|
|
expression like
|
|
|
|
|
(Base1)d
|
|
|
|
|
will create an lvalue, for all appearences, so we don't
|
|
|
|
|
need to use more fancy:
|
|
|
|
|
*(Base1*)(&d)
|
2011-08-26 14:32:59 +02:00
|
|
|
|
construct.
|
|
|
|
|
|
|
|
|
|
When we are in the scope of the base class or of one
|
|
|
|
|
of its children, the type field name will be interpreted
|
|
|
|
|
as a constructor, if it exists. Therefore, we must
|
|
|
|
|
indicate that the name is a class name by using the
|
|
|
|
|
'class' keyword. See PR mi/11912 */
|
|
|
|
|
*cfull_expression = xstrprintf ("(%s(class %s%s) %s)",
|
2007-08-31 20:52:05 +02:00
|
|
|
|
ptr,
|
|
|
|
|
TYPE_FIELD_NAME (type, index),
|
|
|
|
|
ptr,
|
|
|
|
|
parent_expression);
|
|
|
|
|
}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2007-08-14 20:26:46 +02:00
|
|
|
|
char *access = NULL;
|
2002-11-05 23:31:00 +01:00
|
|
|
|
int children[3];
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2007-01-24 12:08:47 +01:00
|
|
|
|
cplus_class_num_children (type, children);
|
2002-11-05 23:31:00 +01:00
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
/* Everything beyond the baseclasses can
|
2002-11-05 23:31:00 +01:00
|
|
|
|
only be "public", "private", or "protected"
|
|
|
|
|
|
|
|
|
|
The special "fake" children are always output by varobj in
|
2011-01-12 02:23:29 +01:00
|
|
|
|
this order. So if INDEX == 2, it MUST be "protected". */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
index -= TYPE_N_BASECLASSES (type);
|
|
|
|
|
switch (index)
|
|
|
|
|
{
|
|
|
|
|
case 0:
|
2002-11-05 23:31:00 +01:00
|
|
|
|
if (children[v_public] > 0)
|
2007-01-24 12:08:47 +01:00
|
|
|
|
access = "public";
|
2002-11-05 23:31:00 +01:00
|
|
|
|
else if (children[v_private] > 0)
|
2007-01-24 12:08:47 +01:00
|
|
|
|
access = "private";
|
2002-11-05 23:31:00 +01:00
|
|
|
|
else
|
2007-01-24 12:08:47 +01:00
|
|
|
|
access = "protected";
|
2002-11-05 23:31:00 +01:00
|
|
|
|
break;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
case 1:
|
2002-11-05 23:31:00 +01:00
|
|
|
|
if (children[v_public] > 0)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2002-11-05 23:31:00 +01:00
|
|
|
|
if (children[v_private] > 0)
|
2007-01-24 12:08:47 +01:00
|
|
|
|
access = "private";
|
2002-11-05 23:31:00 +01:00
|
|
|
|
else
|
2007-01-24 12:08:47 +01:00
|
|
|
|
access = "protected";
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
2002-11-05 23:31:00 +01:00
|
|
|
|
else if (children[v_private] > 0)
|
2007-01-24 12:08:47 +01:00
|
|
|
|
access = "protected";
|
2002-11-05 23:31:00 +01:00
|
|
|
|
break;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
case 2:
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Must be protected. */
|
2007-01-24 12:08:47 +01:00
|
|
|
|
access = "protected";
|
2002-11-05 23:31:00 +01:00
|
|
|
|
break;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
default:
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* error! */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
break;
|
|
|
|
|
}
|
2007-08-14 20:26:46 +02:00
|
|
|
|
|
|
|
|
|
gdb_assert (access);
|
2007-01-24 12:08:47 +01:00
|
|
|
|
if (cname)
|
|
|
|
|
*cname = xstrdup (access);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2007-08-31 20:52:05 +02:00
|
|
|
|
/* Value and type and full expression are null here. */
|
2007-01-24 12:08:47 +01:00
|
|
|
|
}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2007-08-31 20:52:05 +02:00
|
|
|
|
c_describe_child (parent, index, cname, cvalue, ctype, cfull_expression);
|
2007-01-24 12:08:47 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
2007-01-24 12:08:47 +01:00
|
|
|
|
static char *
|
|
|
|
|
cplus_name_of_child (struct varobj *parent, int index)
|
|
|
|
|
{
|
|
|
|
|
char *name = NULL;
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2007-08-31 20:52:05 +02:00
|
|
|
|
cplus_describe_child (parent, index, &name, NULL, NULL, NULL);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
return name;
|
|
|
|
|
}
|
|
|
|
|
|
2007-08-31 20:52:05 +02:00
|
|
|
|
static char *
|
|
|
|
|
cplus_path_expr_of_child (struct varobj *child)
|
|
|
|
|
{
|
|
|
|
|
cplus_describe_child (child->parent, child->index, NULL, NULL, NULL,
|
|
|
|
|
&child->path_expr);
|
|
|
|
|
return child->path_expr;
|
|
|
|
|
}
|
|
|
|
|
|
2001-11-01 03:37:56 +01:00
|
|
|
|
static struct value *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
cplus_value_of_root (struct varobj **var_handle)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2000-03-13 22:51:46 +01:00
|
|
|
|
return c_value_of_root (var_handle);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
2001-11-01 03:37:56 +01:00
|
|
|
|
static struct value *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
cplus_value_of_child (struct varobj *parent, int index)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2007-01-24 12:08:47 +01:00
|
|
|
|
struct value *value = NULL;
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2007-08-31 20:52:05 +02:00
|
|
|
|
cplus_describe_child (parent, index, NULL, &value, NULL, NULL);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
return value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct type *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
cplus_type_of_child (struct varobj *parent, int index)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2007-01-24 12:08:47 +01:00
|
|
|
|
struct type *type = NULL;
|
2010-05-17 20:48:52 +02:00
|
|
|
|
|
2007-08-31 20:52:05 +02:00
|
|
|
|
cplus_describe_child (parent, index, NULL, NULL, &type, NULL);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
return type;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static char *
|
2010-05-17 20:48:52 +02:00
|
|
|
|
cplus_value_of_variable (struct varobj *var,
|
|
|
|
|
enum varobj_display_formats format)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
/* If we have one of our special types, don't print out
|
2011-01-12 02:23:29 +01:00
|
|
|
|
any value. */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
if (CPLUS_FAKE_CHILD (var))
|
|
|
|
|
return xstrdup ("");
|
|
|
|
|
|
2008-04-09 15:29:55 +02:00
|
|
|
|
return c_value_of_variable (var, format);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Java */
|
|
|
|
|
|
|
|
|
|
static int
|
2000-07-30 03:48:28 +02:00
|
|
|
|
java_number_of_children (struct varobj *var)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
return cplus_number_of_children (var);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static char *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
java_name_of_variable (struct varobj *parent)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
char *p, *name;
|
|
|
|
|
|
|
|
|
|
name = cplus_name_of_variable (parent);
|
|
|
|
|
/* If the name has "-" in it, it is because we
|
2011-01-12 02:23:29 +01:00
|
|
|
|
needed to escape periods in the name... */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
p = name;
|
|
|
|
|
|
|
|
|
|
while (*p != '\000')
|
|
|
|
|
{
|
|
|
|
|
if (*p == '-')
|
|
|
|
|
*p = '.';
|
|
|
|
|
p++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return name;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static char *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
java_name_of_child (struct varobj *parent, int index)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
char *name, *p;
|
|
|
|
|
|
|
|
|
|
name = cplus_name_of_child (parent, index);
|
2011-01-12 02:23:29 +01:00
|
|
|
|
/* Escape any periods in the name... */
|
2000-02-03 05:14:45 +01:00
|
|
|
|
p = name;
|
|
|
|
|
|
|
|
|
|
while (*p != '\000')
|
|
|
|
|
{
|
|
|
|
|
if (*p == '.')
|
|
|
|
|
*p = '-';
|
|
|
|
|
p++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return name;
|
|
|
|
|
}
|
|
|
|
|
|
2007-08-31 20:52:05 +02:00
|
|
|
|
static char *
|
|
|
|
|
java_path_expr_of_child (struct varobj *child)
|
|
|
|
|
{
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2001-11-01 03:37:56 +01:00
|
|
|
|
static struct value *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
java_value_of_root (struct varobj **var_handle)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2000-03-13 22:51:46 +01:00
|
|
|
|
return cplus_value_of_root (var_handle);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
|
|
|
|
|
2001-11-01 03:37:56 +01:00
|
|
|
|
static struct value *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
java_value_of_child (struct varobj *parent, int index)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
return cplus_value_of_child (parent, index);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct type *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
java_type_of_child (struct varobj *parent, int index)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
return cplus_type_of_child (parent, index);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static char *
|
2008-04-09 15:29:55 +02:00
|
|
|
|
java_value_of_variable (struct varobj *var, enum varobj_display_formats format)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
2008-04-09 15:29:55 +02:00
|
|
|
|
return cplus_value_of_variable (var, format);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
2009-07-30 15:12:54 +02:00
|
|
|
|
|
2011-07-18 11:21:43 +02:00
|
|
|
|
/* Ada specific callbacks for VAROBJs. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
ada_number_of_children (struct varobj *var)
|
|
|
|
|
{
|
2012-03-28 23:31:18 +02:00
|
|
|
|
return ada_varobj_get_number_of_children (var->value, var->type);
|
2011-07-18 11:21:43 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
ada_name_of_variable (struct varobj *parent)
|
|
|
|
|
{
|
|
|
|
|
return c_name_of_variable (parent);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
ada_name_of_child (struct varobj *parent, int index)
|
|
|
|
|
{
|
2012-03-28 23:31:18 +02:00
|
|
|
|
return ada_varobj_get_name_of_child (parent->value, parent->type,
|
|
|
|
|
parent->name, index);
|
2011-07-18 11:21:43 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static char*
|
|
|
|
|
ada_path_expr_of_child (struct varobj *child)
|
|
|
|
|
{
|
2012-03-28 23:31:18 +02:00
|
|
|
|
struct varobj *parent = child->parent;
|
|
|
|
|
const char *parent_path_expr = varobj_get_path_expr (parent);
|
|
|
|
|
|
|
|
|
|
return ada_varobj_get_path_expr_of_child (parent->value,
|
|
|
|
|
parent->type,
|
|
|
|
|
parent->name,
|
|
|
|
|
parent_path_expr,
|
|
|
|
|
child->index);
|
2011-07-18 11:21:43 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct value *
|
|
|
|
|
ada_value_of_root (struct varobj **var_handle)
|
|
|
|
|
{
|
|
|
|
|
return c_value_of_root (var_handle);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct value *
|
|
|
|
|
ada_value_of_child (struct varobj *parent, int index)
|
|
|
|
|
{
|
2012-03-28 23:31:18 +02:00
|
|
|
|
return ada_varobj_get_value_of_child (parent->value, parent->type,
|
|
|
|
|
parent->name, index);
|
2011-07-18 11:21:43 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct type *
|
|
|
|
|
ada_type_of_child (struct varobj *parent, int index)
|
|
|
|
|
{
|
2012-03-28 23:31:18 +02:00
|
|
|
|
return ada_varobj_get_type_of_child (parent->value, parent->type,
|
|
|
|
|
index);
|
2011-07-18 11:21:43 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
ada_value_of_variable (struct varobj *var, enum varobj_display_formats format)
|
|
|
|
|
{
|
2012-03-28 23:31:18 +02:00
|
|
|
|
struct value_print_options opts;
|
|
|
|
|
|
|
|
|
|
get_formatted_print_options (&opts, format_code[(int) format]);
|
|
|
|
|
opts.deref_ref = 0;
|
|
|
|
|
opts.raw = 1;
|
|
|
|
|
|
|
|
|
|
return ada_varobj_get_value_of_variable (var->value, var->type, &opts);
|
2011-07-18 11:21:43 +02:00
|
|
|
|
}
|
|
|
|
|
|
2012-03-28 23:31:29 +02:00
|
|
|
|
/* Implement the "value_is_changeable_p" routine for Ada. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
ada_value_is_changeable_p (struct varobj *var)
|
|
|
|
|
{
|
|
|
|
|
struct type *type = var->value ? value_type (var->value) : var->type;
|
|
|
|
|
|
|
|
|
|
if (ada_is_array_descriptor_type (type)
|
|
|
|
|
&& TYPE_CODE (type) == TYPE_CODE_TYPEDEF)
|
|
|
|
|
{
|
|
|
|
|
/* This is in reality a pointer to an unconstrained array.
|
|
|
|
|
its value is changeable. */
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ada_is_string_type (type))
|
|
|
|
|
{
|
|
|
|
|
/* We display the contents of the string in the array's
|
|
|
|
|
"value" field. The contents can change, so consider
|
|
|
|
|
that the array is changeable. */
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return default_value_is_changeable_p (var);
|
|
|
|
|
}
|
|
|
|
|
|
2012-03-28 23:31:05 +02:00
|
|
|
|
/* Implement the "value_has_mutated" routine for Ada. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
ada_value_has_mutated (struct varobj *var, struct value *new_val,
|
|
|
|
|
struct type *new_type)
|
|
|
|
|
{
|
2012-03-28 23:31:18 +02:00
|
|
|
|
int i;
|
|
|
|
|
int from = -1;
|
|
|
|
|
int to = -1;
|
|
|
|
|
|
|
|
|
|
/* If the number of fields have changed, then for sure the type
|
|
|
|
|
has mutated. */
|
|
|
|
|
if (ada_varobj_get_number_of_children (new_val, new_type)
|
|
|
|
|
!= var->num_children)
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
/* If the number of fields have remained the same, then we need
|
|
|
|
|
to check the name of each field. If they remain the same,
|
|
|
|
|
then chances are the type hasn't mutated. This is technically
|
|
|
|
|
an incomplete test, as the child's type might have changed
|
|
|
|
|
despite the fact that the name remains the same. But we'll
|
|
|
|
|
handle this situation by saying that the child has mutated,
|
|
|
|
|
not this value.
|
|
|
|
|
|
|
|
|
|
If only part (or none!) of the children have been fetched,
|
|
|
|
|
then only check the ones we fetched. It does not matter
|
|
|
|
|
to the frontend whether a child that it has not fetched yet
|
|
|
|
|
has mutated or not. So just assume it hasn't. */
|
|
|
|
|
|
|
|
|
|
restrict_range (var->children, &from, &to);
|
|
|
|
|
for (i = from; i < to; i++)
|
|
|
|
|
if (strcmp (ada_varobj_get_name_of_child (new_val, new_type,
|
|
|
|
|
var->name, i),
|
|
|
|
|
VEC_index (varobj_p, var->children, i)->name) != 0)
|
|
|
|
|
return 1;
|
|
|
|
|
|
2012-03-28 23:31:05 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2009-07-30 15:12:54 +02:00
|
|
|
|
/* Iterate all the existing _root_ VAROBJs and call the FUNC callback for them
|
|
|
|
|
with an arbitrary caller supplied DATA pointer. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
all_root_varobjs (void (*func) (struct varobj *var, void *data), void *data)
|
|
|
|
|
{
|
|
|
|
|
struct varobj_root *var_root, *var_root_next;
|
|
|
|
|
|
|
|
|
|
/* Iterate "safely" - handle if the callee deletes its passed VAROBJ. */
|
|
|
|
|
|
|
|
|
|
for (var_root = rootlist; var_root != NULL; var_root = var_root_next)
|
|
|
|
|
{
|
|
|
|
|
var_root_next = var_root->next;
|
|
|
|
|
|
|
|
|
|
(*func) (var_root->rootvar, data);
|
|
|
|
|
}
|
|
|
|
|
}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
extern void _initialize_varobj (void);
|
|
|
|
|
void
|
|
|
|
|
_initialize_varobj (void)
|
|
|
|
|
{
|
|
|
|
|
int sizeof_table = sizeof (struct vlist *) * VAROBJ_TABLE_SIZE;
|
|
|
|
|
|
|
|
|
|
varobj_table = xmalloc (sizeof_table);
|
|
|
|
|
memset (varobj_table, 0, sizeof_table);
|
|
|
|
|
|
2012-08-02 11:36:40 +02:00
|
|
|
|
add_setshow_zuinteger_cmd ("debugvarobj", class_maintenance,
|
|
|
|
|
&varobjdebug,
|
|
|
|
|
_("Set varobj debugging."),
|
|
|
|
|
_("Show varobj debugging."),
|
|
|
|
|
_("When non-zero, varobj debugging is enabled."),
|
|
|
|
|
NULL, show_varobjdebug,
|
|
|
|
|
&setlist, &showlist);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
2007-02-13 09:15:49 +01:00
|
|
|
|
|
2009-07-30 15:12:54 +02:00
|
|
|
|
/* Invalidate varobj VAR if it is tied to locals and re-create it if it is
|
2012-07-30 14:10:23 +02:00
|
|
|
|
defined on globals. It is a helper for varobj_invalidate.
|
|
|
|
|
|
|
|
|
|
This function is called after changing the symbol file, in this case the
|
|
|
|
|
pointers to "struct type" stored by the varobj are no longer valid. All
|
|
|
|
|
varobj must be either re-evaluated, or marked as invalid here. */
|
2009-04-10 17:57:54 +02:00
|
|
|
|
|
2009-07-30 15:12:54 +02:00
|
|
|
|
static void
|
|
|
|
|
varobj_invalidate_iter (struct varobj *var, void *unused)
|
2007-02-13 09:15:49 +01:00
|
|
|
|
{
|
2012-07-30 14:10:23 +02:00
|
|
|
|
/* global and floating var must be re-evaluated. */
|
|
|
|
|
if (var->root->floating || var->root->valid_block == NULL)
|
2009-04-10 17:57:54 +02:00
|
|
|
|
{
|
2009-07-30 15:12:54 +02:00
|
|
|
|
struct varobj *tmp_var;
|
2009-04-10 17:57:54 +02:00
|
|
|
|
|
2009-07-30 15:12:54 +02:00
|
|
|
|
/* Try to create a varobj with same expression. If we succeed
|
|
|
|
|
replace the old varobj, otherwise invalidate it. */
|
|
|
|
|
tmp_var = varobj_create (NULL, var->name, (CORE_ADDR) 0,
|
|
|
|
|
USE_CURRENT_FRAME);
|
|
|
|
|
if (tmp_var != NULL)
|
|
|
|
|
{
|
|
|
|
|
tmp_var->obj_name = xstrdup (var->obj_name);
|
|
|
|
|
varobj_delete (var, NULL, 0);
|
|
|
|
|
install_variable (tmp_var);
|
2009-04-10 17:57:54 +02:00
|
|
|
|
}
|
2009-07-30 15:12:54 +02:00
|
|
|
|
else
|
|
|
|
|
var->root->is_valid = 0;
|
2009-04-10 17:57:54 +02:00
|
|
|
|
}
|
2009-07-30 15:12:54 +02:00
|
|
|
|
else /* locals must be invalidated. */
|
|
|
|
|
var->root->is_valid = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Invalidate the varobjs that are tied to locals and re-create the ones that
|
|
|
|
|
are defined on globals.
|
|
|
|
|
Invalidated varobjs will be always printed in_scope="invalid". */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
varobj_invalidate (void)
|
|
|
|
|
{
|
|
|
|
|
all_root_varobjs (varobj_invalidate_iter, NULL);
|
2007-02-13 09:15:49 +01:00
|
|
|
|
}
|