mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
224c3ddb89
Most allocation functions (if not all) return a void* pointing to the allocated memory. In C++, we need to add an explicit cast when assigning the result to a pointer to another type (which is the case more often than not). The content of this patch is taken from Pedro's branch, from commit "(mostly) auto-generated patch to insert casts needed for C++". I validated that the changes make sense and manually reflowed the code to make it respect the coding style. I also found multiple places where I could use XNEW/XNEWVEC/XRESIZEVEC/etc. Thanks a lot to whoever did that automated script to insert casts, doing it completely by hand would have taken a ridiculous amount of time. Only files built on x86 with --enable-targets=all are modified. This means that all other -nat.c files are untouched and will have to be dealt with later by using appropiate compilers. Or maybe we can try to build them with a regular g++ just to know where to add casts, I don't know. I built-tested this with --enable-targets=all and reg-tested. Here's the changelog entry, which was not too bad to make despite the size, thanks to David Malcom's script. I fixed some bits by hand, but there might be some wrong parts left (hopefully not). gdb/ChangeLog: * aarch64-linux-tdep.c (aarch64_stap_parse_special_token): Add cast to allocation result assignment. * ada-exp.y (write_object_renaming): Likewise. (write_ambiguous_var): Likewise. (ada_nget_field_index): Likewise. (write_var_or_type): Likewise. * ada-lang.c (ada_decode_symbol): Likewise. (ada_value_assign): Likewise. (value_pointer): Likewise. (cache_symbol): Likewise. (add_nonlocal_symbols): Likewise. (ada_name_for_lookup): Likewise. (symbol_completion_add): Likewise. (ada_to_fixed_type_1): Likewise. (ada_get_next_arg): Likewise. (defns_collected): Likewise. * ada-lex.l (processId): Likewise. (processString): Likewise. * ada-tasks.c (read_known_tasks_array): Likewise. (read_known_tasks_list): Likewise. * ada-typeprint.c (decoded_type_name): Likewise. * addrmap.c (addrmap_mutable_create_fixed): Likewise. * amd64-tdep.c (amd64_push_arguments): Likewise. (amd64_displaced_step_copy_insn): Likewise. (amd64_classify_insn_at): Likewise. (amd64_relocate_instruction): Likewise. * amd64obsd-tdep.c (amd64obsd_sigtramp_p): Likewise. * arch-utils.c (simple_displaced_step_copy_insn): Likewise. (initialize_current_architecture): Likewise. * arm-linux-tdep.c (arm_stap_parse_special_token): Likewise. * arm-symbian-tdep.c (arm_symbian_osabi_sniffer): Likewise. * arm-tdep.c (arm_exidx_new_objfile): Likewise. (arm_push_dummy_call): Likewise. (extend_buffer_earlier): Likewise. (arm_adjust_breakpoint_address): Likewise. (arm_skip_stub): Likewise. * auto-load.c (filename_is_in_pattern): Likewise. (maybe_add_script_file): Likewise. (maybe_add_script_text): Likewise. (auto_load_objfile_script_1): Likewise. * auxv.c (ld_so_xfer_auxv): Likewise. * ax-general.c (new_agent_expr): Likewise. (grow_expr): Likewise. (ax_reg_mask): Likewise. * bcache.c (bcache_full): Likewise. * breakpoint.c (program_breakpoint_here_p): Likewise. * btrace.c (parse_xml_raw): Likewise. * build-id.c (build_id_to_debug_bfd): Likewise. * buildsym.c (end_symtab_with_blockvector): Likewise. * c-exp.y (string_exp): Likewise. (qualified_name): Likewise. (write_destructor_name): Likewise. (operator_stoken): Likewise. (parse_number): Likewise. (scan_macro_expansion): Likewise. (yylex): Likewise. (c_print_token): Likewise. * c-lang.c (c_get_string): Likewise. (emit_numeric_character): Likewise. * charset.c (wchar_iterate): Likewise. * cli/cli-cmds.c (complete_command): Likewise. (make_command): Likewise. * cli/cli-dump.c (restore_section_callback): Likewise. (restore_binary_file): Likewise. * cli/cli-interp.c (cli_interpreter_exec): Likewise. * cli/cli-script.c (execute_control_command): Likewise. * cli/cli-setshow.c (do_set_command): Likewise. * coff-pe-read.c (add_pe_forwarded_sym): Likewise. (read_pe_exported_syms): Likewise. * coffread.c (coff_read_struct_type): Likewise. (coff_read_enum_type): Likewise. * common/btrace-common.c (btrace_data_append): Likewise. * common/buffer.c (buffer_grow): Likewise. * common/filestuff.c (gdb_fopen_cloexec): Likewise. * common/format.c (parse_format_string): Likewise. * common/gdb_vecs.c (delim_string_to_char_ptr_vec_append): Likewise. * common/xml-utils.c (xml_escape_text): Likewise. * compile/compile-object-load.c (copy_sections): Likewise. (compile_object_load): Likewise. * compile/compile-object-run.c (compile_object_run): Likewise. * completer.c (filename_completer): Likewise. * corefile.c (read_memory_typed_address): Likewise. (write_memory_unsigned_integer): Likewise. (write_memory_signed_integer): Likewise. (complete_set_gnutarget): Likewise. * corelow.c (get_core_register_section): Likewise. * cp-name-parser.y (d_grab): Likewise. (allocate_info): Likewise. (cp_new_demangle_parse_info): Likewise. * cp-namespace.c (cp_scan_for_anonymous_namespaces): Likewise. (cp_lookup_symbol_in_namespace): Likewise. (lookup_namespace_scope): Likewise. (find_symbol_in_baseclass): Likewise. (cp_lookup_nested_symbol): Likewise. (cp_lookup_transparent_type_loop): Likewise. * cp-support.c (copy_string_to_obstack): Likewise. (make_symbol_overload_list): Likewise. (make_symbol_overload_list_namespace): Likewise. (make_symbol_overload_list_adl_namespace): Likewise. (first_component_command): Likewise. * cp-valprint.c (cp_print_value): Likewise. * ctf.c (ctf_xfer_partial): Likewise. * d-exp.y (StringExp): Likewise. * d-namespace.c (d_lookup_symbol_in_module): Likewise. (lookup_module_scope): Likewise. (find_symbol_in_baseclass): Likewise. (d_lookup_nested_symbol): Likewise. * dbxread.c (find_stab_function_addr): Likewise. (read_dbx_symtab): Likewise. (dbx_end_psymtab): Likewise. (cp_set_block_scope): Likewise. * dcache.c (dcache_alloc): Likewise. * demangle.c (_initialize_demangler): Likewise. * dicos-tdep.c (dicos_load_module_p): Likewise. * dictionary.c (dict_create_hashed_expandable): Likewise. (dict_create_linear_expandable): Likewise. (expand_hashtable): Likewise. (add_symbol_linear_expandable): Likewise. * dwarf2-frame.c (add_cie): Likewise. (add_fde): Likewise. (dwarf2_build_frame_info): Likewise. * dwarf2expr.c (dwarf_expr_grow_stack): Likewise. (dwarf_expr_fetch_address): Likewise. (add_piece): Likewise. (execute_stack_op): Likewise. * dwarf2loc.c (chain_candidate): Likewise. (dwarf_entry_parameter_to_value): Likewise. (read_pieced_value): Likewise. (write_pieced_value): Likewise. * dwarf2read.c (dwarf2_read_section): Likewise. (add_type_unit): Likewise. (read_comp_units_from_section): Likewise. (fixup_go_packaging): Likewise. (dwarf2_compute_name): Likewise. (dwarf2_physname): Likewise. (create_dwo_unit_in_dwp_v1): Likewise. (create_dwo_unit_in_dwp_v2): Likewise. (read_func_scope): Likewise. (read_call_site_scope): Likewise. (dwarf2_attach_fields_to_type): Likewise. (process_structure_scope): Likewise. (mark_common_block_symbol_computed): Likewise. (read_common_block): Likewise. (abbrev_table_read_table): Likewise. (guess_partial_die_structure_name): Likewise. (fixup_partial_die): Likewise. (add_file_name): Likewise. (dwarf2_const_value_data): Likewise. (dwarf2_const_value_attr): Likewise. (build_error_marker_type): Likewise. (guess_full_die_structure_name): Likewise. (anonymous_struct_prefix): Likewise. (typename_concat): Likewise. (dwarf2_canonicalize_name): Likewise. (dwarf2_name): Likewise. (write_constant_as_bytes): Likewise. (dwarf2_fetch_constant_bytes): Likewise. (copy_string): Likewise. (parse_macro_definition): Likewise. * elfread.c (elf_symfile_segments): Likewise. (elf_rel_plt_read): Likewise. (elf_gnu_ifunc_resolve_by_cache): Likewise. (elf_gnu_ifunc_resolve_by_got): Likewise. (elf_read_minimal_symbols): Likewise. (elf_gnu_ifunc_record_cache): Likewise. * event-top.c (top_level_prompt): Likewise. (command_line_handler): Likewise. * exec.c (resize_section_table): Likewise. * expprint.c (print_subexp_standard): Likewise. * fbsd-tdep.c (fbsd_collect_regset_section_cb): Likewise. * findcmd.c (parse_find_args): Likewise. * findvar.c (address_from_register): Likewise. * frame.c (get_prev_frame_always): Likewise. * gdb_bfd.c (gdb_bfd_ref): Likewise. (get_section_descriptor): Likewise. * gdb_obstack.c (obconcat): Likewise. (obstack_strdup): Likewise. * gdbtypes.c (lookup_function_type_with_arguments): Likewise. (create_set_type): Likewise. (lookup_unsigned_typename): Likewise. (lookup_signed_typename): Likewise. (resolve_dynamic_union): Likewise. (resolve_dynamic_struct): Likewise. (add_dyn_prop): Likewise. (copy_dynamic_prop_list): Likewise. (arch_flags_type): Likewise. (append_composite_type_field_raw): Likewise. * gdbtypes.h (INIT_FUNC_SPECIFIC): Likewise. * gnu-v3-abi.c (gnuv3_rtti_type): Likewise. * go-exp.y (string_exp): Likewise. * go-lang.c (go_demangle): Likewise. * guile/guile.c (compute_scheme_string): Likewise. * guile/scm-cmd.c (gdbscm_parse_command_name): Likewise. (gdbscm_canonicalize_command_name): Likewise. * guile/scm-ports.c (ioscm_init_stdio_buffers): Likewise. (ioscm_init_memory_port): Likewise. (ioscm_reinit_memory_port): Likewise. * guile/scm-utils.c (gdbscm_gc_xstrdup): Likewise. (gdbscm_gc_dup_argv): Likewise. * h8300-tdep.c (h8300_push_dummy_call): Likewise. * hppa-tdep.c (internalize_unwinds): Likewise. (read_unwind_info): Likewise. * i386-cygwin-tdep.c (core_process_module_section): Likewise. (windows_core_xfer_shared_libraries): Likewise. * i386-tdep.c (i386_displaced_step_copy_insn): Likewise. (i386_stap_parse_special_token_triplet): Likewise. (i386_stap_parse_special_token_three_arg_disp): Likewise. * i386obsd-tdep.c (i386obsd_sigtramp_p): Likewise. * inf-child.c (inf_child_fileio_readlink): Likewise. * inf-ptrace.c (inf_ptrace_fetch_register): Likewise. (inf_ptrace_store_register): Likewise. * infrun.c (follow_exec): Likewise. (displaced_step_prepare_throw): Likewise. (save_stop_context): Likewise. (save_infcall_suspend_state): Likewise. * jit.c (jit_read_descriptor): Likewise. (jit_read_code_entry): Likewise. (jit_symtab_line_mapping_add_impl): Likewise. (finalize_symtab): Likewise. (jit_unwind_reg_get_impl): Likewise. * jv-exp.y (QualifiedName): Likewise. * jv-lang.c (get_java_utf8_name): Likewise. (type_from_class): Likewise. (java_demangle_type_signature): Likewise. (java_class_name_from_physname): Likewise. * jv-typeprint.c (java_type_print_base): Likewise. * jv-valprint.c (java_value_print): Likewise. * language.c (add_language): Likewise. * linespec.c (add_sal_to_sals_basic): Likewise. (add_sal_to_sals): Likewise. (decode_objc): Likewise. (find_linespec_symbols): Likewise. * linux-fork.c (fork_save_infrun_state): Likewise. * linux-nat.c (linux_nat_detach): Likewise. (linux_nat_fileio_readlink): Likewise. * linux-record.c (record_linux_sockaddr): Likewise. (record_linux_msghdr): Likewise. (Do): Likewise. * linux-tdep.c (linux_core_info_proc_mappings): Likewise. (linux_collect_regset_section_cb): Likewise. (linux_get_siginfo_data): Likewise. * linux-thread-db.c (try_thread_db_load_from_pdir_1): Likewise. (try_thread_db_load_from_dir): Likewise. (thread_db_load_search): Likewise. (info_auto_load_libthread_db): Likewise. * m32c-tdep.c (m32c_m16c_address_to_pointer): Likewise. (m32c_m16c_pointer_to_address): Likewise. * m68hc11-tdep.c (m68hc11_pseudo_register_write): Likewise. * m68k-tdep.c (m68k_get_longjmp_target): Likewise. * machoread.c (macho_check_dsym): Likewise. * macroexp.c (resize_buffer): Likewise. (gather_arguments): Likewise. (maybe_expand): Likewise. * macrotab.c (new_macro_key): Likewise. (new_source_file): Likewise. (new_macro_definition): Likewise. * mdebugread.c (parse_symbol): Likewise. (parse_type): Likewise. (parse_partial_symbols): Likewise. (psymtab_to_symtab_1): Likewise. * mem-break.c (default_memory_insert_breakpoint): Likewise. * mi/mi-cmd-break.c (mi_argv_to_format): Likewise. * mi/mi-main.c (mi_cmd_data_read_memory): Likewise. (mi_cmd_data_read_memory_bytes): Likewise. (mi_cmd_data_write_memory_bytes): Likewise. (mi_cmd_trace_frame_collected): Likewise. * mi/mi-parse.c (mi_parse_argv): Likewise. (mi_parse): Likewise. * minidebug.c (lzma_open): Likewise. (lzma_pread): Likewise. * mips-tdep.c (mips_read_fp_register_single): Likewise. (mips_print_fp_register): Likewise. * mipsnbsd-tdep.c (mipsnbsd_get_longjmp_target): Likewise. * mipsread.c (read_alphacoff_dynamic_symtab): Likewise. * mt-tdep.c (mt_register_name): Likewise. (mt_registers_info): Likewise. (mt_push_dummy_call): Likewise. * namespace.c (add_using_directive): Likewise. * nat/linux-btrace.c (perf_event_read): Likewise. (linux_enable_bts): Likewise. * nat/linux-osdata.c (linux_common_core_of_thread): Likewise. * nat/linux-ptrace.c (linux_ptrace_test_ret_to_nx): Likewise. * nto-tdep.c (nto_find_and_open_solib): Likewise. (nto_parse_redirection): Likewise. * objc-lang.c (objc_demangle): Likewise. (find_methods): Likewise. * objfiles.c (get_objfile_bfd_data): Likewise. (set_objfile_main_name): Likewise. (allocate_objfile): Likewise. (objfile_relocate): Likewise. (update_section_map): Likewise. * osabi.c (generic_elf_osabi_sniff_abi_tag_sections): Likewise. * p-exp.y (exp): Likewise. (yylex): Likewise. * p-valprint.c (pascal_object_print_value): Likewise. * parse.c (initialize_expout): Likewise. (mark_completion_tag): Likewise. (copy_name): Likewise. (parse_float): Likewise. (type_stack_reserve): Likewise. * ppc-linux-tdep.c (ppc_stap_parse_special_token): Likewise. (ppu2spu_prev_register): Likewise. * ppc-ravenscar-thread.c (supply_register_at_address): Likewise. * printcmd.c (printf_wide_c_string): Likewise. (printf_pointer): Likewise. * probe.c (parse_probes): Likewise. * python/py-cmd.c (gdbpy_parse_command_name): Likewise. (cmdpy_init): Likewise. * python/py-gdb-readline.c (gdbpy_readline_wrapper): Likewise. * python/py-symtab.c (set_sal): Likewise. * python/py-unwind.c (pyuw_sniffer): Likewise. * python/python.c (python_interactive_command): Likewise. (compute_python_string): Likewise. * ravenscar-thread.c (get_running_thread_id): Likewise. * record-full.c (record_full_exec_insn): Likewise. (record_full_core_open_1): Likewise. * regcache.c (regcache_raw_read_signed): Likewise. (regcache_raw_read_unsigned): Likewise. (regcache_cooked_read_signed): Likewise. (regcache_cooked_read_unsigned): Likewise. * remote-fileio.c (remote_fileio_func_open): Likewise. (remote_fileio_func_rename): Likewise. (remote_fileio_func_unlink): Likewise. (remote_fileio_func_stat): Likewise. (remote_fileio_func_system): Likewise. * remote-mips.c (mips_xfer_memory): Likewise. (mips_load_srec): Likewise. (pmon_end_download): Likewise. * remote.c (new_remote_state): Likewise. (map_regcache_remote_table): Likewise. (remote_register_number_and_offset): Likewise. (init_remote_state): Likewise. (get_memory_packet_size): Likewise. (remote_pass_signals): Likewise. (remote_program_signals): Likewise. (remote_start_remote): Likewise. (remote_check_symbols): Likewise. (remote_query_supported): Likewise. (extended_remote_attach): Likewise. (process_g_packet): Likewise. (store_registers_using_G): Likewise. (putpkt_binary): Likewise. (read_frame): Likewise. (compare_sections_command): Likewise. (remote_hostio_pread): Likewise. (remote_hostio_readlink): Likewise. (remote_file_put): Likewise. (remote_file_get): Likewise. (remote_pid_to_exec_file): Likewise. (_initialize_remote): Likewise. * rs6000-aix-tdep.c (rs6000_aix_ld_info_to_xml): Likewise. (rs6000_aix_core_xfer_shared_libraries_aix): Likewise. * rs6000-tdep.c (ppc_displaced_step_copy_insn): Likewise. (bfd_uses_spe_extensions): Likewise. * s390-linux-tdep.c (s390_displaced_step_copy_insn): Likewise. * score-tdep.c (score7_malloc_and_get_memblock): Likewise. * solib-dsbt.c (decode_loadmap): Likewise. (fetch_loadmap): Likewise. (scan_dyntag): Likewise. (enable_break): Likewise. (dsbt_relocate_main_executable): Likewise. * solib-frv.c (fetch_loadmap): Likewise. (enable_break2): Likewise. (frv_relocate_main_executable): Likewise. * solib-spu.c (spu_relocate_main_executable): Likewise. (spu_bfd_open): Likewise. * solib-svr4.c (lm_info_read): Likewise. (read_program_header): Likewise. (find_program_interpreter): Likewise. (scan_dyntag): Likewise. (elf_locate_base): Likewise. (open_symbol_file_object): Likewise. (read_program_headers_from_bfd): Likewise. (svr4_relocate_main_executable): Likewise. * solib-target.c (solib_target_relocate_section_addresses): Likewise. * solib.c (solib_find_1): Likewise. (exec_file_find): Likewise. (solib_find): Likewise. * source.c (openp): Likewise. (print_source_lines_base): Likewise. (forward_search_command): Likewise. * sparc-ravenscar-thread.c (supply_register_at_address): Likewise. * spu-tdep.c (spu2ppu_prev_register): Likewise. (spu_get_overlay_table): Likewise. * stabsread.c (patch_block_stabs): Likewise. (define_symbol): Likewise. (again:): Likewise. (read_member_functions): Likewise. (read_one_struct_field): Likewise. (read_enum_type): Likewise. (common_block_start): Likewise. * stack.c (read_frame_arg): Likewise. (backtrace_command): Likewise. * stap-probe.c (stap_parse_register_operand): Likewise. * symfile.c (syms_from_objfile_1): Likewise. (find_separate_debug_file): Likewise. (load_command): Likewise. (load_progress): Likewise. (load_section_callback): Likewise. (reread_symbols): Likewise. (add_filename_language): Likewise. (allocate_compunit_symtab): Likewise. (read_target_long_array): Likewise. (simple_read_overlay_table): Likewise. * symtab.c (symbol_set_names): Likewise. (resize_symbol_cache): Likewise. (rbreak_command): Likewise. (completion_list_add_name): Likewise. (completion_list_objc_symbol): Likewise. (add_filename_to_list): Likewise. * target-descriptions.c (maint_print_c_tdesc_cmd): Likewise. * target-memory.c (target_write_memory_blocks): Likewise. * target.c (target_read_string): Likewise. (read_whatever_is_readable): Likewise. (target_read_alloc_1): Likewise. (simple_search_memory): Likewise. (target_fileio_read_alloc_1): Likewise. * tilegx-tdep.c (tilegx_push_dummy_call): Likewise. * top.c (command_line_input): Likewise. * tracefile-tfile.c (tfile_fetch_registers): Likewise. * tracefile.c (tracefile_fetch_registers): Likewise. * tracepoint.c (add_memrange): Likewise. (init_collection_list): Likewise. (add_aexpr): Likewise. (trace_dump_actions): Likewise. (parse_trace_status): Likewise. (parse_tracepoint_definition): Likewise. (parse_tsv_definition): Likewise. (parse_static_tracepoint_marker_definition): Likewise. * tui/tui-file.c (tui_sfileopen): Likewise. (tui_file_adjust_strbuf): Likewise. * tui/tui-io.c (tui_expand_tabs): Likewise. * tui/tui-source.c (tui_set_source_content): Likewise. * typeprint.c (find_global_typedef): Likewise. * ui-file.c (do_ui_file_xstrdup): Likewise. (ui_file_obsavestring): Likewise. (mem_file_write): Likewise. * utils.c (make_hex_string): Likewise. (get_regcomp_error): Likewise. (puts_filtered_tabular): Likewise. (gdb_realpath_keepfile): Likewise. (ldirname): Likewise. (gdb_bfd_errmsg): Likewise. (substitute_path_component): Likewise. * valops.c (search_struct_method): Likewise. (find_oload_champ_namespace_loop): Likewise. * valprint.c (print_decimal_chars): Likewise. (read_string): Likewise. (generic_emit_char): Likewise. * varobj.c (varobj_delete): Likewise. (varobj_value_get_print_value): Likewise. * vaxobsd-tdep.c (vaxobsd_sigtramp_sniffer): Likewise. * windows-tdep.c (display_one_tib): Likewise. * xcoffread.c (read_xcoff_symtab): Likewise. (process_xcoff_symbol): Likewise. (swap_sym): Likewise. (scan_xcoff_symtab): Likewise. (xcoff_initial_scan): Likewise. * xml-support.c (gdb_xml_end_element): Likewise. (xml_process_xincludes): Likewise. (xml_fetch_content_from_file): Likewise. * xml-syscall.c (xml_list_of_syscalls): Likewise. * xstormy16-tdep.c (xstormy16_push_dummy_call): Likewise. gdb/gdbserver/ChangeLog: * ax.c (gdb_parse_agent_expr): Add cast to allocation result assignment. (gdb_unparse_agent_expr): Likewise. * hostio.c (require_data): Likewise. (handle_pread): Likewise. * linux-low.c (disable_regset): Likewise. (fetch_register): Likewise. (store_register): Likewise. (get_dynamic): Likewise. (linux_qxfer_libraries_svr4): Likewise. * mem-break.c (delete_fast_tracepoint_jump): Likewise. (set_fast_tracepoint_jump): Likewise. (uninsert_fast_tracepoint_jumps_at): Likewise. (reinsert_fast_tracepoint_jumps_at): Likewise. (validate_inserted_breakpoint): Likewise. (clone_agent_expr): Likewise. * regcache.c (init_register_cache): Likewise. * remote-utils.c (putpkt_binary_1): Likewise. (decode_M_packet): Likewise. (decode_X_packet): Likewise. (look_up_one_symbol): Likewise. (relocate_instruction): Likewise. (monitor_output): Likewise. * server.c (handle_search_memory): Likewise. (handle_qxfer_exec_file): Likewise. (handle_qxfer_libraries): Likewise. (handle_qxfer): Likewise. (handle_query): Likewise. (handle_v_cont): Likewise. (handle_v_run): Likewise. (captured_main): Likewise. * target.c (write_inferior_memory): Likewise. * thread-db.c (try_thread_db_load_from_dir): Likewise. * tracepoint.c (init_trace_buffer): Likewise. (add_tracepoint_action): Likewise. (add_traceframe): Likewise. (add_traceframe_block): Likewise. (cmd_qtdpsrc): Likewise. (cmd_qtdv): Likewise. (cmd_qtstatus): Likewise. (response_source): Likewise. (response_tsv): Likewise. (cmd_qtnotes): Likewise. (gdb_collect): Likewise. (initialize_tracepoint): Likewise.
849 lines
23 KiB
C
849 lines
23 KiB
C
/* Support for printing C++ values for GDB, the GNU debugger.
|
|
|
|
Copyright (C) 1986-2015 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "gdb_obstack.h"
|
|
#include "symtab.h"
|
|
#include "gdbtypes.h"
|
|
#include "expression.h"
|
|
#include "value.h"
|
|
#include "command.h"
|
|
#include "gdbcmd.h"
|
|
#include "demangle.h"
|
|
#include "annotate.h"
|
|
#include "c-lang.h"
|
|
#include "target.h"
|
|
#include "cp-abi.h"
|
|
#include "valprint.h"
|
|
#include "cp-support.h"
|
|
#include "language.h"
|
|
#include "extension.h"
|
|
#include "typeprint.h"
|
|
|
|
/* Controls printing of vtbl's. */
|
|
static void
|
|
show_vtblprint (struct ui_file *file, int from_tty,
|
|
struct cmd_list_element *c, const char *value)
|
|
{
|
|
fprintf_filtered (file, _("\
|
|
Printing of C++ virtual function tables is %s.\n"),
|
|
value);
|
|
}
|
|
|
|
/* Controls looking up an object's derived type using what we find in
|
|
its vtables. */
|
|
static void
|
|
show_objectprint (struct ui_file *file, int from_tty,
|
|
struct cmd_list_element *c,
|
|
const char *value)
|
|
{
|
|
fprintf_filtered (file, _("\
|
|
Printing of object's derived type based on vtable info is %s.\n"),
|
|
value);
|
|
}
|
|
|
|
static void
|
|
show_static_field_print (struct ui_file *file, int from_tty,
|
|
struct cmd_list_element *c,
|
|
const char *value)
|
|
{
|
|
fprintf_filtered (file,
|
|
_("Printing of C++ static members is %s.\n"),
|
|
value);
|
|
}
|
|
|
|
|
|
static struct obstack dont_print_vb_obstack;
|
|
static struct obstack dont_print_statmem_obstack;
|
|
static struct obstack dont_print_stat_array_obstack;
|
|
|
|
extern void _initialize_cp_valprint (void);
|
|
|
|
static void cp_print_static_field (struct type *, struct value *,
|
|
struct ui_file *, int,
|
|
const struct value_print_options *);
|
|
|
|
static void cp_print_value (struct type *, struct type *,
|
|
const gdb_byte *, int,
|
|
CORE_ADDR, struct ui_file *,
|
|
int, const struct value *,
|
|
const struct value_print_options *,
|
|
struct type **);
|
|
|
|
|
|
/* GCC versions after 2.4.5 use this. */
|
|
EXPORTED_CONST char vtbl_ptr_name[] = "__vtbl_ptr_type";
|
|
|
|
/* Return truth value for assertion that TYPE is of the type
|
|
"pointer to virtual function". */
|
|
|
|
int
|
|
cp_is_vtbl_ptr_type (struct type *type)
|
|
{
|
|
const char *type_name = type_name_no_tag (type);
|
|
|
|
return (type_name != NULL && !strcmp (type_name, vtbl_ptr_name));
|
|
}
|
|
|
|
/* Return truth value for the assertion that TYPE is of the type
|
|
"pointer to virtual function table". */
|
|
|
|
int
|
|
cp_is_vtbl_member (struct type *type)
|
|
{
|
|
/* With older versions of g++, the vtbl field pointed to an array of
|
|
structures. Nowadays it points directly to the structure. */
|
|
if (TYPE_CODE (type) == TYPE_CODE_PTR)
|
|
{
|
|
type = TYPE_TARGET_TYPE (type);
|
|
if (TYPE_CODE (type) == TYPE_CODE_ARRAY)
|
|
{
|
|
type = TYPE_TARGET_TYPE (type);
|
|
if (TYPE_CODE (type) == TYPE_CODE_STRUCT /* if not using thunks */
|
|
|| TYPE_CODE (type) == TYPE_CODE_PTR) /* if using thunks */
|
|
{
|
|
/* Virtual functions tables are full of pointers
|
|
to virtual functions. */
|
|
return cp_is_vtbl_ptr_type (type);
|
|
}
|
|
}
|
|
else if (TYPE_CODE (type) == TYPE_CODE_STRUCT) /* if not using thunks */
|
|
{
|
|
return cp_is_vtbl_ptr_type (type);
|
|
}
|
|
else if (TYPE_CODE (type) == TYPE_CODE_PTR) /* if using thunks */
|
|
{
|
|
/* The type name of the thunk pointer is NULL when using
|
|
dwarf2. We could test for a pointer to a function, but
|
|
there is no type info for the virtual table either, so it
|
|
wont help. */
|
|
return cp_is_vtbl_ptr_type (type);
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* Mutually recursive subroutines of cp_print_value and c_val_print to
|
|
print out a structure's fields: cp_print_value_fields and
|
|
cp_print_value.
|
|
|
|
TYPE, VALADDR, ADDRESS, STREAM, RECURSE, and OPTIONS have the same
|
|
meanings as in cp_print_value and c_val_print.
|
|
|
|
2nd argument REAL_TYPE is used to carry over the type of the
|
|
derived class across the recursion to base classes.
|
|
|
|
DONT_PRINT is an array of baseclass types that we should not print,
|
|
or zero if called from top level. */
|
|
|
|
void
|
|
cp_print_value_fields (struct type *type, struct type *real_type,
|
|
const gdb_byte *valaddr, int offset,
|
|
CORE_ADDR address, struct ui_file *stream,
|
|
int recurse, const struct value *val,
|
|
const struct value_print_options *options,
|
|
struct type **dont_print_vb,
|
|
int dont_print_statmem)
|
|
{
|
|
int i, len, n_baseclasses;
|
|
int fields_seen = 0;
|
|
static int last_set_recurse = -1;
|
|
|
|
type = check_typedef (type);
|
|
|
|
if (recurse == 0)
|
|
{
|
|
/* Any object can be left on obstacks only during an unexpected
|
|
error. */
|
|
|
|
if (obstack_object_size (&dont_print_statmem_obstack) > 0)
|
|
{
|
|
obstack_free (&dont_print_statmem_obstack, NULL);
|
|
obstack_begin (&dont_print_statmem_obstack,
|
|
32 * sizeof (CORE_ADDR));
|
|
}
|
|
if (obstack_object_size (&dont_print_stat_array_obstack) > 0)
|
|
{
|
|
obstack_free (&dont_print_stat_array_obstack, NULL);
|
|
obstack_begin (&dont_print_stat_array_obstack,
|
|
32 * sizeof (struct type *));
|
|
}
|
|
}
|
|
|
|
fprintf_filtered (stream, "{");
|
|
len = TYPE_NFIELDS (type);
|
|
n_baseclasses = TYPE_N_BASECLASSES (type);
|
|
|
|
/* First, print out baseclasses such that we don't print
|
|
duplicates of virtual baseclasses. */
|
|
|
|
if (n_baseclasses > 0)
|
|
cp_print_value (type, real_type, valaddr,
|
|
offset, address, stream,
|
|
recurse + 1, val, options,
|
|
dont_print_vb);
|
|
|
|
/* Second, print out data fields */
|
|
|
|
/* If there are no data fields, skip this part */
|
|
if (len == n_baseclasses || !len)
|
|
fprintf_filtered (stream, "<No data fields>");
|
|
else
|
|
{
|
|
size_t statmem_obstack_initial_size = 0;
|
|
size_t stat_array_obstack_initial_size = 0;
|
|
struct type *vptr_basetype = NULL;
|
|
int vptr_fieldno;
|
|
|
|
if (dont_print_statmem == 0)
|
|
{
|
|
statmem_obstack_initial_size =
|
|
obstack_object_size (&dont_print_statmem_obstack);
|
|
|
|
if (last_set_recurse != recurse)
|
|
{
|
|
stat_array_obstack_initial_size =
|
|
obstack_object_size (&dont_print_stat_array_obstack);
|
|
|
|
last_set_recurse = recurse;
|
|
}
|
|
}
|
|
|
|
vptr_fieldno = get_vptr_fieldno (type, &vptr_basetype);
|
|
for (i = n_baseclasses; i < len; i++)
|
|
{
|
|
/* If requested, skip printing of static fields. */
|
|
if (!options->static_field_print
|
|
&& field_is_static (&TYPE_FIELD (type, i)))
|
|
continue;
|
|
|
|
if (fields_seen)
|
|
fprintf_filtered (stream, ", ");
|
|
else if (n_baseclasses > 0)
|
|
{
|
|
if (options->prettyformat)
|
|
{
|
|
fprintf_filtered (stream, "\n");
|
|
print_spaces_filtered (2 + 2 * recurse, stream);
|
|
fputs_filtered ("members of ", stream);
|
|
fputs_filtered (type_name_no_tag (type), stream);
|
|
fputs_filtered (": ", stream);
|
|
}
|
|
}
|
|
fields_seen = 1;
|
|
|
|
if (options->prettyformat)
|
|
{
|
|
fprintf_filtered (stream, "\n");
|
|
print_spaces_filtered (2 + 2 * recurse, stream);
|
|
}
|
|
else
|
|
{
|
|
wrap_here (n_spaces (2 + 2 * recurse));
|
|
}
|
|
|
|
annotate_field_begin (TYPE_FIELD_TYPE (type, i));
|
|
|
|
if (field_is_static (&TYPE_FIELD (type, i)))
|
|
fputs_filtered ("static ", stream);
|
|
fprintf_symbol_filtered (stream,
|
|
TYPE_FIELD_NAME (type, i),
|
|
current_language->la_language,
|
|
DMGL_PARAMS | DMGL_ANSI);
|
|
annotate_field_name_end ();
|
|
/* Do not print leading '=' in case of anonymous
|
|
unions. */
|
|
if (strcmp (TYPE_FIELD_NAME (type, i), ""))
|
|
fputs_filtered (" = ", stream);
|
|
annotate_field_value ();
|
|
|
|
if (!field_is_static (&TYPE_FIELD (type, i))
|
|
&& TYPE_FIELD_PACKED (type, i))
|
|
{
|
|
struct value *v;
|
|
|
|
/* Bitfields require special handling, especially due to
|
|
byte order problems. */
|
|
if (TYPE_FIELD_IGNORE (type, i))
|
|
{
|
|
fputs_filtered ("<optimized out or zero length>", stream);
|
|
}
|
|
else if (value_bits_synthetic_pointer (val,
|
|
TYPE_FIELD_BITPOS (type,
|
|
i),
|
|
TYPE_FIELD_BITSIZE (type,
|
|
i)))
|
|
{
|
|
fputs_filtered (_("<synthetic pointer>"), stream);
|
|
}
|
|
else
|
|
{
|
|
struct value_print_options opts = *options;
|
|
|
|
opts.deref_ref = 0;
|
|
|
|
v = value_field_bitfield (type, i, valaddr, offset, val);
|
|
|
|
common_val_print (v, stream, recurse + 1, &opts,
|
|
current_language);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (TYPE_FIELD_IGNORE (type, i))
|
|
{
|
|
fputs_filtered ("<optimized out or zero length>",
|
|
stream);
|
|
}
|
|
else if (field_is_static (&TYPE_FIELD (type, i)))
|
|
{
|
|
struct value *v = NULL;
|
|
|
|
TRY
|
|
{
|
|
v = value_static_field (type, i);
|
|
}
|
|
|
|
CATCH (ex, RETURN_MASK_ERROR)
|
|
{
|
|
fprintf_filtered (stream,
|
|
_("<error reading variable: %s>"),
|
|
ex.message);
|
|
}
|
|
END_CATCH
|
|
|
|
cp_print_static_field (TYPE_FIELD_TYPE (type, i),
|
|
v, stream, recurse + 1,
|
|
options);
|
|
}
|
|
else if (i == vptr_fieldno && type == vptr_basetype)
|
|
{
|
|
int i_offset = offset + TYPE_FIELD_BITPOS (type, i) / 8;
|
|
struct type *i_type = TYPE_FIELD_TYPE (type, i);
|
|
|
|
if (valprint_check_validity (stream, i_type, i_offset, val))
|
|
{
|
|
CORE_ADDR addr;
|
|
|
|
addr = extract_typed_address (valaddr + i_offset, i_type);
|
|
print_function_pointer_address (options,
|
|
get_type_arch (type),
|
|
addr, stream);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
struct value_print_options opts = *options;
|
|
|
|
opts.deref_ref = 0;
|
|
val_print (TYPE_FIELD_TYPE (type, i),
|
|
valaddr,
|
|
offset + TYPE_FIELD_BITPOS (type, i) / 8,
|
|
address,
|
|
stream, recurse + 1, val, &opts,
|
|
current_language);
|
|
}
|
|
}
|
|
annotate_field_end ();
|
|
}
|
|
|
|
if (dont_print_statmem == 0)
|
|
{
|
|
size_t obstack_final_size =
|
|
obstack_object_size (&dont_print_statmem_obstack);
|
|
|
|
if (obstack_final_size > statmem_obstack_initial_size)
|
|
{
|
|
/* In effect, a pop of the printed-statics stack. */
|
|
|
|
void *free_to_ptr =
|
|
(char *) obstack_next_free (&dont_print_statmem_obstack) -
|
|
(obstack_final_size - statmem_obstack_initial_size);
|
|
|
|
obstack_free (&dont_print_statmem_obstack,
|
|
free_to_ptr);
|
|
}
|
|
|
|
if (last_set_recurse != recurse)
|
|
{
|
|
size_t obstack_final_size =
|
|
obstack_object_size (&dont_print_stat_array_obstack);
|
|
|
|
if (obstack_final_size > stat_array_obstack_initial_size)
|
|
{
|
|
void *free_to_ptr =
|
|
(char *) obstack_next_free (&dont_print_stat_array_obstack)
|
|
- (obstack_final_size
|
|
- stat_array_obstack_initial_size);
|
|
|
|
obstack_free (&dont_print_stat_array_obstack,
|
|
free_to_ptr);
|
|
}
|
|
last_set_recurse = -1;
|
|
}
|
|
}
|
|
|
|
if (options->prettyformat)
|
|
{
|
|
fprintf_filtered (stream, "\n");
|
|
print_spaces_filtered (2 * recurse, stream);
|
|
}
|
|
} /* if there are data fields */
|
|
|
|
fprintf_filtered (stream, "}");
|
|
}
|
|
|
|
/* Like cp_print_value_fields, but find the runtime type of the object
|
|
and pass it as the `real_type' argument to cp_print_value_fields.
|
|
This function is a hack to work around the fact that
|
|
common_val_print passes the embedded offset to val_print, but not
|
|
the enclosing type. */
|
|
|
|
void
|
|
cp_print_value_fields_rtti (struct type *type,
|
|
const gdb_byte *valaddr, int offset,
|
|
CORE_ADDR address,
|
|
struct ui_file *stream, int recurse,
|
|
const struct value *val,
|
|
const struct value_print_options *options,
|
|
struct type **dont_print_vb,
|
|
int dont_print_statmem)
|
|
{
|
|
struct type *real_type = NULL;
|
|
|
|
/* We require all bits to be valid in order to attempt a
|
|
conversion. */
|
|
if (!value_bits_any_optimized_out (val,
|
|
TARGET_CHAR_BIT * offset,
|
|
TARGET_CHAR_BIT * TYPE_LENGTH (type)))
|
|
{
|
|
struct value *value;
|
|
int full, top, using_enc;
|
|
|
|
/* Ugh, we have to convert back to a value here. */
|
|
value = value_from_contents_and_address (type, valaddr + offset,
|
|
address + offset);
|
|
type = value_type (value);
|
|
/* We don't actually care about most of the result here -- just
|
|
the type. We already have the correct offset, due to how
|
|
val_print was initially called. */
|
|
real_type = value_rtti_type (value, &full, &top, &using_enc);
|
|
}
|
|
|
|
if (!real_type)
|
|
real_type = type;
|
|
|
|
cp_print_value_fields (type, real_type, valaddr, offset,
|
|
address, stream, recurse, val, options,
|
|
dont_print_vb, dont_print_statmem);
|
|
}
|
|
|
|
/* Special val_print routine to avoid printing multiple copies of
|
|
virtual baseclasses. */
|
|
|
|
static void
|
|
cp_print_value (struct type *type, struct type *real_type,
|
|
const gdb_byte *valaddr, int offset,
|
|
CORE_ADDR address, struct ui_file *stream,
|
|
int recurse, const struct value *val,
|
|
const struct value_print_options *options,
|
|
struct type **dont_print_vb)
|
|
{
|
|
struct type **last_dont_print
|
|
= (struct type **) obstack_next_free (&dont_print_vb_obstack);
|
|
struct obstack tmp_obstack = dont_print_vb_obstack;
|
|
int i, n_baseclasses = TYPE_N_BASECLASSES (type);
|
|
int thisoffset;
|
|
struct type *thistype;
|
|
|
|
if (dont_print_vb == 0)
|
|
{
|
|
/* If we're at top level, carve out a completely fresh chunk of
|
|
the obstack and use that until this particular invocation
|
|
returns. */
|
|
/* Bump up the high-water mark. Now alpha is omega. */
|
|
obstack_finish (&dont_print_vb_obstack);
|
|
}
|
|
|
|
for (i = 0; i < n_baseclasses; i++)
|
|
{
|
|
int boffset = 0;
|
|
int skip = 0;
|
|
struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
|
|
const char *basename = TYPE_NAME (baseclass);
|
|
const gdb_byte *base_valaddr = NULL;
|
|
const struct value *base_val = NULL;
|
|
|
|
if (BASETYPE_VIA_VIRTUAL (type, i))
|
|
{
|
|
struct type **first_dont_print
|
|
= (struct type **) obstack_base (&dont_print_vb_obstack);
|
|
|
|
int j = (struct type **)
|
|
obstack_next_free (&dont_print_vb_obstack) - first_dont_print;
|
|
|
|
while (--j >= 0)
|
|
if (baseclass == first_dont_print[j])
|
|
goto flush_it;
|
|
|
|
obstack_ptr_grow (&dont_print_vb_obstack, baseclass);
|
|
}
|
|
|
|
thisoffset = offset;
|
|
thistype = real_type;
|
|
|
|
TRY
|
|
{
|
|
boffset = baseclass_offset (type, i, valaddr, offset, address, val);
|
|
}
|
|
CATCH (ex, RETURN_MASK_ERROR)
|
|
{
|
|
if (ex.error == NOT_AVAILABLE_ERROR)
|
|
skip = -1;
|
|
else
|
|
skip = 1;
|
|
}
|
|
END_CATCH
|
|
|
|
if (skip == 0)
|
|
{
|
|
if (BASETYPE_VIA_VIRTUAL (type, i))
|
|
{
|
|
/* The virtual base class pointer might have been
|
|
clobbered by the user program. Make sure that it
|
|
still points to a valid memory location. */
|
|
|
|
if ((boffset + offset) < 0
|
|
|| (boffset + offset) >= TYPE_LENGTH (real_type))
|
|
{
|
|
gdb_byte *buf;
|
|
struct cleanup *back_to;
|
|
|
|
buf = (gdb_byte *) xmalloc (TYPE_LENGTH (baseclass));
|
|
back_to = make_cleanup (xfree, buf);
|
|
|
|
if (target_read_memory (address + boffset, buf,
|
|
TYPE_LENGTH (baseclass)) != 0)
|
|
skip = 1;
|
|
base_val = value_from_contents_and_address (baseclass,
|
|
buf,
|
|
address + boffset);
|
|
baseclass = value_type (base_val);
|
|
thisoffset = 0;
|
|
boffset = 0;
|
|
thistype = baseclass;
|
|
base_valaddr = value_contents_for_printing_const (base_val);
|
|
do_cleanups (back_to);
|
|
}
|
|
else
|
|
{
|
|
base_valaddr = valaddr;
|
|
base_val = val;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
base_valaddr = valaddr;
|
|
base_val = val;
|
|
}
|
|
}
|
|
|
|
/* Now do the printing. */
|
|
if (options->prettyformat)
|
|
{
|
|
fprintf_filtered (stream, "\n");
|
|
print_spaces_filtered (2 * recurse, stream);
|
|
}
|
|
fputs_filtered ("<", stream);
|
|
/* Not sure what the best notation is in the case where there is
|
|
no baseclass name. */
|
|
fputs_filtered (basename ? basename : "", stream);
|
|
fputs_filtered ("> = ", stream);
|
|
|
|
if (skip < 0)
|
|
val_print_unavailable (stream);
|
|
else if (skip > 0)
|
|
val_print_invalid_address (stream);
|
|
else
|
|
{
|
|
int result = 0;
|
|
|
|
/* Attempt to run an extension language pretty-printer on the
|
|
baseclass if possible. */
|
|
if (!options->raw)
|
|
result
|
|
= apply_ext_lang_val_pretty_printer (baseclass, base_valaddr,
|
|
thisoffset + boffset,
|
|
value_address (base_val),
|
|
stream, recurse,
|
|
base_val, options,
|
|
current_language);
|
|
|
|
if (!result)
|
|
cp_print_value_fields (baseclass, thistype, base_valaddr,
|
|
thisoffset + boffset,
|
|
value_address (base_val),
|
|
stream, recurse, base_val, options,
|
|
((struct type **)
|
|
obstack_base (&dont_print_vb_obstack)),
|
|
0);
|
|
}
|
|
fputs_filtered (", ", stream);
|
|
|
|
flush_it:
|
|
;
|
|
}
|
|
|
|
if (dont_print_vb == 0)
|
|
{
|
|
/* Free the space used to deal with the printing
|
|
of this type from top level. */
|
|
obstack_free (&dont_print_vb_obstack, last_dont_print);
|
|
/* Reset watermark so that we can continue protecting
|
|
ourselves from whatever we were protecting ourselves. */
|
|
dont_print_vb_obstack = tmp_obstack;
|
|
}
|
|
}
|
|
|
|
/* Print value of a static member. To avoid infinite recursion when
|
|
printing a class that contains a static instance of the class, we
|
|
keep the addresses of all printed static member classes in an
|
|
obstack and refuse to print them more than once.
|
|
|
|
VAL contains the value to print, TYPE, STREAM, RECURSE, and OPTIONS
|
|
have the same meanings as in c_val_print. */
|
|
|
|
static void
|
|
cp_print_static_field (struct type *type,
|
|
struct value *val,
|
|
struct ui_file *stream,
|
|
int recurse,
|
|
const struct value_print_options *options)
|
|
{
|
|
struct value_print_options opts;
|
|
|
|
if (value_entirely_optimized_out (val))
|
|
{
|
|
val_print_optimized_out (val, stream);
|
|
return;
|
|
}
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
|
|
{
|
|
CORE_ADDR *first_dont_print;
|
|
CORE_ADDR addr;
|
|
int i;
|
|
|
|
first_dont_print
|
|
= (CORE_ADDR *) obstack_base (&dont_print_statmem_obstack);
|
|
i = obstack_object_size (&dont_print_statmem_obstack)
|
|
/ sizeof (CORE_ADDR);
|
|
|
|
while (--i >= 0)
|
|
{
|
|
if (value_address (val) == first_dont_print[i])
|
|
{
|
|
fputs_filtered ("<same as static member of an already"
|
|
" seen type>",
|
|
stream);
|
|
return;
|
|
}
|
|
}
|
|
|
|
addr = value_address (val);
|
|
obstack_grow (&dont_print_statmem_obstack, (char *) &addr,
|
|
sizeof (CORE_ADDR));
|
|
type = check_typedef (type);
|
|
cp_print_value_fields (type, value_enclosing_type (val),
|
|
value_contents_for_printing (val),
|
|
value_embedded_offset (val), addr,
|
|
stream, recurse, val,
|
|
options, NULL, 1);
|
|
return;
|
|
}
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_ARRAY)
|
|
{
|
|
struct type **first_dont_print;
|
|
int i;
|
|
struct type *target_type = TYPE_TARGET_TYPE (type);
|
|
|
|
first_dont_print
|
|
= (struct type **) obstack_base (&dont_print_stat_array_obstack);
|
|
i = obstack_object_size (&dont_print_stat_array_obstack)
|
|
/ sizeof (struct type *);
|
|
|
|
while (--i >= 0)
|
|
{
|
|
if (target_type == first_dont_print[i])
|
|
{
|
|
fputs_filtered ("<same as static member of an already"
|
|
" seen type>",
|
|
stream);
|
|
return;
|
|
}
|
|
}
|
|
|
|
obstack_grow (&dont_print_stat_array_obstack,
|
|
(char *) &target_type,
|
|
sizeof (struct type *));
|
|
}
|
|
|
|
opts = *options;
|
|
opts.deref_ref = 0;
|
|
val_print (type, value_contents_for_printing (val),
|
|
value_embedded_offset (val),
|
|
value_address (val),
|
|
stream, recurse, val,
|
|
&opts, current_language);
|
|
}
|
|
|
|
/* Find the field in *SELF, or its non-virtual base classes, with
|
|
bit offset OFFSET. Set *SELF to the containing type and *FIELDNO
|
|
to the containing field number. If OFFSET is not exactly at the
|
|
start of some field, set *SELF to NULL. */
|
|
|
|
static void
|
|
cp_find_class_member (struct type **self_p, int *fieldno,
|
|
LONGEST offset)
|
|
{
|
|
struct type *self;
|
|
unsigned int i;
|
|
unsigned len;
|
|
|
|
*self_p = check_typedef (*self_p);
|
|
self = *self_p;
|
|
len = TYPE_NFIELDS (self);
|
|
|
|
for (i = TYPE_N_BASECLASSES (self); i < len; i++)
|
|
{
|
|
LONGEST bitpos = TYPE_FIELD_BITPOS (self, i);
|
|
|
|
QUIT;
|
|
if (offset == bitpos)
|
|
{
|
|
*fieldno = i;
|
|
return;
|
|
}
|
|
}
|
|
|
|
for (i = 0; i < TYPE_N_BASECLASSES (self); i++)
|
|
{
|
|
LONGEST bitpos = TYPE_FIELD_BITPOS (self, i);
|
|
LONGEST bitsize = 8 * TYPE_LENGTH (TYPE_FIELD_TYPE (self, i));
|
|
|
|
if (offset >= bitpos && offset < bitpos + bitsize)
|
|
{
|
|
*self_p = TYPE_FIELD_TYPE (self, i);
|
|
cp_find_class_member (self_p, fieldno, offset - bitpos);
|
|
return;
|
|
}
|
|
}
|
|
|
|
*self_p = NULL;
|
|
}
|
|
|
|
void
|
|
cp_print_class_member (const gdb_byte *valaddr, struct type *type,
|
|
struct ui_file *stream, char *prefix)
|
|
{
|
|
enum bfd_endian byte_order = gdbarch_byte_order (get_type_arch (type));
|
|
|
|
/* VAL is a byte offset into the structure type SELF_TYPE.
|
|
Find the name of the field for that offset and
|
|
print it. */
|
|
struct type *self_type = TYPE_SELF_TYPE (type);
|
|
LONGEST val;
|
|
int fieldno;
|
|
|
|
val = extract_signed_integer (valaddr,
|
|
TYPE_LENGTH (type),
|
|
byte_order);
|
|
|
|
/* Pointers to data members are usually byte offsets into an object.
|
|
Because a data member can have offset zero, and a NULL pointer to
|
|
member must be distinct from any valid non-NULL pointer to
|
|
member, either the value is biased or the NULL value has a
|
|
special representation; both are permitted by ISO C++. HP aCC
|
|
used a bias of 0x20000000; HP cfront used a bias of 1; g++ 3.x
|
|
and other compilers which use the Itanium ABI use -1 as the NULL
|
|
value. GDB only supports that last form; to add support for
|
|
another form, make this into a cp-abi hook. */
|
|
|
|
if (val == -1)
|
|
{
|
|
fprintf_filtered (stream, "NULL");
|
|
return;
|
|
}
|
|
|
|
cp_find_class_member (&self_type, &fieldno, val << 3);
|
|
|
|
if (self_type != NULL)
|
|
{
|
|
const char *name;
|
|
|
|
fputs_filtered (prefix, stream);
|
|
name = type_name_no_tag (self_type);
|
|
if (name)
|
|
fputs_filtered (name, stream);
|
|
else
|
|
c_type_print_base (self_type, stream, 0, 0, &type_print_raw_options);
|
|
fprintf_filtered (stream, "::");
|
|
fputs_filtered (TYPE_FIELD_NAME (self_type, fieldno), stream);
|
|
}
|
|
else
|
|
fprintf_filtered (stream, "%ld", (long) val);
|
|
}
|
|
|
|
|
|
void
|
|
_initialize_cp_valprint (void)
|
|
{
|
|
add_setshow_boolean_cmd ("static-members", class_support,
|
|
&user_print_options.static_field_print, _("\
|
|
Set printing of C++ static members."), _("\
|
|
Show printing of C++ static members."), NULL,
|
|
NULL,
|
|
show_static_field_print,
|
|
&setprintlist, &showprintlist);
|
|
|
|
add_setshow_boolean_cmd ("vtbl", class_support,
|
|
&user_print_options.vtblprint, _("\
|
|
Set printing of C++ virtual function tables."), _("\
|
|
Show printing of C++ virtual function tables."), NULL,
|
|
NULL,
|
|
show_vtblprint,
|
|
&setprintlist, &showprintlist);
|
|
|
|
add_setshow_boolean_cmd ("object", class_support,
|
|
&user_print_options.objectprint, _("\
|
|
Set printing of object's derived type based on vtable info."), _("\
|
|
Show printing of object's derived type based on vtable info."), NULL,
|
|
NULL,
|
|
show_objectprint,
|
|
&setprintlist, &showprintlist);
|
|
|
|
obstack_begin (&dont_print_stat_array_obstack,
|
|
32 * sizeof (struct type *));
|
|
obstack_begin (&dont_print_statmem_obstack,
|
|
32 * sizeof (CORE_ADDR));
|
|
obstack_begin (&dont_print_vb_obstack,
|
|
32 * sizeof (struct type *));
|
|
}
|