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.
1044 lines
31 KiB
C
1044 lines
31 KiB
C
/* Darwin support for GDB, the GNU debugger.
|
|
Copyright (C) 2008-2015 Free Software Foundation, Inc.
|
|
|
|
Contributed by AdaCore.
|
|
|
|
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 "bfd.h"
|
|
#include "symfile.h"
|
|
#include "objfiles.h"
|
|
#include "buildsym.h"
|
|
#include "gdbcmd.h"
|
|
#include "gdbcore.h"
|
|
#include "mach-o.h"
|
|
#include "aout/stab_gnu.h"
|
|
#include "vec.h"
|
|
#include "psympriv.h"
|
|
#include "complaints.h"
|
|
#include "gdb_bfd.h"
|
|
|
|
/* If non-zero displays debugging message. */
|
|
static unsigned int mach_o_debug_level = 0;
|
|
|
|
/* Dwarf debugging information are never in the final executable. They stay
|
|
in object files and the executable contains the list of object files read
|
|
during the link.
|
|
Each time an oso (other source) is found in the executable, the reader
|
|
creates such a structure. They are read after the processing of the
|
|
executable. */
|
|
|
|
typedef struct oso_el
|
|
{
|
|
/* Object file name. Can also be a member name. */
|
|
const char *name;
|
|
|
|
/* Associated time stamp. */
|
|
unsigned long mtime;
|
|
|
|
/* Stab symbols range for this OSO. */
|
|
asymbol **oso_sym;
|
|
asymbol **end_sym;
|
|
|
|
/* Number of interesting stabs in the range. */
|
|
unsigned int nbr_syms;
|
|
}
|
|
oso_el;
|
|
|
|
/* Vector of object files to be read after the executable. */
|
|
DEF_VEC_O (oso_el);
|
|
|
|
static void
|
|
macho_new_init (struct objfile *objfile)
|
|
{
|
|
}
|
|
|
|
static void
|
|
macho_symfile_init (struct objfile *objfile)
|
|
{
|
|
objfile->flags |= OBJF_REORDERED;
|
|
}
|
|
|
|
/* Add a new OSO to the vector of OSO to load. */
|
|
|
|
static void
|
|
macho_register_oso (VEC (oso_el) **oso_vector_ptr,
|
|
struct objfile *objfile,
|
|
asymbol **oso_sym, asymbol **end_sym,
|
|
unsigned int nbr_syms)
|
|
{
|
|
oso_el el;
|
|
|
|
el.name = (*oso_sym)->name;
|
|
el.mtime = (*oso_sym)->value;
|
|
el.oso_sym = oso_sym;
|
|
el.end_sym = end_sym;
|
|
el.nbr_syms = nbr_syms;
|
|
VEC_safe_push (oso_el, *oso_vector_ptr, &el);
|
|
}
|
|
|
|
/* Add symbol SYM to the minimal symbol table of OBJFILE. */
|
|
|
|
static void
|
|
macho_symtab_add_minsym (struct objfile *objfile, const asymbol *sym)
|
|
{
|
|
if (sym->name == NULL || *sym->name == '\0')
|
|
{
|
|
/* Skip names that don't exist (shouldn't happen), or names
|
|
that are null strings (may happen). */
|
|
return;
|
|
}
|
|
|
|
if (sym->flags & (BSF_GLOBAL | BSF_LOCAL | BSF_WEAK))
|
|
{
|
|
CORE_ADDR symaddr;
|
|
enum minimal_symbol_type ms_type;
|
|
|
|
/* Bfd symbols are section relative. */
|
|
symaddr = sym->value + sym->section->vma;
|
|
|
|
if (sym->section == bfd_abs_section_ptr)
|
|
ms_type = mst_abs;
|
|
else if (sym->section->flags & SEC_CODE)
|
|
{
|
|
if (sym->flags & (BSF_GLOBAL | BSF_WEAK))
|
|
ms_type = mst_text;
|
|
else
|
|
ms_type = mst_file_text;
|
|
}
|
|
else if (sym->section->flags & SEC_ALLOC)
|
|
{
|
|
if (sym->flags & (BSF_GLOBAL | BSF_WEAK))
|
|
{
|
|
if (sym->section->flags & SEC_LOAD)
|
|
ms_type = mst_data;
|
|
else
|
|
ms_type = mst_bss;
|
|
}
|
|
else if (sym->flags & BSF_LOCAL)
|
|
{
|
|
/* Not a special stabs-in-elf symbol, do regular
|
|
symbol processing. */
|
|
if (sym->section->flags & SEC_LOAD)
|
|
ms_type = mst_file_data;
|
|
else
|
|
ms_type = mst_file_bss;
|
|
}
|
|
else
|
|
ms_type = mst_unknown;
|
|
}
|
|
else
|
|
return; /* Skip this symbol. */
|
|
|
|
prim_record_minimal_symbol_and_info
|
|
(sym->name, symaddr, ms_type,
|
|
gdb_bfd_section_index (objfile->obfd, sym->section),
|
|
objfile);
|
|
}
|
|
}
|
|
|
|
/* Build the minimal symbol table from SYMBOL_TABLE of length
|
|
NUMBER_OF_SYMBOLS for OBJFILE. Registers OSO filenames found. */
|
|
|
|
static void
|
|
macho_symtab_read (struct objfile *objfile,
|
|
long number_of_symbols, asymbol **symbol_table,
|
|
VEC (oso_el) **oso_vector_ptr)
|
|
{
|
|
long i;
|
|
const asymbol *dir_so = NULL;
|
|
const asymbol *file_so = NULL;
|
|
asymbol **oso_file = NULL;
|
|
unsigned int nbr_syms = 0;
|
|
|
|
/* Current state while reading stabs. */
|
|
enum
|
|
{
|
|
/* Not within an SO part. Only non-debugging symbols should be present,
|
|
and will be added to the minimal symbols table. */
|
|
S_NO_SO,
|
|
|
|
/* First SO read. Introduce an SO section, and may be followed by a second
|
|
SO. The SO section should contain onl debugging symbols. */
|
|
S_FIRST_SO,
|
|
|
|
/* Second non-null SO found, just after the first one. Means that the first
|
|
is in fact a directory name. */
|
|
S_SECOND_SO,
|
|
|
|
/* Non-null OSO found. Debugging info are DWARF in this OSO file. */
|
|
S_DWARF_FILE,
|
|
|
|
S_STAB_FILE
|
|
} state = S_NO_SO;
|
|
|
|
for (i = 0; i < number_of_symbols; i++)
|
|
{
|
|
const asymbol *sym = symbol_table[i];
|
|
bfd_mach_o_asymbol *mach_o_sym = (bfd_mach_o_asymbol *)sym;
|
|
|
|
switch (state)
|
|
{
|
|
case S_NO_SO:
|
|
if (mach_o_sym->n_type == N_SO)
|
|
{
|
|
/* Start of object stab. */
|
|
if (sym->name == NULL || sym->name[0] == 0)
|
|
{
|
|
/* Unexpected empty N_SO. */
|
|
complaint (&symfile_complaints,
|
|
_("Unexpected empty N_SO stab"));
|
|
}
|
|
else
|
|
{
|
|
file_so = sym;
|
|
dir_so = NULL;
|
|
state = S_FIRST_SO;
|
|
}
|
|
}
|
|
else if (sym->flags & BSF_DEBUGGING)
|
|
{
|
|
if (mach_o_sym->n_type == N_OPT)
|
|
{
|
|
/* No complaint for OPT. */
|
|
break;
|
|
}
|
|
|
|
/* Debugging symbols are not expected here. */
|
|
complaint (&symfile_complaints,
|
|
_("%s: Unexpected debug stab outside SO markers"),
|
|
objfile_name (objfile));
|
|
}
|
|
else
|
|
{
|
|
/* Non-debugging symbols go to the minimal symbol table. */
|
|
macho_symtab_add_minsym (objfile, sym);
|
|
}
|
|
break;
|
|
|
|
case S_FIRST_SO:
|
|
case S_SECOND_SO:
|
|
if (mach_o_sym->n_type == N_SO)
|
|
{
|
|
if (sym->name == NULL || sym->name[0] == 0)
|
|
{
|
|
/* Unexpected empty N_SO. */
|
|
complaint (&symfile_complaints, _("Empty SO section"));
|
|
state = S_NO_SO;
|
|
}
|
|
else if (state == S_FIRST_SO)
|
|
{
|
|
/* Second SO stab for the file name. */
|
|
dir_so = file_so;
|
|
file_so = sym;
|
|
state = S_SECOND_SO;
|
|
}
|
|
else
|
|
complaint (&symfile_complaints, _("Three SO in a raw"));
|
|
}
|
|
else if (mach_o_sym->n_type == N_OSO)
|
|
{
|
|
if (sym->name == NULL || sym->name[0] == 0)
|
|
{
|
|
/* Empty OSO. Means that this file was compiled with
|
|
stabs. */
|
|
state = S_STAB_FILE;
|
|
warning (_("stabs debugging not supported for %s"),
|
|
file_so->name);
|
|
}
|
|
else
|
|
{
|
|
/* Non-empty OSO for a Dwarf file. */
|
|
oso_file = symbol_table + i;
|
|
nbr_syms = 0;
|
|
state = S_DWARF_FILE;
|
|
}
|
|
}
|
|
else
|
|
complaint (&symfile_complaints,
|
|
_("Unexpected stab after SO"));
|
|
break;
|
|
|
|
case S_STAB_FILE:
|
|
case S_DWARF_FILE:
|
|
if (mach_o_sym->n_type == N_SO)
|
|
{
|
|
if (sym->name == NULL || sym->name[0] == 0)
|
|
{
|
|
/* End of file. */
|
|
if (state == S_DWARF_FILE)
|
|
macho_register_oso (oso_vector_ptr, objfile,
|
|
oso_file, symbol_table + i,
|
|
nbr_syms);
|
|
state = S_NO_SO;
|
|
}
|
|
else
|
|
{
|
|
complaint (&symfile_complaints, _("Missing nul SO"));
|
|
file_so = sym;
|
|
dir_so = NULL;
|
|
state = S_FIRST_SO;
|
|
}
|
|
}
|
|
else if (sym->flags & BSF_DEBUGGING)
|
|
{
|
|
if (state == S_STAB_FILE)
|
|
{
|
|
/* FIXME: to be implemented. */
|
|
}
|
|
else
|
|
{
|
|
switch (mach_o_sym->n_type)
|
|
{
|
|
case N_FUN:
|
|
if (sym->name == NULL || sym->name[0] == 0)
|
|
break;
|
|
/* Fall through. */
|
|
case N_STSYM:
|
|
/* Interesting symbol. */
|
|
nbr_syms++;
|
|
break;
|
|
case N_ENSYM:
|
|
case N_BNSYM:
|
|
case N_GSYM:
|
|
break;
|
|
default:
|
|
complaint (&symfile_complaints,
|
|
_("unhandled stab for dwarf OSO file"));
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
complaint (&symfile_complaints,
|
|
_("non-debugging symbol within SO"));
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (state != S_NO_SO)
|
|
complaint (&symfile_complaints, _("missing nul SO"));
|
|
}
|
|
|
|
/* If NAME describes an archive member (ie: ARCHIVE '(' MEMBER ')'),
|
|
returns the length of the archive name.
|
|
Returns -1 otherwise. */
|
|
|
|
static int
|
|
get_archive_prefix_len (const char *name)
|
|
{
|
|
const char *lparen;
|
|
int name_len = strlen (name);
|
|
|
|
if (name_len == 0 || name[name_len - 1] != ')')
|
|
return -1;
|
|
|
|
lparen = strrchr (name, '(');
|
|
if (lparen == NULL || lparen == name)
|
|
return -1;
|
|
return lparen - name;
|
|
}
|
|
|
|
/* Compare function to qsort OSOs, so that members of a library are
|
|
gathered. */
|
|
|
|
static int
|
|
oso_el_compare_name (const void *vl, const void *vr)
|
|
{
|
|
const oso_el *l = (const oso_el *)vl;
|
|
const oso_el *r = (const oso_el *)vr;
|
|
|
|
return strcmp (l->name, r->name);
|
|
}
|
|
|
|
/* Hash table entry structure for the stabs symbols in the main object file.
|
|
This is used to speed up lookup for symbols in the OSO. */
|
|
|
|
struct macho_sym_hash_entry
|
|
{
|
|
struct bfd_hash_entry base;
|
|
const asymbol *sym;
|
|
};
|
|
|
|
/* Routine to create an entry in the hash table. */
|
|
|
|
static struct bfd_hash_entry *
|
|
macho_sym_hash_newfunc (struct bfd_hash_entry *entry,
|
|
struct bfd_hash_table *table,
|
|
const char *string)
|
|
{
|
|
struct macho_sym_hash_entry *ret = (struct macho_sym_hash_entry *) entry;
|
|
|
|
/* Allocate the structure if it has not already been allocated by a
|
|
subclass. */
|
|
if (ret == NULL)
|
|
ret = (struct macho_sym_hash_entry *) bfd_hash_allocate (table,
|
|
sizeof (* ret));
|
|
if (ret == NULL)
|
|
return NULL;
|
|
|
|
/* Call the allocation method of the superclass. */
|
|
ret = (struct macho_sym_hash_entry *)
|
|
bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string);
|
|
|
|
if (ret)
|
|
{
|
|
/* Initialize the local fields. */
|
|
ret->sym = NULL;
|
|
}
|
|
|
|
return (struct bfd_hash_entry *) ret;
|
|
}
|
|
|
|
/* Get the value of SYM from the minimal symtab of MAIN_OBJFILE. This is used
|
|
to get the value of global and common symbols. */
|
|
|
|
static CORE_ADDR
|
|
macho_resolve_oso_sym_with_minsym (struct objfile *main_objfile, asymbol *sym)
|
|
{
|
|
/* For common symbol and global symbols, use the min symtab. */
|
|
struct bound_minimal_symbol msym;
|
|
const char *name = sym->name;
|
|
|
|
if (name[0] == bfd_get_symbol_leading_char (main_objfile->obfd))
|
|
++name;
|
|
msym = lookup_minimal_symbol (name, NULL, main_objfile);
|
|
if (msym.minsym == NULL)
|
|
{
|
|
warning (_("can't find symbol '%s' in minsymtab"), name);
|
|
return 0;
|
|
}
|
|
else
|
|
return BMSYMBOL_VALUE_ADDRESS (msym);
|
|
}
|
|
|
|
/* Add oso file OSO/ABFD as a symbol file. */
|
|
|
|
static void
|
|
macho_add_oso_symfile (oso_el *oso, bfd *abfd, const char *name,
|
|
struct objfile *main_objfile, int symfile_flags)
|
|
{
|
|
int storage;
|
|
int i;
|
|
asymbol **symbol_table;
|
|
asymbol **symp;
|
|
struct bfd_hash_table table;
|
|
int nbr_sections;
|
|
struct cleanup *cleanup;
|
|
|
|
/* Per section flag to mark which section have been rebased. */
|
|
unsigned char *sections_rebased;
|
|
|
|
if (mach_o_debug_level > 0)
|
|
printf_unfiltered
|
|
(_("Loading debugging symbols from oso: %s\n"), oso->name);
|
|
|
|
if (!bfd_check_format (abfd, bfd_object))
|
|
{
|
|
warning (_("`%s': can't read symbols: %s."), oso->name,
|
|
bfd_errmsg (bfd_get_error ()));
|
|
gdb_bfd_unref (abfd);
|
|
return;
|
|
}
|
|
|
|
if (abfd->my_archive == NULL && oso->mtime != bfd_get_mtime (abfd))
|
|
{
|
|
warning (_("`%s': file time stamp mismatch."), oso->name);
|
|
gdb_bfd_unref (abfd);
|
|
return;
|
|
}
|
|
|
|
if (!bfd_hash_table_init_n (&table, macho_sym_hash_newfunc,
|
|
sizeof (struct macho_sym_hash_entry),
|
|
oso->nbr_syms))
|
|
{
|
|
warning (_("`%s': can't create hash table"), oso->name);
|
|
gdb_bfd_unref (abfd);
|
|
return;
|
|
}
|
|
|
|
bfd_set_cacheable (abfd, 1);
|
|
|
|
/* Read symbols table. */
|
|
storage = bfd_get_symtab_upper_bound (abfd);
|
|
symbol_table = (asymbol **) xmalloc (storage);
|
|
bfd_canonicalize_symtab (abfd, symbol_table);
|
|
|
|
/* Init section flags. */
|
|
nbr_sections = bfd_count_sections (abfd);
|
|
sections_rebased = (unsigned char *) alloca (nbr_sections);
|
|
for (i = 0; i < nbr_sections; i++)
|
|
sections_rebased[i] = 0;
|
|
|
|
/* Put symbols for the OSO file in the hash table. */
|
|
for (symp = oso->oso_sym; symp != oso->end_sym; symp++)
|
|
{
|
|
const asymbol *sym = *symp;
|
|
bfd_mach_o_asymbol *mach_o_sym = (bfd_mach_o_asymbol *)sym;
|
|
|
|
switch (mach_o_sym->n_type)
|
|
{
|
|
case N_ENSYM:
|
|
case N_BNSYM:
|
|
case N_GSYM:
|
|
sym = NULL;
|
|
break;
|
|
case N_FUN:
|
|
if (sym->name == NULL || sym->name[0] == 0)
|
|
sym = NULL;
|
|
break;
|
|
case N_STSYM:
|
|
break;
|
|
default:
|
|
sym = NULL;
|
|
break;
|
|
}
|
|
if (sym != NULL)
|
|
{
|
|
struct macho_sym_hash_entry *ent;
|
|
|
|
ent = (struct macho_sym_hash_entry *)
|
|
bfd_hash_lookup (&table, sym->name, TRUE, FALSE);
|
|
if (ent->sym != NULL)
|
|
complaint (&symfile_complaints,
|
|
_("Duplicated symbol %s in symbol table"), sym->name);
|
|
else
|
|
{
|
|
if (mach_o_debug_level > 4)
|
|
{
|
|
struct gdbarch *arch = get_objfile_arch (main_objfile);
|
|
printf_unfiltered
|
|
(_("Adding symbol %s (addr: %s)\n"),
|
|
sym->name, paddress (arch, sym->value));
|
|
}
|
|
ent->sym = sym;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Relocate symbols of the OSO. */
|
|
for (i = 0; symbol_table[i]; i++)
|
|
{
|
|
asymbol *sym = symbol_table[i];
|
|
bfd_mach_o_asymbol *mach_o_sym = (bfd_mach_o_asymbol *)sym;
|
|
|
|
if (mach_o_sym->n_type & BFD_MACH_O_N_STAB)
|
|
continue;
|
|
if ((mach_o_sym->n_type & BFD_MACH_O_N_TYPE) == BFD_MACH_O_N_UNDF
|
|
&& sym->value != 0)
|
|
{
|
|
/* For common symbol use the min symtab and modify the OSO
|
|
symbol table. */
|
|
CORE_ADDR res;
|
|
|
|
res = macho_resolve_oso_sym_with_minsym (main_objfile, sym);
|
|
if (res != 0)
|
|
{
|
|
sym->section = bfd_com_section_ptr;
|
|
sym->value = res;
|
|
}
|
|
}
|
|
else if ((mach_o_sym->n_type & BFD_MACH_O_N_TYPE) == BFD_MACH_O_N_SECT)
|
|
{
|
|
/* Normal symbol. */
|
|
asection *sec = sym->section;
|
|
bfd_mach_o_section *msec;
|
|
unsigned int sec_type;
|
|
|
|
/* Skip buggy ones. */
|
|
if (sec == NULL || sections_rebased[sec->index] != 0)
|
|
continue;
|
|
|
|
/* Only consider regular, non-debugging sections. */
|
|
msec = bfd_mach_o_get_mach_o_section (sec);
|
|
sec_type = msec->flags & BFD_MACH_O_SECTION_TYPE_MASK;
|
|
if ((sec_type == BFD_MACH_O_S_REGULAR
|
|
|| sec_type == BFD_MACH_O_S_ZEROFILL)
|
|
&& (msec->flags & BFD_MACH_O_S_ATTR_DEBUG) == 0)
|
|
{
|
|
CORE_ADDR addr = 0;
|
|
|
|
if ((mach_o_sym->n_type & BFD_MACH_O_N_EXT) != 0)
|
|
{
|
|
/* Use the min symtab for global symbols. */
|
|
addr = macho_resolve_oso_sym_with_minsym (main_objfile, sym);
|
|
}
|
|
else
|
|
{
|
|
struct macho_sym_hash_entry *ent;
|
|
|
|
ent = (struct macho_sym_hash_entry *)
|
|
bfd_hash_lookup (&table, sym->name, FALSE, FALSE);
|
|
if (ent != NULL)
|
|
addr = bfd_asymbol_value (ent->sym);
|
|
}
|
|
|
|
/* Adjust the section. */
|
|
if (addr != 0)
|
|
{
|
|
CORE_ADDR res = addr - sym->value;
|
|
|
|
if (mach_o_debug_level > 3)
|
|
{
|
|
struct gdbarch *arch = get_objfile_arch (main_objfile);
|
|
printf_unfiltered
|
|
(_("resolve sect %s with %s (set to %s)\n"),
|
|
sec->name, sym->name,
|
|
paddress (arch, res));
|
|
}
|
|
bfd_set_section_vma (abfd, sec, res);
|
|
sections_rebased[sec->index] = 1;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* Mark the section as never rebased. */
|
|
sections_rebased[sec->index] = 2;
|
|
}
|
|
}
|
|
}
|
|
|
|
bfd_hash_table_free (&table);
|
|
|
|
/* We need to clear SYMFILE_MAINLINE to avoid interractive question
|
|
from symfile.c:symbol_file_add_with_addrs_or_offsets. */
|
|
cleanup = make_cleanup_bfd_unref (abfd);
|
|
symbol_file_add_from_bfd
|
|
(abfd, name, symfile_flags & ~(SYMFILE_MAINLINE | SYMFILE_VERBOSE), NULL,
|
|
main_objfile->flags & (OBJF_REORDERED | OBJF_SHARED
|
|
| OBJF_READNOW | OBJF_USERLOADED),
|
|
main_objfile);
|
|
do_cleanups (cleanup);
|
|
}
|
|
|
|
/* Read symbols from the vector of oso files.
|
|
|
|
Note that this function sorts OSO_VECTOR_PTR. */
|
|
|
|
static void
|
|
macho_symfile_read_all_oso (VEC (oso_el) **oso_vector_ptr,
|
|
struct objfile *main_objfile,
|
|
int symfile_flags)
|
|
{
|
|
int ix;
|
|
VEC (oso_el) *vec = *oso_vector_ptr;
|
|
oso_el *oso;
|
|
struct cleanup *cleanup = make_cleanup (null_cleanup, NULL);
|
|
|
|
/* Sort oso by name so that files from libraries are gathered. */
|
|
qsort (VEC_address (oso_el, vec), VEC_length (oso_el, vec),
|
|
sizeof (oso_el), oso_el_compare_name);
|
|
|
|
for (ix = 0; VEC_iterate (oso_el, vec, ix, oso);)
|
|
{
|
|
int pfx_len;
|
|
|
|
/* Check if this is a library name. */
|
|
pfx_len = get_archive_prefix_len (oso->name);
|
|
if (pfx_len > 0)
|
|
{
|
|
bfd *archive_bfd;
|
|
bfd *member_bfd;
|
|
char *archive_name = XNEWVEC (char, pfx_len + 1);
|
|
int last_ix;
|
|
oso_el *oso2;
|
|
int ix2;
|
|
|
|
memcpy (archive_name, oso->name, pfx_len);
|
|
archive_name[pfx_len] = '\0';
|
|
|
|
make_cleanup (xfree, archive_name);
|
|
|
|
/* Compute number of oso for this archive. */
|
|
for (last_ix = ix;
|
|
VEC_iterate (oso_el, vec, last_ix, oso2); last_ix++)
|
|
{
|
|
if (strncmp (oso2->name, archive_name, pfx_len) != 0)
|
|
break;
|
|
}
|
|
|
|
/* Open the archive and check the format. */
|
|
archive_bfd = gdb_bfd_open (archive_name, gnutarget, -1);
|
|
if (archive_bfd == NULL)
|
|
{
|
|
warning (_("Could not open OSO archive file \"%s\""),
|
|
archive_name);
|
|
ix = last_ix;
|
|
continue;
|
|
}
|
|
if (!bfd_check_format (archive_bfd, bfd_archive))
|
|
{
|
|
warning (_("OSO archive file \"%s\" not an archive."),
|
|
archive_name);
|
|
gdb_bfd_unref (archive_bfd);
|
|
ix = last_ix;
|
|
continue;
|
|
}
|
|
|
|
member_bfd = gdb_bfd_openr_next_archived_file (archive_bfd, NULL);
|
|
|
|
if (member_bfd == NULL)
|
|
{
|
|
warning (_("Could not read archive members out of "
|
|
"OSO archive \"%s\""), archive_name);
|
|
gdb_bfd_unref (archive_bfd);
|
|
ix = last_ix;
|
|
continue;
|
|
}
|
|
|
|
/* Load all oso in this library. */
|
|
while (member_bfd != NULL)
|
|
{
|
|
bfd *prev;
|
|
const char *member_name = member_bfd->filename;
|
|
int member_len = strlen (member_name);
|
|
|
|
/* If this member is referenced, add it as a symfile. */
|
|
for (ix2 = ix; ix2 < last_ix; ix2++)
|
|
{
|
|
oso2 = VEC_index (oso_el, vec, ix2);
|
|
|
|
if (oso2->name
|
|
&& strlen (oso2->name) == pfx_len + member_len + 2
|
|
&& !memcmp (member_name, oso2->name + pfx_len + 1,
|
|
member_len))
|
|
{
|
|
macho_add_oso_symfile (oso2, member_bfd,
|
|
bfd_get_filename (member_bfd),
|
|
main_objfile, symfile_flags);
|
|
oso2->name = NULL;
|
|
break;
|
|
}
|
|
}
|
|
|
|
prev = member_bfd;
|
|
member_bfd = gdb_bfd_openr_next_archived_file (archive_bfd,
|
|
member_bfd);
|
|
|
|
/* Free previous member if not referenced by an oso. */
|
|
if (ix2 >= last_ix)
|
|
gdb_bfd_unref (prev);
|
|
}
|
|
for (ix2 = ix; ix2 < last_ix; ix2++)
|
|
{
|
|
oso_el *oso2 = VEC_index (oso_el, vec, ix2);
|
|
|
|
if (oso2->name != NULL)
|
|
warning (_("Could not find specified archive member "
|
|
"for OSO name \"%s\""), oso->name);
|
|
}
|
|
ix = last_ix;
|
|
}
|
|
else
|
|
{
|
|
bfd *abfd;
|
|
|
|
abfd = gdb_bfd_open (oso->name, gnutarget, -1);
|
|
if (!abfd)
|
|
warning (_("`%s': can't open to read symbols: %s."), oso->name,
|
|
bfd_errmsg (bfd_get_error ()));
|
|
else
|
|
macho_add_oso_symfile (oso, abfd, oso->name, main_objfile,
|
|
symfile_flags);
|
|
|
|
ix++;
|
|
}
|
|
}
|
|
|
|
do_cleanups (cleanup);
|
|
}
|
|
|
|
/* DSYM (debug symbols) files contain the debug info of an executable.
|
|
This is a separate file created by dsymutil(1) and is similar to debug
|
|
link feature on ELF.
|
|
DSYM files are located in a subdirectory. Append DSYM_SUFFIX to the
|
|
executable name and the executable base name to get the DSYM file name. */
|
|
#define DSYM_SUFFIX ".dSYM/Contents/Resources/DWARF/"
|
|
|
|
/* Check if a dsym file exists for OBJFILE. If so, returns a bfd for it
|
|
and return *FILENAMEP with its original xmalloc-ated filename.
|
|
Return NULL if no valid dsym file is found (FILENAMEP is not used in
|
|
such case). */
|
|
|
|
static bfd *
|
|
macho_check_dsym (struct objfile *objfile, char **filenamep)
|
|
{
|
|
size_t name_len = strlen (objfile_name (objfile));
|
|
size_t dsym_len = strlen (DSYM_SUFFIX);
|
|
const char *base_name = lbasename (objfile_name (objfile));
|
|
size_t base_len = strlen (base_name);
|
|
char *dsym_filename = (char *) alloca (name_len + dsym_len + base_len + 1);
|
|
bfd *dsym_bfd;
|
|
bfd_mach_o_load_command *main_uuid;
|
|
bfd_mach_o_load_command *dsym_uuid;
|
|
|
|
strcpy (dsym_filename, objfile_name (objfile));
|
|
strcpy (dsym_filename + name_len, DSYM_SUFFIX);
|
|
strcpy (dsym_filename + name_len + dsym_len, base_name);
|
|
|
|
if (access (dsym_filename, R_OK) != 0)
|
|
return NULL;
|
|
|
|
if (bfd_mach_o_lookup_command (objfile->obfd,
|
|
BFD_MACH_O_LC_UUID, &main_uuid) == 0)
|
|
{
|
|
warning (_("can't find UUID in %s"), objfile_name (objfile));
|
|
return NULL;
|
|
}
|
|
dsym_bfd = gdb_bfd_openr (dsym_filename, gnutarget);
|
|
if (dsym_bfd == NULL)
|
|
{
|
|
warning (_("can't open dsym file %s"), dsym_filename);
|
|
return NULL;
|
|
}
|
|
|
|
if (!bfd_check_format (dsym_bfd, bfd_object))
|
|
{
|
|
gdb_bfd_unref (dsym_bfd);
|
|
warning (_("bad dsym file format: %s"), bfd_errmsg (bfd_get_error ()));
|
|
return NULL;
|
|
}
|
|
|
|
if (bfd_mach_o_lookup_command (dsym_bfd,
|
|
BFD_MACH_O_LC_UUID, &dsym_uuid) == 0)
|
|
{
|
|
warning (_("can't find UUID in %s"), dsym_filename);
|
|
gdb_bfd_unref (dsym_bfd);
|
|
return NULL;
|
|
}
|
|
if (memcmp (dsym_uuid->command.uuid.uuid, main_uuid->command.uuid.uuid,
|
|
sizeof (main_uuid->command.uuid.uuid)))
|
|
{
|
|
warning (_("dsym file UUID doesn't match the one in %s"),
|
|
objfile_name (objfile));
|
|
gdb_bfd_unref (dsym_bfd);
|
|
return NULL;
|
|
}
|
|
*filenamep = xstrdup (dsym_filename);
|
|
return dsym_bfd;
|
|
}
|
|
|
|
static void
|
|
macho_symfile_read (struct objfile *objfile, int symfile_flags)
|
|
{
|
|
bfd *abfd = objfile->obfd;
|
|
CORE_ADDR offset;
|
|
long storage_needed;
|
|
bfd *dsym_bfd;
|
|
VEC (oso_el) *oso_vector = NULL;
|
|
struct cleanup *old_chain = make_cleanup (VEC_cleanup (oso_el), &oso_vector);
|
|
|
|
/* Get symbols from the symbol table only if the file is an executable.
|
|
The symbol table of object files is not relocated and is expected to
|
|
be in the executable. */
|
|
if (bfd_get_file_flags (abfd) & (EXEC_P | DYNAMIC))
|
|
{
|
|
char *dsym_filename;
|
|
|
|
/* Process the normal symbol table first. */
|
|
storage_needed = bfd_get_symtab_upper_bound (objfile->obfd);
|
|
if (storage_needed < 0)
|
|
error (_("Can't read symbols from %s: %s"),
|
|
bfd_get_filename (objfile->obfd),
|
|
bfd_errmsg (bfd_get_error ()));
|
|
|
|
if (storage_needed > 0)
|
|
{
|
|
asymbol **symbol_table;
|
|
long symcount;
|
|
|
|
symbol_table = (asymbol **) xmalloc (storage_needed);
|
|
make_cleanup (xfree, symbol_table);
|
|
|
|
init_minimal_symbol_collection ();
|
|
make_cleanup_discard_minimal_symbols ();
|
|
|
|
symcount = bfd_canonicalize_symtab (objfile->obfd, symbol_table);
|
|
|
|
if (symcount < 0)
|
|
error (_("Can't read symbols from %s: %s"),
|
|
bfd_get_filename (objfile->obfd),
|
|
bfd_errmsg (bfd_get_error ()));
|
|
|
|
macho_symtab_read (objfile, symcount, symbol_table, &oso_vector);
|
|
|
|
install_minimal_symbols (objfile);
|
|
}
|
|
|
|
/* Try to read .eh_frame / .debug_frame. */
|
|
/* First, locate these sections. We ignore the result status
|
|
as it only checks for debug info. */
|
|
dwarf2_has_info (objfile, NULL);
|
|
dwarf2_build_frame_info (objfile);
|
|
|
|
/* Check for DSYM file. */
|
|
dsym_bfd = macho_check_dsym (objfile, &dsym_filename);
|
|
if (dsym_bfd != NULL)
|
|
{
|
|
int ix;
|
|
oso_el *oso;
|
|
struct bfd_section *asect, *dsect;
|
|
|
|
make_cleanup (xfree, dsym_filename);
|
|
|
|
if (mach_o_debug_level > 0)
|
|
printf_unfiltered (_("dsym file found\n"));
|
|
|
|
/* Set dsym section size. */
|
|
for (asect = objfile->obfd->sections, dsect = dsym_bfd->sections;
|
|
asect && dsect;
|
|
asect = asect->next, dsect = dsect->next)
|
|
{
|
|
if (strcmp (asect->name, dsect->name) != 0)
|
|
break;
|
|
bfd_set_section_size (dsym_bfd, dsect,
|
|
bfd_get_section_size (asect));
|
|
}
|
|
|
|
/* Add the dsym file as a separate file. */
|
|
make_cleanup_bfd_unref (dsym_bfd);
|
|
symbol_file_add_separate (dsym_bfd, dsym_filename, symfile_flags,
|
|
objfile);
|
|
|
|
/* Don't try to read dwarf2 from main file or shared libraries. */
|
|
do_cleanups (old_chain);
|
|
return;
|
|
}
|
|
}
|
|
|
|
if (dwarf2_has_info (objfile, NULL))
|
|
{
|
|
/* DWARF 2 sections */
|
|
dwarf2_build_psymtabs (objfile);
|
|
}
|
|
|
|
/* Then the oso. */
|
|
if (oso_vector != NULL)
|
|
macho_symfile_read_all_oso (&oso_vector, objfile, symfile_flags);
|
|
|
|
do_cleanups (old_chain);
|
|
}
|
|
|
|
static bfd_byte *
|
|
macho_symfile_relocate (struct objfile *objfile, asection *sectp,
|
|
bfd_byte *buf)
|
|
{
|
|
bfd *abfd = objfile->obfd;
|
|
|
|
/* We're only interested in sections with relocation
|
|
information. */
|
|
if ((sectp->flags & SEC_RELOC) == 0)
|
|
return NULL;
|
|
|
|
if (mach_o_debug_level > 0)
|
|
printf_unfiltered (_("Relocate section '%s' of %s\n"),
|
|
sectp->name, objfile_name (objfile));
|
|
|
|
return bfd_simple_get_relocated_section_contents (abfd, sectp, buf, NULL);
|
|
}
|
|
|
|
static void
|
|
macho_symfile_finish (struct objfile *objfile)
|
|
{
|
|
}
|
|
|
|
static void
|
|
macho_symfile_offsets (struct objfile *objfile,
|
|
const struct section_addr_info *addrs)
|
|
{
|
|
unsigned int i;
|
|
unsigned int num_sections;
|
|
struct obj_section *osect;
|
|
|
|
/* Allocate section_offsets. */
|
|
objfile->num_sections = bfd_count_sections (objfile->obfd);
|
|
objfile->section_offsets = (struct section_offsets *)
|
|
obstack_alloc (&objfile->objfile_obstack,
|
|
SIZEOF_N_SECTION_OFFSETS (objfile->num_sections));
|
|
memset (objfile->section_offsets, 0,
|
|
SIZEOF_N_SECTION_OFFSETS (objfile->num_sections));
|
|
|
|
/* This code is run when we first add the objfile with
|
|
symfile_add_with_addrs_or_offsets, when "addrs" not "offsets" are
|
|
passed in. The place in symfile.c where the addrs are applied
|
|
depends on the addrs having section names. But in the dyld code
|
|
we build an anonymous array of addrs, so that code is a no-op.
|
|
Because of that, we have to apply the addrs to the sections here.
|
|
N.B. if an objfile slides after we've already created it, then it
|
|
goes through objfile_relocate. */
|
|
|
|
for (i = 0; i < addrs->num_sections; i++)
|
|
{
|
|
ALL_OBJFILE_OSECTIONS (objfile, osect)
|
|
{
|
|
const char *bfd_sect_name = osect->the_bfd_section->name;
|
|
|
|
if (strcmp (bfd_sect_name, addrs->other[i].name) == 0)
|
|
{
|
|
obj_section_offset (osect) = addrs->other[i].addr;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
objfile->sect_index_text = 0;
|
|
|
|
ALL_OBJFILE_OSECTIONS (objfile, osect)
|
|
{
|
|
const char *bfd_sect_name = osect->the_bfd_section->name;
|
|
int sect_index = osect - objfile->sections;;
|
|
|
|
if (startswith (bfd_sect_name, "LC_SEGMENT."))
|
|
bfd_sect_name += 11;
|
|
if (strcmp (bfd_sect_name, "__TEXT") == 0
|
|
|| strcmp (bfd_sect_name, "__TEXT.__text") == 0)
|
|
objfile->sect_index_text = sect_index;
|
|
}
|
|
}
|
|
|
|
static const struct sym_fns macho_sym_fns = {
|
|
macho_new_init, /* init anything gbl to entire symtab */
|
|
macho_symfile_init, /* read initial info, setup for sym_read() */
|
|
macho_symfile_read, /* read a symbol file into symtab */
|
|
NULL, /* sym_read_psymbols */
|
|
macho_symfile_finish, /* finished with file, cleanup */
|
|
macho_symfile_offsets, /* xlate external to internal form */
|
|
default_symfile_segments, /* Get segment information from a file. */
|
|
NULL,
|
|
macho_symfile_relocate, /* Relocate a debug section. */
|
|
NULL, /* sym_get_probes */
|
|
&psym_functions
|
|
};
|
|
|
|
/* -Wmissing-prototypes */
|
|
extern initialize_file_ftype _initialize_machoread;
|
|
|
|
void
|
|
_initialize_machoread (void)
|
|
{
|
|
add_symtab_fns (bfd_target_mach_o_flavour, &macho_sym_fns);
|
|
|
|
add_setshow_zuinteger_cmd ("mach-o", class_obscure,
|
|
&mach_o_debug_level,
|
|
_("Set if printing Mach-O symbols processing."),
|
|
_("Show if printing Mach-O symbols processing."),
|
|
NULL, NULL, NULL,
|
|
&setdebuglist, &showdebuglist);
|
|
}
|