9a3c826307
Note: I needed to split this patch in two, otherwise it's too big for the mailing list. This patch adds explicit casts to situations where a void pointer is assigned to a pointer to the "real" type. Building in C++ mode requires those assignments to use an explicit cast. This includes, for example: - callback arguments (cleanups, comparison functions, ...) - data attached to some object (objfile, program space, etc) in the form of a void pointer - "user data" passed to some function This patch comes from the commit "(mostly) auto-generated patch to insert casts needed for C++", taken from Pedro's C++ branch. Only files built on x86 with --enable-targets=all are modified, so the native files for other arches will need to be dealt with separately. I built-tested this with --enable-targets=all and reg-tested. To my surprise, a test case (selftest.exp) had to be adjusted. Here's the ChangeLog entry. Again, this was relatively quick to make despite the length, thanks to David Malcom's script, although I don't believe it's very useful information in that particular case... gdb/ChangeLog: * aarch64-tdep.c (aarch64_make_prologue_cache): Add cast(s). (aarch64_make_stub_cache): Likewise. (value_of_aarch64_user_reg): Likewise. * ada-lang.c (ada_inferior_data_cleanup): Likewise. (get_ada_inferior_data): Likewise. (get_ada_pspace_data): Likewise. (ada_pspace_data_cleanup): Likewise. (ada_complete_symbol_matcher): Likewise. (ada_exc_search_name_matches): Likewise. * ada-tasks.c (get_ada_tasks_pspace_data): Likewise. (get_ada_tasks_inferior_data): Likewise. * addrmap.c (addrmap_mutable_foreach_worker): Likewise. (splay_obstack_alloc): Likewise. (splay_obstack_free): Likewise. * alpha-linux-tdep.c (alpha_linux_supply_gregset): Likewise. (alpha_linux_collect_gregset): Likewise. (alpha_linux_supply_fpregset): Likewise. (alpha_linux_collect_fpregset): Likewise. * alpha-mdebug-tdep.c (alpha_mdebug_frame_unwind_cache): Likewise. * alpha-tdep.c (alpha_lds): Likewise. (alpha_sts): Likewise. (alpha_sigtramp_frame_unwind_cache): Likewise. (alpha_heuristic_frame_unwind_cache): Likewise. (alpha_supply_int_regs): Likewise. (alpha_fill_int_regs): Likewise. (alpha_supply_fp_regs): Likewise. (alpha_fill_fp_regs): Likewise. * alphanbsd-tdep.c (alphanbsd_supply_fpregset): Likewise. (alphanbsd_aout_supply_gregset): Likewise. (alphanbsd_supply_gregset): Likewise. * amd64-linux-tdep.c (amd64_linux_init_abi): Likewise. (amd64_x32_linux_init_abi): Likewise. * amd64-nat.c (amd64_supply_native_gregset): Likewise. (amd64_collect_native_gregset): Likewise. * amd64-tdep.c (amd64_frame_cache): Likewise. (amd64_sigtramp_frame_cache): Likewise. (amd64_epilogue_frame_cache): Likewise. (amd64_supply_fxsave): Likewise. (amd64_supply_xsave): Likewise. (amd64_collect_fxsave): Likewise. (amd64_collect_xsave): Likewise. * amd64-windows-tdep.c (amd64_windows_frame_cache): Likewise. * amd64obsd-tdep.c (amd64obsd_trapframe_cache): Likewise. * arm-linux-tdep.c (arm_linux_supply_gregset): Likewise. (arm_linux_collect_gregset): Likewise. (arm_linux_supply_nwfpe): Likewise. (arm_linux_collect_nwfpe): Likewise. (arm_linux_supply_vfp): Likewise. (arm_linux_collect_vfp): Likewise. * arm-tdep.c (arm_find_mapping_symbol): Likewise. (arm_prologue_unwind_stop_reason): Likewise. (arm_prologue_this_id): Likewise. (arm_prologue_prev_register): Likewise. (arm_exidx_data_free): Likewise. (arm_find_exidx_entry): Likewise. (arm_stub_this_id): Likewise. (arm_m_exception_this_id): Likewise. (arm_m_exception_prev_register): Likewise. (arm_normal_frame_base): Likewise. (gdb_print_insn_arm): Likewise. (arm_objfile_data_free): Likewise. (arm_record_special_symbol): Likewise. (value_of_arm_user_reg): Likewise. * armbsd-tdep.c (armbsd_supply_fpregset): Likewise. (armbsd_supply_gregset): Likewise. * auto-load.c (auto_load_pspace_data_cleanup): Likewise. (get_auto_load_pspace_data): Likewise. (hash_loaded_script_entry): Likewise. (eq_loaded_script_entry): Likewise. (clear_section_scripts): Likewise. (collect_matching_scripts): Likewise. * auxv.c (auxv_inferior_data_cleanup): Likewise. (get_auxv_inferior_data): Likewise. * avr-tdep.c (avr_frame_unwind_cache): Likewise. * ax-general.c (do_free_agent_expr_cleanup): Likewise. * bfd-target.c (target_bfd_xfer_partial): Likewise. (target_bfd_xclose): Likewise. (target_bfd_get_section_table): Likewise. * bfin-tdep.c (bfin_frame_cache): Likewise. * block.c (find_block_in_blockvector): Likewise. (call_site_for_pc): Likewise. (block_find_non_opaque_type_preferred): Likewise. * break-catch-sig.c (signal_catchpoint_insert_location): Likewise. (signal_catchpoint_remove_location): Likewise. (signal_catchpoint_breakpoint_hit): Likewise. (signal_catchpoint_print_one): Likewise. (signal_catchpoint_print_mention): Likewise. (signal_catchpoint_print_recreate): Likewise. * break-catch-syscall.c (get_catch_syscall_inferior_data): Likewise. * breakpoint.c (do_cleanup_counted_command_line): Likewise. (bp_location_compare_addrs): Likewise. (get_first_locp_gte_addr): Likewise. (check_tracepoint_command): Likewise. (do_map_commands_command): Likewise. (get_breakpoint_objfile_data): Likewise. (free_breakpoint_probes): Likewise. (do_captured_breakpoint_query): Likewise. (compare_breakpoints): Likewise. (bp_location_compare): Likewise. (bpstat_remove_breakpoint_callback): Likewise. (do_delete_breakpoint_cleanup): Likewise. * bsd-uthread.c (bsd_uthread_set_supply_uthread): Likewise. (bsd_uthread_set_collect_uthread): Likewise. (bsd_uthread_activate): Likewise. (bsd_uthread_fetch_registers): Likewise. (bsd_uthread_store_registers): Likewise. * btrace.c (check_xml_btrace_version): Likewise. (parse_xml_btrace_block): Likewise. (parse_xml_btrace_pt_config_cpu): Likewise. (parse_xml_btrace_pt_raw): Likewise. (parse_xml_btrace_pt): Likewise. (parse_xml_btrace_conf_bts): Likewise. (parse_xml_btrace_conf_pt): Likewise. (do_btrace_data_cleanup): Likewise. * c-typeprint.c (find_typedef_for_canonicalize): Likewise. * charset.c (cleanup_iconv): Likewise. (do_cleanup_iterator): Likewise. * cli-out.c (cli_uiout_dtor): Likewise. (cli_table_begin): Likewise. (cli_table_body): Likewise. (cli_table_end): Likewise. (cli_table_header): Likewise. (cli_begin): Likewise. (cli_end): Likewise. (cli_field_int): Likewise. (cli_field_skip): Likewise. (cli_field_string): Likewise. (cli_field_fmt): Likewise. (cli_spaces): Likewise. (cli_text): Likewise. (cli_message): Likewise. (cli_wrap_hint): Likewise. (cli_flush): Likewise. (cli_redirect): Likewise. (out_field_fmt): Likewise. (field_separator): Likewise. (cli_out_set_stream): Likewise. * cli/cli-cmds.c (compare_symtabs): Likewise. * cli/cli-dump.c (call_dump_func): Likewise. (restore_section_callback): Likewise. * cli/cli-script.c (clear_hook_in_cleanup): Likewise. (do_restore_user_call_depth): Likewise. (do_free_command_lines_cleanup): Likewise. * coff-pe-read.c (get_section_vmas): Likewise. (pe_as16): Likewise. (pe_as32): Likewise. * coffread.c (coff_symfile_read): Likewise. * common/agent.c (agent_look_up_symbols): Likewise. * common/filestuff.c (do_close_cleanup): Likewise. * common/format.c (free_format_pieces_cleanup): Likewise. * common/vec.c (vec_o_reserve): Likewise. * compile/compile-c-support.c (print_one_macro): Likewise. * compile/compile-c-symbols.c (hash_symbol_error): Likewise. (eq_symbol_error): Likewise. (del_symbol_error): Likewise. (error_symbol_once): Likewise. (gcc_convert_symbol): Likewise. (gcc_symbol_address): Likewise. (hash_symname): Likewise. (eq_symname): Likewise. * compile/compile-c-types.c (hash_type_map_instance): Likewise. (eq_type_map_instance): Likewise. (insert_type): Likewise. (convert_type): Likewise. * compile/compile-object-load.c (munmap_listp_free_cleanup): Likewise. (setup_sections): Likewise. (link_hash_table_free): Likewise. (copy_sections): Likewise. * compile/compile-object-run.c (do_module_cleanup): Likewise. * compile/compile.c (compile_print_value): Likewise. (do_rmdir): Likewise. (cleanup_compile_instance): Likewise. (cleanup_unlink_file): Likewise. * completer.c (free_completion_tracker): Likewise. * corelow.c (add_to_spuid_list): Likewise. * cp-namespace.c (reset_directive_searched): Likewise. * cp-support.c (reset_directive_searched): Likewise. * cris-tdep.c (cris_sigtramp_frame_unwind_cache): Likewise. (cris_frame_unwind_cache): Likewise. * d-lang.c (builtin_d_type): Likewise. * d-namespace.c (reset_directive_searched): Likewise. * dbxread.c (dbx_free_symfile_info): Likewise. (do_free_bincl_list_cleanup): Likewise. * disasm.c (hash_dis_line_entry): Likewise. (eq_dis_line_entry): Likewise. (dis_asm_print_address): Likewise. (fprintf_disasm): Likewise. (do_ui_file_delete): Likewise. * doublest.c (convert_floatformat_to_doublest): Likewise. * dummy-frame.c (pop_dummy_frame_bpt): Likewise. (dummy_frame_prev_register): Likewise. (dummy_frame_this_id): Likewise. * dwarf2-frame-tailcall.c (cache_hash): Likewise. (cache_eq): Likewise. (cache_find): Likewise. (tailcall_frame_this_id): Likewise. (dwarf2_tailcall_prev_register_first): Likewise. (tailcall_frame_prev_register): Likewise. (tailcall_frame_dealloc_cache): Likewise. (tailcall_frame_prev_arch): Likewise. * dwarf2-frame.c (dwarf2_frame_state_free): Likewise. (dwarf2_frame_set_init_reg): Likewise. (dwarf2_frame_init_reg): Likewise. (dwarf2_frame_set_signal_frame_p): Likewise. (dwarf2_frame_signal_frame_p): Likewise. (dwarf2_frame_set_adjust_regnum): Likewise. (dwarf2_frame_adjust_regnum): Likewise. (clear_pointer_cleanup): Likewise. (dwarf2_frame_cache): Likewise. (find_cie): Likewise. (dwarf2_frame_find_fde): Likewise. * dwarf2expr.c (dwarf_expr_address_type): Likewise. (free_dwarf_expr_context_cleanup): Likewise. * dwarf2loc.c (locexpr_find_frame_base_location): Likewise. (locexpr_get_frame_base): Likewise. (loclist_find_frame_base_location): Likewise. (loclist_get_frame_base): Likewise. (dwarf_expr_dwarf_call): Likewise. (dwarf_expr_get_base_type): Likewise. (dwarf_expr_push_dwarf_reg_entry_value): Likewise. (dwarf_expr_get_obj_addr): Likewise. (entry_data_value_coerce_ref): Likewise. (entry_data_value_copy_closure): Likewise. (entry_data_value_free_closure): Likewise. (get_frame_address_in_block_wrapper): Likewise. (dwarf2_evaluate_property): Likewise. (dwarf2_compile_property_to_c): Likewise. (needs_frame_read_addr_from_reg): Likewise. (needs_frame_get_reg_value): Likewise. (needs_frame_frame_base): Likewise. (needs_frame_frame_cfa): Likewise. (needs_frame_tls_address): Likewise. (needs_frame_dwarf_call): Likewise. (needs_dwarf_reg_entry_value): Likewise. (get_ax_pc): Likewise. (locexpr_read_variable): Likewise. (locexpr_read_variable_at_entry): Likewise. (locexpr_read_needs_frame): Likewise. (locexpr_describe_location): Likewise. (locexpr_tracepoint_var_ref): Likewise. (locexpr_generate_c_location): Likewise. (loclist_read_variable): Likewise. (loclist_read_variable_at_entry): Likewise. (loclist_describe_location): Likewise. (loclist_tracepoint_var_ref): Likewise. (loclist_generate_c_location): Likewise. * dwarf2read.c (line_header_hash_voidp): Likewise. (line_header_eq_voidp): Likewise. (dwarf2_has_info): Likewise. (dwarf2_get_section_info): Likewise. (locate_dwz_sections): Likewise. (hash_file_name_entry): Likewise. (eq_file_name_entry): Likewise. (delete_file_name_entry): Likewise. (dw2_setup): Likewise. (dw2_get_file_names_reader): Likewise. (dw2_find_pc_sect_compunit_symtab): Likewise. (hash_signatured_type): Likewise. (eq_signatured_type): Likewise. (add_signatured_type_cu_to_table): Likewise. (create_debug_types_hash_table): Likewise. (lookup_dwo_signatured_type): Likewise. (lookup_dwp_signatured_type): Likewise. (lookup_signatured_type): Likewise. (hash_type_unit_group): Likewise. (eq_type_unit_group): Likewise. (get_type_unit_group): Likewise. (process_psymtab_comp_unit_reader): Likewise. (sort_tu_by_abbrev_offset): Likewise. (process_skeletonless_type_unit): Likewise. (psymtabs_addrmap_cleanup): Likewise. (dwarf2_read_symtab): Likewise. (psymtab_to_symtab_1): Likewise. (die_hash): Likewise. (die_eq): Likewise. (load_full_comp_unit_reader): Likewise. (reset_die_in_process): Likewise. (free_cu_line_header): Likewise. (handle_DW_AT_stmt_list): Likewise. (hash_dwo_file): Likewise. (eq_dwo_file): Likewise. (hash_dwo_unit): Likewise. (eq_dwo_unit): Likewise. (create_dwo_cu_reader): Likewise. (create_dwo_unit_in_dwp_v1): Likewise. (create_dwo_unit_in_dwp_v2): Likewise. (lookup_dwo_unit_in_dwp): Likewise. (dwarf2_locate_dwo_sections): Likewise. (dwarf2_locate_common_dwp_sections): Likewise. (dwarf2_locate_v2_dwp_sections): Likewise. (hash_dwp_loaded_cutus): Likewise. (eq_dwp_loaded_cutus): Likewise. (lookup_dwo_cutu): Likewise. (abbrev_table_free_cleanup): Likewise. (dwarf2_free_abbrev_table): Likewise. (find_partial_die_in_comp_unit): Likewise. (free_line_header_voidp): Likewise. (follow_die_offset): Likewise. (follow_die_sig_1): Likewise. (free_heap_comp_unit): Likewise. (free_stack_comp_unit): Likewise. (dwarf2_free_objfile): Likewise. (per_cu_offset_and_type_hash): Likewise. (per_cu_offset_and_type_eq): Likewise. (get_die_type_at_offset): Likewise. (partial_die_hash): Likewise. (partial_die_eq): Likewise. (dwarf2_per_objfile_free): Likewise. (hash_strtab_entry): Likewise. (eq_strtab_entry): Likewise. (add_string): Likewise. (hash_symtab_entry): Likewise. (eq_symtab_entry): Likewise. (delete_symtab_entry): Likewise. (cleanup_mapped_symtab): Likewise. (add_indices_to_cpool): Likewise. (hash_psymtab_cu_index): Likewise. (eq_psymtab_cu_index): Likewise. (add_address_entry_worker): Likewise. (unlink_if_set): Likewise. (write_one_signatured_type): Likewise. (save_gdb_index_command): Likewise. * elfread.c (elf_symtab_read): Likewise. (elf_gnu_ifunc_cache_hash): Likewise. (elf_gnu_ifunc_cache_eq): Likewise. (elf_gnu_ifunc_record_cache): Likewise. (elf_gnu_ifunc_resolve_by_cache): Likewise. (elf_get_probes): Likewise. (probe_key_free): Likewise. * f-lang.c (builtin_f_type): Likewise. * frame-base.c (frame_base_append_sniffer): Likewise. (frame_base_set_default): Likewise. (frame_base_find_by_frame): Likewise. * frame-unwind.c (frame_unwind_prepend_unwinder): Likewise. (frame_unwind_append_unwinder): Likewise. (frame_unwind_find_by_frame): Likewise. * frame.c (frame_addr_hash): Likewise. (frame_addr_hash_eq): Likewise. (frame_stash_find): Likewise. (do_frame_register_read): Likewise. (unwind_to_current_frame): Likewise. (frame_cleanup_after_sniffer): Likewise. * frv-linux-tdep.c (frv_linux_sigtramp_frame_cache): Likewise. * frv-tdep.c (frv_frame_unwind_cache): Likewise. * ft32-tdep.c (ft32_frame_cache): Likewise. * gcore.c (do_bfd_delete_cleanup): Likewise. (gcore_create_callback): Likewise. * gdb_bfd.c (hash_bfd): Likewise. (eq_bfd): Likewise. (gdb_bfd_open): Likewise. (free_one_bfd_section): Likewise. (gdb_bfd_ref): Likewise. (gdb_bfd_unref): Likewise. (get_section_descriptor): Likewise. (gdb_bfd_map_section): Likewise. (gdb_bfd_crc): Likewise. (gdb_bfd_mark_parent): Likewise. (gdb_bfd_record_inclusion): Likewise. (gdb_bfd_requires_relocations): Likewise. (print_one_bfd): Likewise. * gdbtypes.c (type_pair_hash): Likewise. (type_pair_eq): Likewise. (builtin_type): Likewise. (objfile_type): Likewise. * gnu-v3-abi.c (vtable_ptrdiff_type): Likewise. (vtable_address_point_offset): Likewise. (gnuv3_get_vtable): Likewise. (hash_value_and_voffset): Likewise. (eq_value_and_voffset): Likewise. (compare_value_and_voffset): Likewise. (compute_vtable_size): Likewise. (gnuv3_get_typeid_type): Likewise. * go-lang.c (builtin_go_type): Likewise. * guile/scm-block.c (bkscm_hash_block_smob): Likewise. (bkscm_eq_block_smob): Likewise. (bkscm_objfile_block_map): Likewise. (bkscm_del_objfile_blocks): Likewise. * guile/scm-breakpoint.c (bpscm_build_bp_list): Likewise. * guile/scm-disasm.c (gdbscm_disasm_read_memory_worker): Likewise. (gdbscm_disasm_print_address): Likewise. * guile/scm-frame.c (frscm_hash_frame_smob): Likewise. (frscm_eq_frame_smob): Likewise. (frscm_inferior_frame_map): Likewise. (frscm_del_inferior_frames): Likewise. * guile/scm-gsmob.c (gdbscm_add_objfile_ref): Likewise. * guile/scm-objfile.c (ofscm_handle_objfile_deleted): Likewise. (ofscm_objfile_smob_from_objfile): Likewise. * guile/scm-ports.c (ioscm_write): Likewise. (ioscm_file_port_delete): Likewise. (ioscm_file_port_rewind): Likewise. (ioscm_file_port_put): Likewise. (ioscm_file_port_write): Likewise. * guile/scm-progspace.c (psscm_handle_pspace_deleted): Likewise. (psscm_pspace_smob_from_pspace): Likewise. * guile/scm-safe-call.c (scscm_recording_pre_unwind_handler): Likewise. (scscm_recording_unwind_handler): Likewise. (gdbscm_with_catch): Likewise. (scscm_call_0_body): Likewise. (scscm_call_1_body): Likewise. (scscm_call_2_body): Likewise. (scscm_call_3_body): Likewise. (scscm_call_4_body): Likewise. (scscm_apply_1_body): Likewise. (scscm_eval_scheme_string): Likewise. (gdbscm_safe_eval_string): Likewise. (scscm_source_scheme_script): Likewise. (gdbscm_safe_source_script): Likewise. * guile/scm-string.c (gdbscm_call_scm_to_stringn): Likewise. (gdbscm_call_scm_from_stringn): Likewise. * guile/scm-symbol.c (syscm_hash_symbol_smob): Likewise. (syscm_eq_symbol_smob): Likewise. (syscm_get_symbol_map): Likewise. (syscm_del_objfile_symbols): Likewise. * guile/scm-symtab.c (stscm_hash_symtab_smob): Likewise. (stscm_eq_symtab_smob): Likewise. (stscm_objfile_symtab_map): Likewise. (stscm_del_objfile_symtabs): Likewise. * guile/scm-type.c (tyscm_hash_type_smob): Likewise. (tyscm_eq_type_smob): Likewise. (tyscm_type_map): Likewise. (tyscm_copy_type_recursive): Likewise. (save_objfile_types): Likewise. * guile/scm-utils.c (extract_arg): Likewise. * h8300-tdep.c (h8300_frame_cache): Likewise. * hppa-linux-tdep.c (hppa_linux_sigtramp_frame_unwind_cache): Likewise. * hppa-tdep.c (compare_unwind_entries): Likewise. (find_unwind_entry): Likewise. (hppa_frame_cache): Likewise. (hppa_stub_frame_unwind_cache): Likewise. * hppanbsd-tdep.c (hppanbsd_supply_gregset): Likewise. * hppaobsd-tdep.c (hppaobsd_supply_gregset): Likewise. (hppaobsd_supply_fpregset): Likewise. * i386-cygwin-tdep.c (core_process_module_section): Likewise. * i386-linux-tdep.c (i386_linux_init_abi): Likewise. * i386-tdep.c (i386_frame_cache): Likewise. (i386_epilogue_frame_cache): Likewise. (i386_sigtramp_frame_cache): Likewise. (i386_supply_gregset): Likewise. (i386_collect_gregset): Likewise. (i386_gdbarch_init): Likewise. * i386obsd-tdep.c (i386obsd_aout_supply_regset): Likewise. (i386obsd_trapframe_cache): Likewise. * i387-tdep.c (i387_supply_fsave): Likewise. (i387_collect_fsave): Likewise. (i387_supply_fxsave): Likewise. (i387_collect_fxsave): Likewise. (i387_supply_xsave): Likewise. (i387_collect_xsave): Likewise. * ia64-tdep.c (ia64_frame_cache): Likewise. (ia64_sigtramp_frame_cache): Likewise. * infcmd.c (attach_command_continuation): Likewise. (attach_command_continuation_free_args): Likewise. * inferior.c (restore_inferior): Likewise. (delete_thread_of_inferior): Likewise. * inflow.c (inflow_inferior_data_cleanup): Likewise. (get_inflow_inferior_data): Likewise. (inflow_inferior_exit): Likewise. * infrun.c (displaced_step_clear_cleanup): Likewise. (restore_current_uiout_cleanup): Likewise. (release_stop_context_cleanup): Likewise. (do_restore_infcall_suspend_state_cleanup): Likewise. (do_restore_infcall_control_state_cleanup): Likewise. (restore_inferior_ptid): Likewise. * inline-frame.c (block_starting_point_at): Likewise. * iq2000-tdep.c (iq2000_frame_cache): Likewise. * jit.c (get_jit_objfile_data): Likewise. (get_jit_program_space_data): Likewise. (jit_object_close_impl): Likewise. (jit_find_objf_with_entry_addr): Likewise. (jit_breakpoint_deleted): Likewise. (jit_unwind_reg_set_impl): Likewise. (jit_unwind_reg_get_impl): Likewise. (jit_dealloc_cache): Likewise. (jit_frame_sniffer): Likewise. (jit_frame_prev_register): Likewise. (jit_prepend_unwinder): Likewise. (jit_inferior_exit_hook): Likewise. (free_objfile_data): Likewise. * jv-lang.c (jv_per_objfile_free): Likewise. (get_dynamics_objfile): Likewise. (get_java_class_symtab): Likewise. (builtin_java_type): Likewise. * language.c (language_string_char_type): Likewise. (language_bool_type): Likewise. (language_lookup_primitive_type): Likewise. (language_lookup_primitive_type_as_symbol): Likewise. * linespec.c (hash_address_entry): Likewise. (eq_address_entry): Likewise. (iterate_inline_only): Likewise. (iterate_name_matcher): Likewise. (decode_line_2_compare_items): Likewise. (collect_one_symbol): Likewise. (compare_symbols): Likewise. (compare_msymbols): Likewise. (add_symtabs_to_list): Likewise. (collect_symbols): Likewise. (compare_msyms): Likewise. (add_minsym): Likewise. (cleanup_linespec_result): Likewise. * linux-fork.c (inferior_call_waitpid_cleanup): Likewise. * linux-nat.c (delete_lwp_cleanup): Likewise. (count_events_callback): Likewise. (select_event_lwp_callback): Likewise. (resume_stopped_resumed_lwps): Likewise. * linux-tdep.c (get_linux_gdbarch_data): Likewise. (invalidate_linux_cache_inf): Likewise. (get_linux_inferior_data): Likewise. (linux_find_memory_regions_thunk): Likewise. (linux_make_mappings_callback): Likewise. (linux_corefile_thread_callback): Likewise. (find_mapping_size): Likewise. * linux-thread-db.c (find_new_threads_callback): Likewise. * lm32-tdep.c (lm32_frame_cache): Likewise. * m2-lang.c (builtin_m2_type): Likewise. * m32c-tdep.c (m32c_analyze_frame_prologue): Likewise. * m32r-linux-tdep.c (m32r_linux_sigtramp_frame_cache): Likewise. (m32r_linux_supply_gregset): Likewise. (m32r_linux_collect_gregset): Likewise. * m32r-tdep.c (m32r_frame_unwind_cache): Likewise. * m68hc11-tdep.c (m68hc11_frame_unwind_cache): Likewise. * m68k-tdep.c (m68k_frame_cache): Likewise. * m68kbsd-tdep.c (m68kbsd_supply_fpregset): Likewise. (m68kbsd_supply_gregset): Likewise. * m68klinux-tdep.c (m68k_linux_sigtramp_frame_cache): Likewise. * m88k-tdep.c (m88k_frame_cache): Likewise. (m88k_supply_gregset): Likewise. gdb/gdbserver/ChangeLog: * dll.c (match_dll): Add cast(s). (unloaded_dll): Likewise. * linux-low.c (second_thread_of_pid_p): Likewise. (delete_lwp_callback): Likewise. (count_events_callback): Likewise. (select_event_lwp_callback): Likewise. (linux_set_resume_request): Likewise. * server.c (accumulate_file_name_length): Likewise. (emit_dll_description): Likewise. (handle_qxfer_threads_worker): Likewise. (visit_actioned_threads): Likewise. * thread-db.c (any_thread_of): Likewise. * tracepoint.c (same_process_p): Likewise. (match_blocktype): Likewise. (build_traceframe_info_xml): Likewise. gdb/testsuite/ChangeLog: * gdb.gdb/selftest.exp (do_steps_and_nexts): Adjust expected source line.
605 lines
16 KiB
C
605 lines
16 KiB
C
/* addrmap.c --- implementation of address map data structure.
|
||
|
||
Copyright (C) 2007-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 "splay-tree.h"
|
||
#include "gdb_obstack.h"
|
||
#include "addrmap.h"
|
||
|
||
|
||
/* The "abstract class". */
|
||
|
||
/* Functions implementing the addrmap functions for a particular
|
||
implementation. */
|
||
struct addrmap_funcs
|
||
{
|
||
void (*set_empty) (struct addrmap *self,
|
||
CORE_ADDR start, CORE_ADDR end_inclusive,
|
||
void *obj);
|
||
void *(*find) (struct addrmap *self, CORE_ADDR addr);
|
||
struct addrmap *(*create_fixed) (struct addrmap *self,
|
||
struct obstack *obstack);
|
||
void (*relocate) (struct addrmap *self, CORE_ADDR offset);
|
||
int (*foreach) (struct addrmap *self, addrmap_foreach_fn fn, void *data);
|
||
};
|
||
|
||
|
||
struct addrmap
|
||
{
|
||
const struct addrmap_funcs *funcs;
|
||
};
|
||
|
||
|
||
void
|
||
addrmap_set_empty (struct addrmap *map,
|
||
CORE_ADDR start, CORE_ADDR end_inclusive,
|
||
void *obj)
|
||
{
|
||
map->funcs->set_empty (map, start, end_inclusive, obj);
|
||
}
|
||
|
||
|
||
void *
|
||
addrmap_find (struct addrmap *map, CORE_ADDR addr)
|
||
{
|
||
return map->funcs->find (map, addr);
|
||
}
|
||
|
||
|
||
struct addrmap *
|
||
addrmap_create_fixed (struct addrmap *original, struct obstack *obstack)
|
||
{
|
||
return original->funcs->create_fixed (original, obstack);
|
||
}
|
||
|
||
|
||
/* Relocate all the addresses in MAP by OFFSET. (This can be applied
|
||
to either mutable or immutable maps.) */
|
||
void
|
||
addrmap_relocate (struct addrmap *map, CORE_ADDR offset)
|
||
{
|
||
map->funcs->relocate (map, offset);
|
||
}
|
||
|
||
|
||
int
|
||
addrmap_foreach (struct addrmap *map, addrmap_foreach_fn fn, void *data)
|
||
{
|
||
return map->funcs->foreach (map, fn, data);
|
||
}
|
||
|
||
/* Fixed address maps. */
|
||
|
||
/* A transition: a point in an address map where the value changes.
|
||
The map maps ADDR to VALUE, but if ADDR > 0, it maps ADDR-1 to
|
||
something else. */
|
||
struct addrmap_transition
|
||
{
|
||
CORE_ADDR addr;
|
||
void *value;
|
||
};
|
||
|
||
|
||
struct addrmap_fixed
|
||
{
|
||
struct addrmap addrmap;
|
||
|
||
/* The number of transitions in TRANSITIONS. */
|
||
size_t num_transitions;
|
||
|
||
/* An array of transitions, sorted by address. For every point in
|
||
the map where either ADDR == 0 or ADDR is mapped to one value and
|
||
ADDR - 1 is mapped to something different, we have an entry here
|
||
containing ADDR and VALUE. (Note that this means we always have
|
||
an entry for address 0). */
|
||
struct addrmap_transition transitions[1];
|
||
};
|
||
|
||
|
||
static void
|
||
addrmap_fixed_set_empty (struct addrmap *self,
|
||
CORE_ADDR start, CORE_ADDR end_inclusive,
|
||
void *obj)
|
||
{
|
||
internal_error (__FILE__, __LINE__,
|
||
"addrmap_fixed_set_empty: "
|
||
"fixed addrmaps can't be changed\n");
|
||
}
|
||
|
||
|
||
static void *
|
||
addrmap_fixed_find (struct addrmap *self, CORE_ADDR addr)
|
||
{
|
||
struct addrmap_fixed *map = (struct addrmap_fixed *) self;
|
||
struct addrmap_transition *bottom = &map->transitions[0];
|
||
struct addrmap_transition *top = &map->transitions[map->num_transitions - 1];
|
||
|
||
while (bottom < top)
|
||
{
|
||
/* This needs to round towards top, or else when top = bottom +
|
||
1 (i.e., two entries are under consideration), then mid ==
|
||
bottom, and then we may not narrow the range when (mid->addr
|
||
< addr). */
|
||
struct addrmap_transition *mid = top - (top - bottom) / 2;
|
||
|
||
if (mid->addr == addr)
|
||
{
|
||
bottom = mid;
|
||
break;
|
||
}
|
||
else if (mid->addr < addr)
|
||
/* We don't eliminate mid itself here, since each transition
|
||
covers all subsequent addresses until the next. This is why
|
||
we must round up in computing the midpoint. */
|
||
bottom = mid;
|
||
else
|
||
top = mid - 1;
|
||
}
|
||
|
||
return bottom->value;
|
||
}
|
||
|
||
|
||
static struct addrmap *
|
||
addrmap_fixed_create_fixed (struct addrmap *self, struct obstack *obstack)
|
||
{
|
||
internal_error (__FILE__, __LINE__,
|
||
_("addrmap_create_fixed is not implemented yet "
|
||
"for fixed addrmaps"));
|
||
}
|
||
|
||
|
||
static void
|
||
addrmap_fixed_relocate (struct addrmap *self, CORE_ADDR offset)
|
||
{
|
||
struct addrmap_fixed *map = (struct addrmap_fixed *) self;
|
||
size_t i;
|
||
|
||
for (i = 0; i < map->num_transitions; i++)
|
||
map->transitions[i].addr += offset;
|
||
}
|
||
|
||
|
||
static int
|
||
addrmap_fixed_foreach (struct addrmap *self, addrmap_foreach_fn fn,
|
||
void *data)
|
||
{
|
||
struct addrmap_fixed *map = (struct addrmap_fixed *) self;
|
||
size_t i;
|
||
|
||
for (i = 0; i < map->num_transitions; i++)
|
||
{
|
||
int res = fn (data, map->transitions[i].addr, map->transitions[i].value);
|
||
|
||
if (res != 0)
|
||
return res;
|
||
}
|
||
|
||
return 0;
|
||
}
|
||
|
||
|
||
static const struct addrmap_funcs addrmap_fixed_funcs =
|
||
{
|
||
addrmap_fixed_set_empty,
|
||
addrmap_fixed_find,
|
||
addrmap_fixed_create_fixed,
|
||
addrmap_fixed_relocate,
|
||
addrmap_fixed_foreach
|
||
};
|
||
|
||
|
||
|
||
/* Mutable address maps. */
|
||
|
||
struct addrmap_mutable
|
||
{
|
||
struct addrmap addrmap;
|
||
|
||
/* The obstack to use for allocations for this map. */
|
||
struct obstack *obstack;
|
||
|
||
/* A splay tree, with a node for each transition; there is a
|
||
transition at address T if T-1 and T map to different objects.
|
||
|
||
Any addresses below the first node map to NULL. (Unlike
|
||
fixed maps, we have no entry at (CORE_ADDR) 0; it doesn't
|
||
simplify enough.)
|
||
|
||
The last region is assumed to end at CORE_ADDR_MAX.
|
||
|
||
Since we can't know whether CORE_ADDR is larger or smaller than
|
||
splay_tree_key (unsigned long) --- I think both are possible,
|
||
given all combinations of 32- and 64-bit hosts and targets ---
|
||
our keys are pointers to CORE_ADDR values. Since the splay tree
|
||
library doesn't pass any closure pointer to the key free
|
||
function, we can't keep a freelist for keys. Since mutable
|
||
addrmaps are only used temporarily right now, we just leak keys
|
||
from deleted nodes; they'll be freed when the obstack is freed. */
|
||
splay_tree tree;
|
||
|
||
/* A freelist for splay tree nodes, allocated on obstack, and
|
||
chained together by their 'right' pointers. */
|
||
splay_tree_node free_nodes;
|
||
};
|
||
|
||
|
||
/* Allocate a copy of CORE_ADDR in MAP's obstack. */
|
||
static splay_tree_key
|
||
allocate_key (struct addrmap_mutable *map, CORE_ADDR addr)
|
||
{
|
||
CORE_ADDR *key = XOBNEW (map->obstack, CORE_ADDR);
|
||
|
||
*key = addr;
|
||
return (splay_tree_key) key;
|
||
}
|
||
|
||
|
||
/* Type-correct wrappers for splay tree access. */
|
||
static splay_tree_node
|
||
addrmap_splay_tree_lookup (struct addrmap_mutable *map, CORE_ADDR addr)
|
||
{
|
||
return splay_tree_lookup (map->tree, (splay_tree_key) &addr);
|
||
}
|
||
|
||
|
||
static splay_tree_node
|
||
addrmap_splay_tree_predecessor (struct addrmap_mutable *map, CORE_ADDR addr)
|
||
{
|
||
return splay_tree_predecessor (map->tree, (splay_tree_key) &addr);
|
||
}
|
||
|
||
|
||
static splay_tree_node
|
||
addrmap_splay_tree_successor (struct addrmap_mutable *map, CORE_ADDR addr)
|
||
{
|
||
return splay_tree_successor (map->tree, (splay_tree_key) &addr);
|
||
}
|
||
|
||
|
||
static void
|
||
addrmap_splay_tree_remove (struct addrmap_mutable *map, CORE_ADDR addr)
|
||
{
|
||
splay_tree_remove (map->tree, (splay_tree_key) &addr);
|
||
}
|
||
|
||
|
||
static CORE_ADDR
|
||
addrmap_node_key (splay_tree_node node)
|
||
{
|
||
return * (CORE_ADDR *) node->key;
|
||
}
|
||
|
||
|
||
static void *
|
||
addrmap_node_value (splay_tree_node node)
|
||
{
|
||
return (void *) node->value;
|
||
}
|
||
|
||
|
||
static void
|
||
addrmap_node_set_value (splay_tree_node node, void *value)
|
||
{
|
||
node->value = (splay_tree_value) value;
|
||
}
|
||
|
||
|
||
static void
|
||
addrmap_splay_tree_insert (struct addrmap_mutable *map,
|
||
CORE_ADDR key, void *value)
|
||
{
|
||
splay_tree_insert (map->tree,
|
||
allocate_key (map, key),
|
||
(splay_tree_value) value);
|
||
}
|
||
|
||
|
||
/* Without changing the mapping of any address, ensure that there is a
|
||
tree node at ADDR, even if it would represent a "transition" from
|
||
one value to the same value. */
|
||
static void
|
||
force_transition (struct addrmap_mutable *self, CORE_ADDR addr)
|
||
{
|
||
splay_tree_node n
|
||
= addrmap_splay_tree_lookup (self, addr);
|
||
|
||
if (! n)
|
||
{
|
||
n = addrmap_splay_tree_predecessor (self, addr);
|
||
addrmap_splay_tree_insert (self, addr,
|
||
n ? addrmap_node_value (n) : NULL);
|
||
}
|
||
}
|
||
|
||
|
||
static void
|
||
addrmap_mutable_set_empty (struct addrmap *self,
|
||
CORE_ADDR start, CORE_ADDR end_inclusive,
|
||
void *obj)
|
||
{
|
||
struct addrmap_mutable *map = (struct addrmap_mutable *) self;
|
||
splay_tree_node n, next;
|
||
void *prior_value;
|
||
|
||
/* If we're being asked to set all empty portions of the given
|
||
address range to empty, then probably the caller is confused.
|
||
(If that turns out to be useful in some cases, then we can change
|
||
this to simply return, since overriding NULL with NULL is a
|
||
no-op.) */
|
||
gdb_assert (obj);
|
||
|
||
/* We take a two-pass approach, for simplicity.
|
||
- Establish transitions where we think we might need them.
|
||
- First pass: change all NULL regions to OBJ.
|
||
- Second pass: remove any unnecessary transitions. */
|
||
|
||
/* Establish transitions at the start and end. */
|
||
force_transition (map, start);
|
||
if (end_inclusive < CORE_ADDR_MAX)
|
||
force_transition (map, end_inclusive + 1);
|
||
|
||
/* Walk the area, changing all NULL regions to OBJ. */
|
||
for (n = addrmap_splay_tree_lookup (map, start), gdb_assert (n);
|
||
n && addrmap_node_key (n) <= end_inclusive;
|
||
n = addrmap_splay_tree_successor (map, addrmap_node_key (n)))
|
||
{
|
||
if (! addrmap_node_value (n))
|
||
addrmap_node_set_value (n, obj);
|
||
}
|
||
|
||
/* Walk the area again, removing transitions from any value to
|
||
itself. Be sure to visit both the transitions we forced
|
||
above. */
|
||
n = addrmap_splay_tree_predecessor (map, start);
|
||
prior_value = n ? addrmap_node_value (n) : NULL;
|
||
for (n = addrmap_splay_tree_lookup (map, start), gdb_assert (n);
|
||
n && (end_inclusive == CORE_ADDR_MAX
|
||
|| addrmap_node_key (n) <= end_inclusive + 1);
|
||
n = next)
|
||
{
|
||
next = addrmap_splay_tree_successor (map, addrmap_node_key (n));
|
||
if (addrmap_node_value (n) == prior_value)
|
||
addrmap_splay_tree_remove (map, addrmap_node_key (n));
|
||
else
|
||
prior_value = addrmap_node_value (n);
|
||
}
|
||
}
|
||
|
||
|
||
static void *
|
||
addrmap_mutable_find (struct addrmap *self, CORE_ADDR addr)
|
||
{
|
||
/* Not needed yet. */
|
||
internal_error (__FILE__, __LINE__,
|
||
_("addrmap_find is not implemented yet "
|
||
"for mutable addrmaps"));
|
||
}
|
||
|
||
|
||
/* A function to pass to splay_tree_foreach to count the number of nodes
|
||
in the tree. */
|
||
static int
|
||
splay_foreach_count (splay_tree_node n, void *closure)
|
||
{
|
||
size_t *count = (size_t *) closure;
|
||
|
||
(*count)++;
|
||
return 0;
|
||
}
|
||
|
||
|
||
/* A function to pass to splay_tree_foreach to copy entries into a
|
||
fixed address map. */
|
||
static int
|
||
splay_foreach_copy (splay_tree_node n, void *closure)
|
||
{
|
||
struct addrmap_fixed *fixed = (struct addrmap_fixed *) closure;
|
||
struct addrmap_transition *t = &fixed->transitions[fixed->num_transitions];
|
||
|
||
t->addr = addrmap_node_key (n);
|
||
t->value = addrmap_node_value (n);
|
||
fixed->num_transitions++;
|
||
|
||
return 0;
|
||
}
|
||
|
||
|
||
static struct addrmap *
|
||
addrmap_mutable_create_fixed (struct addrmap *self, struct obstack *obstack)
|
||
{
|
||
struct addrmap_mutable *mutable_obj = (struct addrmap_mutable *) self;
|
||
struct addrmap_fixed *fixed;
|
||
size_t num_transitions;
|
||
size_t alloc_len;
|
||
|
||
/* Count the number of transitions in the tree. */
|
||
num_transitions = 0;
|
||
splay_tree_foreach (mutable_obj->tree, splay_foreach_count, &num_transitions);
|
||
|
||
/* Include an extra entry for the transition at zero (which fixed
|
||
maps have, but mutable maps do not.) */
|
||
num_transitions++;
|
||
|
||
alloc_len = sizeof (*fixed)
|
||
+ (num_transitions * sizeof (fixed->transitions[0]));
|
||
fixed = (struct addrmap_fixed *) obstack_alloc (obstack, alloc_len);
|
||
fixed->addrmap.funcs = &addrmap_fixed_funcs;
|
||
fixed->num_transitions = 1;
|
||
fixed->transitions[0].addr = 0;
|
||
fixed->transitions[0].value = NULL;
|
||
|
||
/* Copy all entries from the splay tree to the array, in order
|
||
of increasing address. */
|
||
splay_tree_foreach (mutable_obj->tree, splay_foreach_copy, fixed);
|
||
|
||
/* We should have filled the array. */
|
||
gdb_assert (fixed->num_transitions == num_transitions);
|
||
|
||
return (struct addrmap *) fixed;
|
||
}
|
||
|
||
|
||
static void
|
||
addrmap_mutable_relocate (struct addrmap *self, CORE_ADDR offset)
|
||
{
|
||
/* Not needed yet. */
|
||
internal_error (__FILE__, __LINE__,
|
||
_("addrmap_relocate is not implemented yet "
|
||
"for mutable addrmaps"));
|
||
}
|
||
|
||
|
||
/* Struct to map addrmap's foreach function to splay_tree's version. */
|
||
struct mutable_foreach_data
|
||
{
|
||
addrmap_foreach_fn fn;
|
||
void *data;
|
||
};
|
||
|
||
|
||
/* This is a splay_tree_foreach_fn. */
|
||
|
||
static int
|
||
addrmap_mutable_foreach_worker (splay_tree_node node, void *data)
|
||
{
|
||
struct mutable_foreach_data *foreach_data
|
||
= (struct mutable_foreach_data *) data;
|
||
|
||
return foreach_data->fn (foreach_data->data,
|
||
addrmap_node_key (node),
|
||
addrmap_node_value (node));
|
||
}
|
||
|
||
|
||
static int
|
||
addrmap_mutable_foreach (struct addrmap *self, addrmap_foreach_fn fn,
|
||
void *data)
|
||
{
|
||
struct addrmap_mutable *mutable_obj = (struct addrmap_mutable *) self;
|
||
struct mutable_foreach_data foreach_data;
|
||
|
||
foreach_data.fn = fn;
|
||
foreach_data.data = data;
|
||
return splay_tree_foreach (mutable_obj->tree, addrmap_mutable_foreach_worker,
|
||
&foreach_data);
|
||
}
|
||
|
||
|
||
static const struct addrmap_funcs addrmap_mutable_funcs =
|
||
{
|
||
addrmap_mutable_set_empty,
|
||
addrmap_mutable_find,
|
||
addrmap_mutable_create_fixed,
|
||
addrmap_mutable_relocate,
|
||
addrmap_mutable_foreach
|
||
};
|
||
|
||
|
||
static void *
|
||
splay_obstack_alloc (int size, void *closure)
|
||
{
|
||
struct addrmap_mutable *map = (struct addrmap_mutable *) closure;
|
||
splay_tree_node n;
|
||
|
||
/* We should only be asked to allocate nodes and larger things.
|
||
(If, at some point in the future, this is no longer true, we can
|
||
just round up the size to sizeof (*n).) */
|
||
gdb_assert (size >= sizeof (*n));
|
||
|
||
if (map->free_nodes)
|
||
{
|
||
n = map->free_nodes;
|
||
map->free_nodes = n->right;
|
||
return n;
|
||
}
|
||
else
|
||
return obstack_alloc (map->obstack, size);
|
||
}
|
||
|
||
|
||
static void
|
||
splay_obstack_free (void *obj, void *closure)
|
||
{
|
||
struct addrmap_mutable *map = (struct addrmap_mutable *) closure;
|
||
splay_tree_node n = (splay_tree_node) obj;
|
||
|
||
/* We've asserted in the allocation function that we only allocate
|
||
nodes or larger things, so it should be safe to put whatever
|
||
we get passed back on the free list. */
|
||
n->right = map->free_nodes;
|
||
map->free_nodes = n;
|
||
}
|
||
|
||
|
||
/* Compare keys as CORE_ADDR * values. */
|
||
static int
|
||
splay_compare_CORE_ADDR_ptr (splay_tree_key ak, splay_tree_key bk)
|
||
{
|
||
CORE_ADDR a = * (CORE_ADDR *) ak;
|
||
CORE_ADDR b = * (CORE_ADDR *) bk;
|
||
|
||
/* We can't just return a-b here, because of over/underflow. */
|
||
if (a < b)
|
||
return -1;
|
||
else if (a == b)
|
||
return 0;
|
||
else
|
||
return 1;
|
||
}
|
||
|
||
|
||
struct addrmap *
|
||
addrmap_create_mutable (struct obstack *obstack)
|
||
{
|
||
struct addrmap_mutable *map = XOBNEW (obstack, struct addrmap_mutable);
|
||
|
||
map->addrmap.funcs = &addrmap_mutable_funcs;
|
||
map->obstack = obstack;
|
||
|
||
/* splay_tree_new_with_allocator uses the provided allocation
|
||
function to allocate the main splay_tree structure itself, so our
|
||
free list has to be initialized before we create the tree. */
|
||
map->free_nodes = NULL;
|
||
|
||
map->tree = splay_tree_new_with_allocator (splay_compare_CORE_ADDR_ptr,
|
||
NULL, /* no delete key */
|
||
NULL, /* no delete value */
|
||
splay_obstack_alloc,
|
||
splay_obstack_free,
|
||
map);
|
||
|
||
return (struct addrmap *) map;
|
||
}
|
||
|
||
|
||
|
||
/* Initialization. */
|
||
|
||
/* Provide a prototype to silence -Wmissing-prototypes. */
|
||
extern initialize_file_ftype _initialize_addrmap;
|
||
|
||
void
|
||
_initialize_addrmap (void)
|
||
{
|
||
/* Make sure splay trees can actually hold the values we want to
|
||
store in them. */
|
||
gdb_assert (sizeof (splay_tree_key) >= sizeof (CORE_ADDR *));
|
||
gdb_assert (sizeof (splay_tree_value) >= sizeof (void *));
|
||
}
|