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.
355 lines
9.5 KiB
C
355 lines
9.5 KiB
C
/* Support for printing Java types for GDB, the GNU debugger.
|
|
Copyright (C) 1997-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 "symtab.h"
|
|
#include "gdbtypes.h"
|
|
#include "value.h"
|
|
#include "demangle.h"
|
|
#include "gdb-demangle.h"
|
|
#include "jv-lang.h"
|
|
#include "typeprint.h"
|
|
#include "c-lang.h"
|
|
#include "cp-abi.h"
|
|
#include "cp-support.h"
|
|
|
|
/* Local functions */
|
|
|
|
static void java_type_print_base (struct type * type,
|
|
struct ui_file *stream, int show,
|
|
int level,
|
|
const struct type_print_options *flags);
|
|
|
|
static void
|
|
java_type_print_derivation_info (struct ui_file *stream, struct type *type)
|
|
{
|
|
const char *name;
|
|
int i;
|
|
int n_bases;
|
|
int prev;
|
|
|
|
n_bases = TYPE_N_BASECLASSES (type);
|
|
|
|
for (i = 0, prev = 0; i < n_bases; i++)
|
|
{
|
|
int kind;
|
|
|
|
kind = BASETYPE_VIA_VIRTUAL (type, i) ? 'I' : 'E';
|
|
|
|
fputs_filtered (kind == prev ? ", "
|
|
: kind == 'I' ? " implements "
|
|
: " extends ",
|
|
stream);
|
|
prev = kind;
|
|
name = type_name_no_tag (TYPE_BASECLASS (type, i));
|
|
|
|
fprintf_filtered (stream, "%s", name ? name : "(null)");
|
|
}
|
|
|
|
if (i > 0)
|
|
fputs_filtered (" ", stream);
|
|
}
|
|
|
|
/* Print the name of the type (or the ultimate pointer target,
|
|
function value or array element), or the description of a
|
|
structure or union.
|
|
|
|
SHOW positive means print details about the type (e.g. enum values),
|
|
and print structure elements passing SHOW - 1 for show.
|
|
SHOW negative means just print the type name or struct tag if there is one.
|
|
If there is no name, print something sensible but concise like
|
|
"struct {...}".
|
|
SHOW zero means just print the type name or struct tag if there is one.
|
|
If there is no name, print something sensible but not as concise like
|
|
"struct {int x; int y;}".
|
|
|
|
LEVEL is the number of spaces to indent by.
|
|
We increase it for some recursive calls. */
|
|
|
|
static void
|
|
java_type_print_base (struct type *type, struct ui_file *stream, int show,
|
|
int level, const struct type_print_options *flags)
|
|
{
|
|
int i;
|
|
int len;
|
|
char *mangled_name;
|
|
char *demangled_name;
|
|
|
|
QUIT;
|
|
wrap_here (" ");
|
|
|
|
if (type == NULL)
|
|
{
|
|
fputs_filtered ("<type unknown>", stream);
|
|
return;
|
|
}
|
|
|
|
/* When SHOW is zero or less, and there is a valid type name, then always
|
|
just print the type name directly from the type. */
|
|
|
|
if (show <= 0
|
|
&& TYPE_NAME (type) != NULL)
|
|
{
|
|
fputs_filtered (TYPE_NAME (type), stream);
|
|
return;
|
|
}
|
|
|
|
type = check_typedef (type);
|
|
|
|
switch (TYPE_CODE (type))
|
|
{
|
|
case TYPE_CODE_PTR:
|
|
java_type_print_base (TYPE_TARGET_TYPE (type), stream, show, level,
|
|
flags);
|
|
break;
|
|
|
|
case TYPE_CODE_STRUCT:
|
|
if (TYPE_TAG_NAME (type) != NULL && TYPE_TAG_NAME (type)[0] == '[')
|
|
{ /* array type */
|
|
char *name = java_demangle_type_signature (TYPE_TAG_NAME (type));
|
|
|
|
fputs_filtered (name, stream);
|
|
xfree (name);
|
|
break;
|
|
}
|
|
|
|
if (show >= 0)
|
|
fprintf_filtered (stream, "class ");
|
|
|
|
if (TYPE_TAG_NAME (type) != NULL)
|
|
{
|
|
fputs_filtered (TYPE_TAG_NAME (type), stream);
|
|
if (show > 0)
|
|
fputs_filtered (" ", stream);
|
|
}
|
|
|
|
wrap_here (" ");
|
|
|
|
if (show < 0)
|
|
{
|
|
/* If we just printed a tag name, no need to print anything else. */
|
|
if (TYPE_TAG_NAME (type) == NULL)
|
|
fprintf_filtered (stream, "{...}");
|
|
}
|
|
else if (show > 0 || TYPE_TAG_NAME (type) == NULL)
|
|
{
|
|
java_type_print_derivation_info (stream, type);
|
|
|
|
fprintf_filtered (stream, "{\n");
|
|
if ((TYPE_NFIELDS (type) == 0) && (TYPE_NFN_FIELDS (type) == 0))
|
|
{
|
|
if (TYPE_STUB (type))
|
|
fprintfi_filtered (level + 4, stream, "<incomplete type>\n");
|
|
else
|
|
fprintfi_filtered (level + 4, stream, "<no data fields>\n");
|
|
}
|
|
|
|
/* If there is a base class for this type,
|
|
do not print the field that it occupies. */
|
|
|
|
len = TYPE_NFIELDS (type);
|
|
for (i = TYPE_N_BASECLASSES (type); i < len; i++)
|
|
{
|
|
QUIT;
|
|
/* Don't print out virtual function table. */
|
|
if (startswith (TYPE_FIELD_NAME (type, i), "_vptr")
|
|
&& is_cplus_marker ((TYPE_FIELD_NAME (type, i))[5]))
|
|
continue;
|
|
|
|
/* Don't print the dummy field "class". */
|
|
if (startswith (TYPE_FIELD_NAME (type, i), "class"))
|
|
continue;
|
|
|
|
print_spaces_filtered (level + 4, stream);
|
|
|
|
if (HAVE_CPLUS_STRUCT (type))
|
|
{
|
|
if (TYPE_FIELD_PROTECTED (type, i))
|
|
fprintf_filtered (stream, "protected ");
|
|
else if (TYPE_FIELD_PRIVATE (type, i))
|
|
fprintf_filtered (stream, "private ");
|
|
else
|
|
fprintf_filtered (stream, "public ");
|
|
}
|
|
|
|
if (field_is_static (&TYPE_FIELD (type, i)))
|
|
fprintf_filtered (stream, "static ");
|
|
|
|
java_print_type (TYPE_FIELD_TYPE (type, i),
|
|
TYPE_FIELD_NAME (type, i),
|
|
stream, show - 1, level + 4, flags);
|
|
|
|
fprintf_filtered (stream, ";\n");
|
|
}
|
|
|
|
/* If there are both fields and methods, put a space between. */
|
|
len = TYPE_NFN_FIELDS (type);
|
|
if (len)
|
|
fprintf_filtered (stream, "\n");
|
|
|
|
/* Print out the methods. */
|
|
|
|
for (i = 0; i < len; i++)
|
|
{
|
|
struct fn_field *f;
|
|
int j;
|
|
const char *method_name;
|
|
const char *name;
|
|
int is_constructor;
|
|
int n_overloads;
|
|
|
|
f = TYPE_FN_FIELDLIST1 (type, i);
|
|
n_overloads = TYPE_FN_FIELDLIST_LENGTH (type, i);
|
|
method_name = TYPE_FN_FIELDLIST_NAME (type, i);
|
|
name = type_name_no_tag (type);
|
|
is_constructor = name && strcmp (method_name, name) == 0;
|
|
|
|
for (j = 0; j < n_overloads; j++)
|
|
{
|
|
const char *real_physname;
|
|
char *physname, *p;
|
|
int is_full_physname_constructor;
|
|
|
|
real_physname = TYPE_FN_FIELD_PHYSNAME (f, j);
|
|
|
|
/* The physname will contain the return type
|
|
after the final closing parenthesis. Strip it off. */
|
|
p = strrchr (real_physname, ')');
|
|
gdb_assert (p != NULL);
|
|
++p; /* Keep the trailing ')'. */
|
|
physname = (char *) alloca (p - real_physname + 1);
|
|
memcpy (physname, real_physname, p - real_physname);
|
|
physname[p - real_physname] = '\0';
|
|
|
|
is_full_physname_constructor
|
|
= (TYPE_FN_FIELD_CONSTRUCTOR (f, j)
|
|
|| is_constructor_name (physname)
|
|
|| is_destructor_name (physname));
|
|
|
|
QUIT;
|
|
|
|
print_spaces_filtered (level + 4, stream);
|
|
|
|
if (TYPE_FN_FIELD_PROTECTED (f, j))
|
|
fprintf_filtered (stream, "protected ");
|
|
else if (TYPE_FN_FIELD_PRIVATE (f, j))
|
|
fprintf_filtered (stream, "private ");
|
|
else if (TYPE_FN_FIELD_PUBLIC (f, j))
|
|
fprintf_filtered (stream, "public ");
|
|
|
|
if (TYPE_FN_FIELD_ABSTRACT (f, j))
|
|
fprintf_filtered (stream, "abstract ");
|
|
if (TYPE_FN_FIELD_STATIC (f, j))
|
|
fprintf_filtered (stream, "static ");
|
|
if (TYPE_FN_FIELD_FINAL (f, j))
|
|
fprintf_filtered (stream, "final ");
|
|
if (TYPE_FN_FIELD_SYNCHRONIZED (f, j))
|
|
fprintf_filtered (stream, "synchronized ");
|
|
if (TYPE_FN_FIELD_NATIVE (f, j))
|
|
fprintf_filtered (stream, "native ");
|
|
|
|
if (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)) == 0)
|
|
{
|
|
/* Keep GDB from crashing here. */
|
|
fprintf_filtered (stream, "<undefined type> %s;\n",
|
|
TYPE_FN_FIELD_PHYSNAME (f, j));
|
|
break;
|
|
}
|
|
else if (!is_constructor && !is_full_physname_constructor)
|
|
{
|
|
type_print (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)),
|
|
"", stream, -1);
|
|
fputs_filtered (" ", stream);
|
|
}
|
|
|
|
if (TYPE_FN_FIELD_STUB (f, j))
|
|
/* Build something we can demangle. */
|
|
mangled_name = gdb_mangle_name (type, i, j);
|
|
else
|
|
mangled_name = physname;
|
|
|
|
demangled_name =
|
|
gdb_demangle (mangled_name,
|
|
DMGL_ANSI | DMGL_PARAMS | DMGL_JAVA);
|
|
|
|
if (demangled_name == NULL)
|
|
demangled_name = xstrdup (mangled_name);
|
|
|
|
{
|
|
char *demangled_no_class;
|
|
char *ptr;
|
|
|
|
ptr = demangled_no_class = demangled_name;
|
|
|
|
while (1)
|
|
{
|
|
char c;
|
|
|
|
c = *ptr++;
|
|
|
|
if (c == 0 || c == '(')
|
|
break;
|
|
if (c == '.')
|
|
demangled_no_class = ptr;
|
|
}
|
|
|
|
fputs_filtered (demangled_no_class, stream);
|
|
xfree (demangled_name);
|
|
}
|
|
|
|
if (TYPE_FN_FIELD_STUB (f, j))
|
|
xfree (mangled_name);
|
|
|
|
fprintf_filtered (stream, ";\n");
|
|
}
|
|
}
|
|
|
|
fprintfi_filtered (level, stream, "}");
|
|
}
|
|
break;
|
|
|
|
default:
|
|
c_type_print_base (type, stream, show, level, flags);
|
|
}
|
|
}
|
|
|
|
/* LEVEL is the depth to indent lines by. */
|
|
|
|
void
|
|
java_print_type (struct type *type, const char *varstring,
|
|
struct ui_file *stream, int show, int level,
|
|
const struct type_print_options *flags)
|
|
{
|
|
int demangled_args;
|
|
|
|
java_type_print_base (type, stream, show, level, flags);
|
|
|
|
if (varstring != NULL && *varstring != '\0')
|
|
{
|
|
fputs_filtered (" ", stream);
|
|
fputs_filtered (varstring, stream);
|
|
}
|
|
|
|
/* For demangled function names, we have the arglist as part of the name,
|
|
so don't print an additional pair of ()'s. */
|
|
|
|
demangled_args = varstring != NULL && strchr (varstring, '(') != NULL;
|
|
c_type_print_varspec_suffix (type, stream, show, 0, demangled_args, flags);
|
|
}
|