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.
877 lines
26 KiB
C
877 lines
26 KiB
C
/* Disassemble support for GDB.
|
|
|
|
Copyright (C) 2000-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 "target.h"
|
|
#include "value.h"
|
|
#include "ui-out.h"
|
|
#include "disasm.h"
|
|
#include "gdbcore.h"
|
|
#include "dis-asm.h"
|
|
#include "source.h"
|
|
|
|
/* Disassemble functions.
|
|
FIXME: We should get rid of all the duplicate code in gdb that does
|
|
the same thing: disassemble_command() and the gdbtk variation. */
|
|
|
|
/* This structure is used to store line number information for the
|
|
deprecated /m option.
|
|
We need a different sort of line table from the normal one cuz we can't
|
|
depend upon implicit line-end pc's for lines to do the
|
|
reordering in this function. */
|
|
|
|
struct deprecated_dis_line_entry
|
|
{
|
|
int line;
|
|
CORE_ADDR start_pc;
|
|
CORE_ADDR end_pc;
|
|
};
|
|
|
|
/* This Structure is used to store line number information.
|
|
We need a different sort of line table from the normal one cuz we can't
|
|
depend upon implicit line-end pc's for lines to do the
|
|
reordering in this function. */
|
|
|
|
struct dis_line_entry
|
|
{
|
|
struct symtab *symtab;
|
|
int line;
|
|
};
|
|
|
|
/* Hash function for dis_line_entry. */
|
|
|
|
static hashval_t
|
|
hash_dis_line_entry (const void *item)
|
|
{
|
|
const struct dis_line_entry *dle = (const struct dis_line_entry *) item;
|
|
|
|
return htab_hash_pointer (dle->symtab) + dle->line;
|
|
}
|
|
|
|
/* Equal function for dis_line_entry. */
|
|
|
|
static int
|
|
eq_dis_line_entry (const void *item_lhs, const void *item_rhs)
|
|
{
|
|
const struct dis_line_entry *lhs = (const struct dis_line_entry *) item_lhs;
|
|
const struct dis_line_entry *rhs = (const struct dis_line_entry *) item_rhs;
|
|
|
|
return (lhs->symtab == rhs->symtab
|
|
&& lhs->line == rhs->line);
|
|
}
|
|
|
|
/* Create the table to manage lines for mixed source/disassembly. */
|
|
|
|
static htab_t
|
|
allocate_dis_line_table (void)
|
|
{
|
|
return htab_create_alloc (41,
|
|
hash_dis_line_entry, eq_dis_line_entry,
|
|
xfree, xcalloc, xfree);
|
|
}
|
|
|
|
/* Add DLE to TABLE.
|
|
Returns 1 if added, 0 if already present. */
|
|
|
|
static void
|
|
maybe_add_dis_line_entry (htab_t table, struct symtab *symtab, int line)
|
|
{
|
|
void **slot;
|
|
struct dis_line_entry dle, *dlep;
|
|
|
|
dle.symtab = symtab;
|
|
dle.line = line;
|
|
slot = htab_find_slot (table, &dle, INSERT);
|
|
if (*slot == NULL)
|
|
{
|
|
dlep = XNEW (struct dis_line_entry);
|
|
dlep->symtab = symtab;
|
|
dlep->line = line;
|
|
*slot = dlep;
|
|
}
|
|
}
|
|
|
|
/* Return non-zero if SYMTAB, LINE are in TABLE. */
|
|
|
|
static int
|
|
line_has_code_p (htab_t table, struct symtab *symtab, int line)
|
|
{
|
|
struct dis_line_entry dle;
|
|
|
|
dle.symtab = symtab;
|
|
dle.line = line;
|
|
return htab_find (table, &dle) != NULL;
|
|
}
|
|
|
|
/* Like target_read_memory, but slightly different parameters. */
|
|
static int
|
|
dis_asm_read_memory (bfd_vma memaddr, gdb_byte *myaddr, unsigned int len,
|
|
struct disassemble_info *info)
|
|
{
|
|
return target_read_code (memaddr, myaddr, len);
|
|
}
|
|
|
|
/* Like memory_error with slightly different parameters. */
|
|
static void
|
|
dis_asm_memory_error (int status, bfd_vma memaddr,
|
|
struct disassemble_info *info)
|
|
{
|
|
memory_error (status, memaddr);
|
|
}
|
|
|
|
/* Like print_address with slightly different parameters. */
|
|
static void
|
|
dis_asm_print_address (bfd_vma addr, struct disassemble_info *info)
|
|
{
|
|
struct gdbarch *gdbarch = (struct gdbarch *) info->application_data;
|
|
|
|
print_address (gdbarch, addr, (struct ui_file *) info->stream);
|
|
}
|
|
|
|
static int
|
|
compare_lines (const void *mle1p, const void *mle2p)
|
|
{
|
|
struct deprecated_dis_line_entry *mle1, *mle2;
|
|
int val;
|
|
|
|
mle1 = (struct deprecated_dis_line_entry *) mle1p;
|
|
mle2 = (struct deprecated_dis_line_entry *) mle2p;
|
|
|
|
/* End of sequence markers have a line number of 0 but don't want to
|
|
be sorted to the head of the list, instead sort by PC. */
|
|
if (mle1->line == 0 || mle2->line == 0)
|
|
{
|
|
val = mle1->start_pc - mle2->start_pc;
|
|
if (val == 0)
|
|
val = mle1->line - mle2->line;
|
|
}
|
|
else
|
|
{
|
|
val = mle1->line - mle2->line;
|
|
if (val == 0)
|
|
val = mle1->start_pc - mle2->start_pc;
|
|
}
|
|
return val;
|
|
}
|
|
|
|
static int
|
|
dump_insns (struct gdbarch *gdbarch, struct ui_out *uiout,
|
|
struct disassemble_info * di,
|
|
CORE_ADDR low, CORE_ADDR high,
|
|
int how_many, int flags, struct ui_file *stb,
|
|
CORE_ADDR *end_pc)
|
|
{
|
|
int num_displayed = 0;
|
|
CORE_ADDR pc;
|
|
|
|
/* parts of the symbolic representation of the address */
|
|
int unmapped;
|
|
int offset;
|
|
int line;
|
|
struct cleanup *ui_out_chain;
|
|
|
|
for (pc = low; pc < high;)
|
|
{
|
|
char *filename = NULL;
|
|
char *name = NULL;
|
|
|
|
QUIT;
|
|
if (how_many >= 0)
|
|
{
|
|
if (num_displayed >= how_many)
|
|
break;
|
|
else
|
|
num_displayed++;
|
|
}
|
|
ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
|
|
|
|
if ((flags & DISASSEMBLY_OMIT_PC) == 0)
|
|
ui_out_text (uiout, pc_prefix (pc));
|
|
ui_out_field_core_addr (uiout, "address", gdbarch, pc);
|
|
|
|
if (!build_address_symbolic (gdbarch, pc, 0, &name, &offset, &filename,
|
|
&line, &unmapped))
|
|
{
|
|
/* We don't care now about line, filename and
|
|
unmapped. But we might in the future. */
|
|
ui_out_text (uiout, " <");
|
|
if ((flags & DISASSEMBLY_OMIT_FNAME) == 0)
|
|
ui_out_field_string (uiout, "func-name", name);
|
|
ui_out_text (uiout, "+");
|
|
ui_out_field_int (uiout, "offset", offset);
|
|
ui_out_text (uiout, ">:\t");
|
|
}
|
|
else
|
|
ui_out_text (uiout, ":\t");
|
|
|
|
if (filename != NULL)
|
|
xfree (filename);
|
|
if (name != NULL)
|
|
xfree (name);
|
|
|
|
ui_file_rewind (stb);
|
|
if (flags & DISASSEMBLY_RAW_INSN)
|
|
{
|
|
CORE_ADDR old_pc = pc;
|
|
bfd_byte data;
|
|
int status;
|
|
const char *spacer = "";
|
|
|
|
/* Build the opcodes using a temporary stream so we can
|
|
write them out in a single go for the MI. */
|
|
struct ui_file *opcode_stream = mem_fileopen ();
|
|
struct cleanup *cleanups =
|
|
make_cleanup_ui_file_delete (opcode_stream);
|
|
|
|
pc += gdbarch_print_insn (gdbarch, pc, di);
|
|
for (;old_pc < pc; old_pc++)
|
|
{
|
|
status = (*di->read_memory_func) (old_pc, &data, 1, di);
|
|
if (status != 0)
|
|
(*di->memory_error_func) (status, old_pc, di);
|
|
fprintf_filtered (opcode_stream, "%s%02x",
|
|
spacer, (unsigned) data);
|
|
spacer = " ";
|
|
}
|
|
ui_out_field_stream (uiout, "opcodes", opcode_stream);
|
|
ui_out_text (uiout, "\t");
|
|
|
|
do_cleanups (cleanups);
|
|
}
|
|
else
|
|
pc += gdbarch_print_insn (gdbarch, pc, di);
|
|
ui_out_field_stream (uiout, "inst", stb);
|
|
ui_file_rewind (stb);
|
|
do_cleanups (ui_out_chain);
|
|
ui_out_text (uiout, "\n");
|
|
}
|
|
|
|
if (end_pc != NULL)
|
|
*end_pc = pc;
|
|
return num_displayed;
|
|
}
|
|
|
|
/* The idea here is to present a source-O-centric view of a
|
|
function to the user. This means that things are presented
|
|
in source order, with (possibly) out of order assembly
|
|
immediately following.
|
|
|
|
N.B. This view is deprecated. */
|
|
|
|
static void
|
|
do_mixed_source_and_assembly_deprecated
|
|
(struct gdbarch *gdbarch, struct ui_out *uiout,
|
|
struct disassemble_info *di, struct symtab *symtab,
|
|
CORE_ADDR low, CORE_ADDR high,
|
|
int how_many, int flags, struct ui_file *stb)
|
|
{
|
|
int newlines = 0;
|
|
int nlines;
|
|
struct linetable_entry *le;
|
|
struct deprecated_dis_line_entry *mle;
|
|
struct symtab_and_line sal;
|
|
int i;
|
|
int out_of_order = 0;
|
|
int next_line = 0;
|
|
int num_displayed = 0;
|
|
enum print_source_lines_flags psl_flags = 0;
|
|
struct cleanup *ui_out_chain;
|
|
struct cleanup *ui_out_tuple_chain = make_cleanup (null_cleanup, 0);
|
|
struct cleanup *ui_out_list_chain = make_cleanup (null_cleanup, 0);
|
|
|
|
gdb_assert (symtab != NULL && SYMTAB_LINETABLE (symtab) != NULL);
|
|
|
|
nlines = SYMTAB_LINETABLE (symtab)->nitems;
|
|
le = SYMTAB_LINETABLE (symtab)->item;
|
|
|
|
if (flags & DISASSEMBLY_FILENAME)
|
|
psl_flags |= PRINT_SOURCE_LINES_FILENAME;
|
|
|
|
mle = (struct deprecated_dis_line_entry *)
|
|
alloca (nlines * sizeof (struct deprecated_dis_line_entry));
|
|
|
|
/* Copy linetable entries for this function into our data
|
|
structure, creating end_pc's and setting out_of_order as
|
|
appropriate. */
|
|
|
|
/* First, skip all the preceding functions. */
|
|
|
|
for (i = 0; i < nlines - 1 && le[i].pc < low; i++);
|
|
|
|
/* Now, copy all entries before the end of this function. */
|
|
|
|
for (; i < nlines - 1 && le[i].pc < high; i++)
|
|
{
|
|
if (le[i].line == le[i + 1].line && le[i].pc == le[i + 1].pc)
|
|
continue; /* Ignore duplicates. */
|
|
|
|
/* Skip any end-of-function markers. */
|
|
if (le[i].line == 0)
|
|
continue;
|
|
|
|
mle[newlines].line = le[i].line;
|
|
if (le[i].line > le[i + 1].line)
|
|
out_of_order = 1;
|
|
mle[newlines].start_pc = le[i].pc;
|
|
mle[newlines].end_pc = le[i + 1].pc;
|
|
newlines++;
|
|
}
|
|
|
|
/* If we're on the last line, and it's part of the function,
|
|
then we need to get the end pc in a special way. */
|
|
|
|
if (i == nlines - 1 && le[i].pc < high)
|
|
{
|
|
mle[newlines].line = le[i].line;
|
|
mle[newlines].start_pc = le[i].pc;
|
|
sal = find_pc_line (le[i].pc, 0);
|
|
mle[newlines].end_pc = sal.end;
|
|
newlines++;
|
|
}
|
|
|
|
/* Now, sort mle by line #s (and, then by addresses within lines). */
|
|
|
|
if (out_of_order)
|
|
qsort (mle, newlines, sizeof (struct deprecated_dis_line_entry),
|
|
compare_lines);
|
|
|
|
/* Now, for each line entry, emit the specified lines (unless
|
|
they have been emitted before), followed by the assembly code
|
|
for that line. */
|
|
|
|
ui_out_chain = make_cleanup_ui_out_list_begin_end (uiout, "asm_insns");
|
|
|
|
for (i = 0; i < newlines; i++)
|
|
{
|
|
/* Print out everything from next_line to the current line. */
|
|
if (mle[i].line >= next_line)
|
|
{
|
|
if (next_line != 0)
|
|
{
|
|
/* Just one line to print. */
|
|
if (next_line == mle[i].line)
|
|
{
|
|
ui_out_tuple_chain
|
|
= make_cleanup_ui_out_tuple_begin_end (uiout,
|
|
"src_and_asm_line");
|
|
print_source_lines (symtab, next_line, mle[i].line + 1, psl_flags);
|
|
}
|
|
else
|
|
{
|
|
/* Several source lines w/o asm instructions associated. */
|
|
for (; next_line < mle[i].line; next_line++)
|
|
{
|
|
struct cleanup *ui_out_list_chain_line;
|
|
struct cleanup *ui_out_tuple_chain_line;
|
|
|
|
ui_out_tuple_chain_line
|
|
= make_cleanup_ui_out_tuple_begin_end (uiout,
|
|
"src_and_asm_line");
|
|
print_source_lines (symtab, next_line, next_line + 1,
|
|
psl_flags);
|
|
ui_out_list_chain_line
|
|
= make_cleanup_ui_out_list_begin_end (uiout,
|
|
"line_asm_insn");
|
|
do_cleanups (ui_out_list_chain_line);
|
|
do_cleanups (ui_out_tuple_chain_line);
|
|
}
|
|
/* Print the last line and leave list open for
|
|
asm instructions to be added. */
|
|
ui_out_tuple_chain
|
|
= make_cleanup_ui_out_tuple_begin_end (uiout,
|
|
"src_and_asm_line");
|
|
print_source_lines (symtab, next_line, mle[i].line + 1, psl_flags);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
ui_out_tuple_chain
|
|
= make_cleanup_ui_out_tuple_begin_end (uiout,
|
|
"src_and_asm_line");
|
|
print_source_lines (symtab, mle[i].line, mle[i].line + 1, psl_flags);
|
|
}
|
|
|
|
next_line = mle[i].line + 1;
|
|
ui_out_list_chain
|
|
= make_cleanup_ui_out_list_begin_end (uiout, "line_asm_insn");
|
|
}
|
|
|
|
num_displayed += dump_insns (gdbarch, uiout, di,
|
|
mle[i].start_pc, mle[i].end_pc,
|
|
how_many, flags, stb, NULL);
|
|
|
|
/* When we've reached the end of the mle array, or we've seen the last
|
|
assembly range for this source line, close out the list/tuple. */
|
|
if (i == (newlines - 1) || mle[i + 1].line > mle[i].line)
|
|
{
|
|
do_cleanups (ui_out_list_chain);
|
|
do_cleanups (ui_out_tuple_chain);
|
|
ui_out_tuple_chain = make_cleanup (null_cleanup, 0);
|
|
ui_out_list_chain = make_cleanup (null_cleanup, 0);
|
|
ui_out_text (uiout, "\n");
|
|
}
|
|
if (how_many >= 0 && num_displayed >= how_many)
|
|
break;
|
|
}
|
|
do_cleanups (ui_out_chain);
|
|
}
|
|
|
|
/* The idea here is to present a source-O-centric view of a
|
|
function to the user. This means that things are presented
|
|
in source order, with (possibly) out of order assembly
|
|
immediately following. */
|
|
|
|
static void
|
|
do_mixed_source_and_assembly (struct gdbarch *gdbarch, struct ui_out *uiout,
|
|
struct disassemble_info *di,
|
|
struct symtab *main_symtab,
|
|
CORE_ADDR low, CORE_ADDR high,
|
|
int how_many, int flags, struct ui_file *stb)
|
|
{
|
|
int newlines = 0;
|
|
const struct linetable_entry *le, *first_le;
|
|
struct symtab_and_line sal;
|
|
int i, nlines;
|
|
int out_of_order = 0;
|
|
int next_line = 0;
|
|
int num_displayed = 0;
|
|
enum print_source_lines_flags psl_flags = 0;
|
|
struct cleanup *cleanups;
|
|
struct cleanup *ui_out_chain;
|
|
struct cleanup *ui_out_tuple_chain;
|
|
struct cleanup *ui_out_list_chain;
|
|
CORE_ADDR pc;
|
|
struct symtab *last_symtab;
|
|
int last_line;
|
|
htab_t dis_line_table;
|
|
|
|
gdb_assert (main_symtab != NULL && SYMTAB_LINETABLE (main_symtab) != NULL);
|
|
|
|
/* First pass: collect the list of all source files and lines.
|
|
We do this so that we can only print lines containing code once.
|
|
We try to print the source text leading up to the next instruction,
|
|
but if that text is for code that will be disassembled later, then
|
|
we'll want to defer printing it until later with its associated code. */
|
|
|
|
dis_line_table = allocate_dis_line_table ();
|
|
cleanups = make_cleanup_htab_delete (dis_line_table);
|
|
|
|
pc = low;
|
|
|
|
/* The prologue may be empty, but there may still be a line number entry
|
|
for the opening brace which is distinct from the first line of code.
|
|
If the prologue has been eliminated find_pc_line may return the source
|
|
line after the opening brace. We still want to print this opening brace.
|
|
first_le is used to implement this. */
|
|
|
|
nlines = SYMTAB_LINETABLE (main_symtab)->nitems;
|
|
le = SYMTAB_LINETABLE (main_symtab)->item;
|
|
first_le = NULL;
|
|
|
|
/* Skip all the preceding functions. */
|
|
for (i = 0; i < nlines && le[i].pc < low; i++)
|
|
continue;
|
|
|
|
if (i < nlines && le[i].pc < high)
|
|
first_le = &le[i];
|
|
|
|
/* Add lines for every pc value. */
|
|
while (pc < high)
|
|
{
|
|
struct symtab_and_line sal;
|
|
int length;
|
|
|
|
sal = find_pc_line (pc, 0);
|
|
length = gdb_insn_length (gdbarch, pc);
|
|
pc += length;
|
|
|
|
if (sal.symtab != NULL)
|
|
maybe_add_dis_line_entry (dis_line_table, sal.symtab, sal.line);
|
|
}
|
|
|
|
/* Second pass: print the disassembly.
|
|
|
|
Output format, from an MI perspective:
|
|
The result is a ui_out list, field name "asm_insns", where elements have
|
|
name "src_and_asm_line".
|
|
Each element is a tuple of source line specs (field names line, file,
|
|
fullname), and field "line_asm_insn" which contains the disassembly.
|
|
Field "line_asm_insn" is a list of tuples: address, func-name, offset,
|
|
opcodes, inst.
|
|
|
|
CLI output works on top of this because MI ignores ui_out_text output,
|
|
which is where we put file name and source line contents output.
|
|
|
|
Cleanup usage:
|
|
cleanups:
|
|
For things created at the beginning of this function and need to be
|
|
kept until the end of this function.
|
|
ui_out_chain
|
|
Handles the outer "asm_insns" list.
|
|
ui_out_tuple_chain
|
|
The tuples for each group of consecutive disassemblies.
|
|
ui_out_list_chain
|
|
List of consecutive source lines or disassembled insns. */
|
|
|
|
if (flags & DISASSEMBLY_FILENAME)
|
|
psl_flags |= PRINT_SOURCE_LINES_FILENAME;
|
|
|
|
ui_out_chain = make_cleanup_ui_out_list_begin_end (uiout, "asm_insns");
|
|
|
|
ui_out_tuple_chain = NULL;
|
|
ui_out_list_chain = NULL;
|
|
|
|
last_symtab = NULL;
|
|
last_line = 0;
|
|
pc = low;
|
|
|
|
while (pc < high)
|
|
{
|
|
struct linetable_entry *le = NULL;
|
|
struct symtab_and_line sal;
|
|
CORE_ADDR end_pc;
|
|
int start_preceding_line_to_display = 0;
|
|
int end_preceding_line_to_display = 0;
|
|
int new_source_line = 0;
|
|
|
|
sal = find_pc_line (pc, 0);
|
|
|
|
if (sal.symtab != last_symtab)
|
|
{
|
|
/* New source file. */
|
|
new_source_line = 1;
|
|
|
|
/* If this is the first line of output, check for any preceding
|
|
lines. */
|
|
if (last_line == 0
|
|
&& first_le != NULL
|
|
&& first_le->line < sal.line)
|
|
{
|
|
start_preceding_line_to_display = first_le->line;
|
|
end_preceding_line_to_display = sal.line;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* Same source file as last time. */
|
|
if (sal.symtab != NULL)
|
|
{
|
|
if (sal.line > last_line + 1 && last_line != 0)
|
|
{
|
|
int l;
|
|
|
|
/* Several preceding source lines. Print the trailing ones
|
|
not associated with code that we'll print later. */
|
|
for (l = sal.line - 1; l > last_line; --l)
|
|
{
|
|
if (line_has_code_p (dis_line_table, sal.symtab, l))
|
|
break;
|
|
}
|
|
if (l < sal.line - 1)
|
|
{
|
|
start_preceding_line_to_display = l + 1;
|
|
end_preceding_line_to_display = sal.line;
|
|
}
|
|
}
|
|
if (sal.line != last_line)
|
|
new_source_line = 1;
|
|
else
|
|
{
|
|
/* Same source line as last time. This can happen, depending
|
|
on the debug info. */
|
|
}
|
|
}
|
|
}
|
|
|
|
if (new_source_line)
|
|
{
|
|
/* Skip the newline if this is the first instruction. */
|
|
if (pc > low)
|
|
ui_out_text (uiout, "\n");
|
|
if (ui_out_tuple_chain != NULL)
|
|
{
|
|
gdb_assert (ui_out_list_chain != NULL);
|
|
do_cleanups (ui_out_list_chain);
|
|
do_cleanups (ui_out_tuple_chain);
|
|
}
|
|
if (sal.symtab != last_symtab
|
|
&& !(flags & DISASSEMBLY_FILENAME))
|
|
{
|
|
/* Remember MI ignores ui_out_text.
|
|
We don't have to do anything here for MI because MI
|
|
output includes the source specs for each line. */
|
|
if (sal.symtab != NULL)
|
|
{
|
|
ui_out_text (uiout,
|
|
symtab_to_filename_for_display (sal.symtab));
|
|
}
|
|
else
|
|
ui_out_text (uiout, "unknown");
|
|
ui_out_text (uiout, ":\n");
|
|
}
|
|
if (start_preceding_line_to_display > 0)
|
|
{
|
|
/* Several source lines w/o asm instructions associated.
|
|
We need to preserve the structure of the output, so output
|
|
a bunch of line tuples with no asm entries. */
|
|
int l;
|
|
struct cleanup *ui_out_list_chain_line;
|
|
struct cleanup *ui_out_tuple_chain_line;
|
|
|
|
gdb_assert (sal.symtab != NULL);
|
|
for (l = start_preceding_line_to_display;
|
|
l < end_preceding_line_to_display;
|
|
++l)
|
|
{
|
|
ui_out_tuple_chain_line
|
|
= make_cleanup_ui_out_tuple_begin_end (uiout,
|
|
"src_and_asm_line");
|
|
print_source_lines (sal.symtab, l, l + 1, psl_flags);
|
|
ui_out_list_chain_line
|
|
= make_cleanup_ui_out_list_begin_end (uiout,
|
|
"line_asm_insn");
|
|
do_cleanups (ui_out_list_chain_line);
|
|
do_cleanups (ui_out_tuple_chain_line);
|
|
}
|
|
}
|
|
ui_out_tuple_chain
|
|
= make_cleanup_ui_out_tuple_begin_end (uiout, "src_and_asm_line");
|
|
if (sal.symtab != NULL)
|
|
print_source_lines (sal.symtab, sal.line, sal.line + 1, psl_flags);
|
|
else
|
|
ui_out_text (uiout, _("--- no source info for this pc ---\n"));
|
|
ui_out_list_chain
|
|
= make_cleanup_ui_out_list_begin_end (uiout, "line_asm_insn");
|
|
}
|
|
else
|
|
{
|
|
/* Here we're appending instructions to an existing line.
|
|
By construction the very first insn will have a symtab
|
|
and follow the new_source_line path above. */
|
|
gdb_assert (ui_out_tuple_chain != NULL);
|
|
gdb_assert (ui_out_list_chain != NULL);
|
|
}
|
|
|
|
if (sal.end != 0)
|
|
end_pc = min (sal.end, high);
|
|
else
|
|
end_pc = pc + 1;
|
|
num_displayed += dump_insns (gdbarch, uiout, di, pc, end_pc,
|
|
how_many, flags, stb, &end_pc);
|
|
pc = end_pc;
|
|
|
|
if (how_many >= 0 && num_displayed >= how_many)
|
|
break;
|
|
|
|
last_symtab = sal.symtab;
|
|
last_line = sal.line;
|
|
}
|
|
|
|
do_cleanups (ui_out_chain);
|
|
do_cleanups (cleanups);
|
|
}
|
|
|
|
static void
|
|
do_assembly_only (struct gdbarch *gdbarch, struct ui_out *uiout,
|
|
struct disassemble_info * di,
|
|
CORE_ADDR low, CORE_ADDR high,
|
|
int how_many, int flags, struct ui_file *stb)
|
|
{
|
|
int num_displayed = 0;
|
|
struct cleanup *ui_out_chain;
|
|
|
|
ui_out_chain = make_cleanup_ui_out_list_begin_end (uiout, "asm_insns");
|
|
|
|
num_displayed = dump_insns (gdbarch, uiout, di, low, high, how_many,
|
|
flags, stb, NULL);
|
|
|
|
do_cleanups (ui_out_chain);
|
|
}
|
|
|
|
/* Initialize the disassemble info struct ready for the specified
|
|
stream. */
|
|
|
|
static int ATTRIBUTE_PRINTF (2, 3)
|
|
fprintf_disasm (void *stream, const char *format, ...)
|
|
{
|
|
va_list args;
|
|
|
|
va_start (args, format);
|
|
vfprintf_filtered ((struct ui_file *) stream, format, args);
|
|
va_end (args);
|
|
/* Something non -ve. */
|
|
return 0;
|
|
}
|
|
|
|
struct disassemble_info
|
|
gdb_disassemble_info (struct gdbarch *gdbarch, struct ui_file *file)
|
|
{
|
|
struct disassemble_info di;
|
|
|
|
init_disassemble_info (&di, file, fprintf_disasm);
|
|
di.flavour = bfd_target_unknown_flavour;
|
|
di.memory_error_func = dis_asm_memory_error;
|
|
di.print_address_func = dis_asm_print_address;
|
|
/* NOTE: cagney/2003-04-28: The original code, from the old Insight
|
|
disassembler had a local optomization here. By default it would
|
|
access the executable file, instead of the target memory (there
|
|
was a growing list of exceptions though). Unfortunately, the
|
|
heuristic was flawed. Commands like "disassemble &variable"
|
|
didn't work as they relied on the access going to the target.
|
|
Further, it has been supperseeded by trust-read-only-sections
|
|
(although that should be superseeded by target_trust..._p()). */
|
|
di.read_memory_func = dis_asm_read_memory;
|
|
di.arch = gdbarch_bfd_arch_info (gdbarch)->arch;
|
|
di.mach = gdbarch_bfd_arch_info (gdbarch)->mach;
|
|
di.endian = gdbarch_byte_order (gdbarch);
|
|
di.endian_code = gdbarch_byte_order_for_code (gdbarch);
|
|
di.application_data = gdbarch;
|
|
disassemble_init_for_target (&di);
|
|
return di;
|
|
}
|
|
|
|
void
|
|
gdb_disassembly (struct gdbarch *gdbarch, struct ui_out *uiout,
|
|
char *file_string, int flags, int how_many,
|
|
CORE_ADDR low, CORE_ADDR high)
|
|
{
|
|
struct ui_file *stb = mem_fileopen ();
|
|
struct cleanup *cleanups = make_cleanup_ui_file_delete (stb);
|
|
struct disassemble_info di = gdb_disassemble_info (gdbarch, stb);
|
|
struct symtab *symtab;
|
|
struct linetable_entry *le = NULL;
|
|
int nlines = -1;
|
|
|
|
/* Assume symtab is valid for whole PC range. */
|
|
symtab = find_pc_line_symtab (low);
|
|
|
|
if (symtab != NULL && SYMTAB_LINETABLE (symtab) != NULL)
|
|
nlines = SYMTAB_LINETABLE (symtab)->nitems;
|
|
|
|
if (!(flags & (DISASSEMBLY_SOURCE_DEPRECATED | DISASSEMBLY_SOURCE))
|
|
|| nlines <= 0)
|
|
do_assembly_only (gdbarch, uiout, &di, low, high, how_many, flags, stb);
|
|
|
|
else if (flags & DISASSEMBLY_SOURCE)
|
|
do_mixed_source_and_assembly (gdbarch, uiout, &di, symtab, low, high,
|
|
how_many, flags, stb);
|
|
|
|
else if (flags & DISASSEMBLY_SOURCE_DEPRECATED)
|
|
do_mixed_source_and_assembly_deprecated (gdbarch, uiout, &di, symtab,
|
|
low, high, how_many, flags, stb);
|
|
|
|
do_cleanups (cleanups);
|
|
gdb_flush (gdb_stdout);
|
|
}
|
|
|
|
/* Print the instruction at address MEMADDR in debugged memory,
|
|
on STREAM. Returns the length of the instruction, in bytes,
|
|
and, if requested, the number of branch delay slot instructions. */
|
|
|
|
int
|
|
gdb_print_insn (struct gdbarch *gdbarch, CORE_ADDR memaddr,
|
|
struct ui_file *stream, int *branch_delay_insns)
|
|
{
|
|
struct disassemble_info di;
|
|
int length;
|
|
|
|
di = gdb_disassemble_info (gdbarch, stream);
|
|
length = gdbarch_print_insn (gdbarch, memaddr, &di);
|
|
if (branch_delay_insns)
|
|
{
|
|
if (di.insn_info_valid)
|
|
*branch_delay_insns = di.branch_delay_insns;
|
|
else
|
|
*branch_delay_insns = 0;
|
|
}
|
|
return length;
|
|
}
|
|
|
|
static void
|
|
do_ui_file_delete (void *arg)
|
|
{
|
|
ui_file_delete ((struct ui_file *) arg);
|
|
}
|
|
|
|
/* Return the length in bytes of the instruction at address MEMADDR in
|
|
debugged memory. */
|
|
|
|
int
|
|
gdb_insn_length (struct gdbarch *gdbarch, CORE_ADDR addr)
|
|
{
|
|
static struct ui_file *null_stream = NULL;
|
|
|
|
/* Dummy file descriptor for the disassembler. */
|
|
if (!null_stream)
|
|
{
|
|
null_stream = ui_file_new ();
|
|
make_final_cleanup (do_ui_file_delete, null_stream);
|
|
}
|
|
|
|
return gdb_print_insn (gdbarch, addr, null_stream, NULL);
|
|
}
|
|
|
|
/* fprintf-function for gdb_buffered_insn_length. This function is a
|
|
nop, we don't want to print anything, we just want to compute the
|
|
length of the insn. */
|
|
|
|
static int ATTRIBUTE_PRINTF (2, 3)
|
|
gdb_buffered_insn_length_fprintf (void *stream, const char *format, ...)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
/* Initialize a struct disassemble_info for gdb_buffered_insn_length. */
|
|
|
|
static void
|
|
gdb_buffered_insn_length_init_dis (struct gdbarch *gdbarch,
|
|
struct disassemble_info *di,
|
|
const gdb_byte *insn, int max_len,
|
|
CORE_ADDR addr)
|
|
{
|
|
init_disassemble_info (di, NULL, gdb_buffered_insn_length_fprintf);
|
|
|
|
/* init_disassemble_info installs buffer_read_memory, etc.
|
|
so we don't need to do that here.
|
|
The cast is necessary until disassemble_info is const-ified. */
|
|
di->buffer = (gdb_byte *) insn;
|
|
di->buffer_length = max_len;
|
|
di->buffer_vma = addr;
|
|
|
|
di->arch = gdbarch_bfd_arch_info (gdbarch)->arch;
|
|
di->mach = gdbarch_bfd_arch_info (gdbarch)->mach;
|
|
di->endian = gdbarch_byte_order (gdbarch);
|
|
di->endian_code = gdbarch_byte_order_for_code (gdbarch);
|
|
|
|
disassemble_init_for_target (di);
|
|
}
|
|
|
|
/* Return the length in bytes of INSN. MAX_LEN is the size of the
|
|
buffer containing INSN. */
|
|
|
|
int
|
|
gdb_buffered_insn_length (struct gdbarch *gdbarch,
|
|
const gdb_byte *insn, int max_len, CORE_ADDR addr)
|
|
{
|
|
struct disassemble_info di;
|
|
|
|
gdb_buffered_insn_length_init_dis (gdbarch, &di, insn, max_len, addr);
|
|
|
|
return gdbarch_print_insn (gdbarch, addr, &di);
|
|
}
|