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.
1046 lines
23 KiB
C
1046 lines
23 KiB
C
/* Multi-process control for GDB, the GNU debugger.
|
||
|
||
Copyright (C) 2008-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 "exec.h"
|
||
#include "inferior.h"
|
||
#include "target.h"
|
||
#include "command.h"
|
||
#include "completer.h"
|
||
#include "gdbcmd.h"
|
||
#include "gdbthread.h"
|
||
#include "ui-out.h"
|
||
#include "observer.h"
|
||
#include "gdbcore.h"
|
||
#include "symfile.h"
|
||
#include "environ.h"
|
||
#include "cli/cli-utils.h"
|
||
#include "continuations.h"
|
||
#include "arch-utils.h"
|
||
#include "target-descriptions.h"
|
||
#include "readline/tilde.h"
|
||
|
||
void _initialize_inferiors (void);
|
||
|
||
/* Keep a registry of per-inferior data-pointers required by other GDB
|
||
modules. */
|
||
|
||
DEFINE_REGISTRY (inferior, REGISTRY_ACCESS_FIELD)
|
||
|
||
struct inferior *inferior_list = NULL;
|
||
static int highest_inferior_num;
|
||
|
||
/* Print notices on inferior events (attach, detach, etc.), set with
|
||
`set print inferior-events'. */
|
||
static int print_inferior_events = 0;
|
||
|
||
/* The Current Inferior. */
|
||
static struct inferior *current_inferior_ = NULL;
|
||
|
||
struct inferior*
|
||
current_inferior (void)
|
||
{
|
||
return current_inferior_;
|
||
}
|
||
|
||
void
|
||
set_current_inferior (struct inferior *inf)
|
||
{
|
||
/* There's always an inferior. */
|
||
gdb_assert (inf != NULL);
|
||
|
||
current_inferior_ = inf;
|
||
}
|
||
|
||
/* A cleanups callback, helper for save_current_program_space
|
||
below. */
|
||
|
||
static void
|
||
restore_inferior (void *arg)
|
||
{
|
||
struct inferior *saved_inferior = (struct inferior *) arg;
|
||
|
||
set_current_inferior (saved_inferior);
|
||
}
|
||
|
||
/* Save the current program space so that it may be restored by a later
|
||
call to do_cleanups. Returns the struct cleanup pointer needed for
|
||
later doing the cleanup. */
|
||
|
||
struct cleanup *
|
||
save_current_inferior (void)
|
||
{
|
||
struct cleanup *old_chain = make_cleanup (restore_inferior,
|
||
current_inferior_);
|
||
|
||
return old_chain;
|
||
}
|
||
|
||
static void
|
||
free_inferior (struct inferior *inf)
|
||
{
|
||
discard_all_inferior_continuations (inf);
|
||
inferior_free_data (inf);
|
||
xfree (inf->args);
|
||
xfree (inf->terminal);
|
||
free_environ (inf->environment);
|
||
target_desc_info_free (inf->tdesc_info);
|
||
xfree (inf->priv);
|
||
xfree (inf);
|
||
}
|
||
|
||
void
|
||
init_inferior_list (void)
|
||
{
|
||
struct inferior *inf, *infnext;
|
||
|
||
highest_inferior_num = 0;
|
||
if (!inferior_list)
|
||
return;
|
||
|
||
for (inf = inferior_list; inf; inf = infnext)
|
||
{
|
||
infnext = inf->next;
|
||
free_inferior (inf);
|
||
}
|
||
|
||
inferior_list = NULL;
|
||
}
|
||
|
||
struct inferior *
|
||
add_inferior_silent (int pid)
|
||
{
|
||
struct inferior *inf;
|
||
|
||
inf = XNEW (struct inferior);
|
||
memset (inf, 0, sizeof (*inf));
|
||
inf->pid = pid;
|
||
|
||
inf->control.stop_soon = NO_STOP_QUIETLY;
|
||
|
||
inf->num = ++highest_inferior_num;
|
||
inf->next = inferior_list;
|
||
inferior_list = inf;
|
||
|
||
inf->environment = make_environ ();
|
||
init_environ (inf->environment);
|
||
|
||
inferior_alloc_data (inf);
|
||
|
||
observer_notify_inferior_added (inf);
|
||
|
||
if (pid != 0)
|
||
inferior_appeared (inf, pid);
|
||
|
||
return inf;
|
||
}
|
||
|
||
struct inferior *
|
||
add_inferior (int pid)
|
||
{
|
||
struct inferior *inf = add_inferior_silent (pid);
|
||
|
||
if (print_inferior_events)
|
||
printf_unfiltered (_("[New inferior %d]\n"), pid);
|
||
|
||
return inf;
|
||
}
|
||
|
||
struct delete_thread_of_inferior_arg
|
||
{
|
||
int pid;
|
||
int silent;
|
||
};
|
||
|
||
static int
|
||
delete_thread_of_inferior (struct thread_info *tp, void *data)
|
||
{
|
||
struct delete_thread_of_inferior_arg *arg
|
||
= (struct delete_thread_of_inferior_arg *) data;
|
||
|
||
if (ptid_get_pid (tp->ptid) == arg->pid)
|
||
{
|
||
if (arg->silent)
|
||
delete_thread_silent (tp->ptid);
|
||
else
|
||
delete_thread (tp->ptid);
|
||
}
|
||
|
||
return 0;
|
||
}
|
||
|
||
void
|
||
delete_inferior (struct inferior *todel)
|
||
{
|
||
struct inferior *inf, *infprev;
|
||
struct delete_thread_of_inferior_arg arg;
|
||
|
||
infprev = NULL;
|
||
|
||
for (inf = inferior_list; inf; infprev = inf, inf = inf->next)
|
||
if (inf == todel)
|
||
break;
|
||
|
||
if (!inf)
|
||
return;
|
||
|
||
arg.pid = inf->pid;
|
||
arg.silent = 1;
|
||
|
||
iterate_over_threads (delete_thread_of_inferior, &arg);
|
||
|
||
if (infprev)
|
||
infprev->next = inf->next;
|
||
else
|
||
inferior_list = inf->next;
|
||
|
||
observer_notify_inferior_removed (inf);
|
||
|
||
/* If this program space is rendered useless, remove it. */
|
||
if (program_space_empty_p (inf->pspace))
|
||
delete_program_space (inf->pspace);
|
||
|
||
free_inferior (inf);
|
||
}
|
||
|
||
/* If SILENT then be quiet -- don't announce a inferior exit, or the
|
||
exit of its threads. */
|
||
|
||
static void
|
||
exit_inferior_1 (struct inferior *inftoex, int silent)
|
||
{
|
||
struct inferior *inf;
|
||
struct delete_thread_of_inferior_arg arg;
|
||
|
||
for (inf = inferior_list; inf; inf = inf->next)
|
||
if (inf == inftoex)
|
||
break;
|
||
|
||
if (!inf)
|
||
return;
|
||
|
||
arg.pid = inf->pid;
|
||
arg.silent = silent;
|
||
|
||
iterate_over_threads (delete_thread_of_inferior, &arg);
|
||
|
||
/* Notify the observers before removing the inferior from the list,
|
||
so that the observers have a chance to look it up. */
|
||
observer_notify_inferior_exit (inf);
|
||
|
||
inf->pid = 0;
|
||
inf->fake_pid_p = 0;
|
||
if (inf->vfork_parent != NULL)
|
||
{
|
||
inf->vfork_parent->vfork_child = NULL;
|
||
inf->vfork_parent = NULL;
|
||
}
|
||
if (inf->vfork_child != NULL)
|
||
{
|
||
inf->vfork_child->vfork_parent = NULL;
|
||
inf->vfork_child = NULL;
|
||
}
|
||
|
||
inf->pending_detach = 0;
|
||
}
|
||
|
||
void
|
||
exit_inferior (int pid)
|
||
{
|
||
struct inferior *inf = find_inferior_pid (pid);
|
||
|
||
exit_inferior_1 (inf, 0);
|
||
|
||
if (print_inferior_events)
|
||
printf_unfiltered (_("[Inferior %d exited]\n"), pid);
|
||
}
|
||
|
||
void
|
||
exit_inferior_silent (int pid)
|
||
{
|
||
struct inferior *inf = find_inferior_pid (pid);
|
||
|
||
exit_inferior_1 (inf, 1);
|
||
}
|
||
|
||
void
|
||
exit_inferior_num_silent (int num)
|
||
{
|
||
struct inferior *inf = find_inferior_id (num);
|
||
|
||
exit_inferior_1 (inf, 1);
|
||
}
|
||
|
||
void
|
||
detach_inferior (int pid)
|
||
{
|
||
struct inferior *inf = find_inferior_pid (pid);
|
||
|
||
exit_inferior_1 (inf, 0);
|
||
|
||
if (print_inferior_events)
|
||
printf_unfiltered (_("[Inferior %d detached]\n"), pid);
|
||
}
|
||
|
||
void
|
||
inferior_appeared (struct inferior *inf, int pid)
|
||
{
|
||
inf->pid = pid;
|
||
inf->has_exit_code = 0;
|
||
inf->exit_code = 0;
|
||
|
||
observer_notify_inferior_appeared (inf);
|
||
}
|
||
|
||
void
|
||
discard_all_inferiors (void)
|
||
{
|
||
struct inferior *inf;
|
||
|
||
for (inf = inferior_list; inf; inf = inf->next)
|
||
{
|
||
if (inf->pid != 0)
|
||
exit_inferior_silent (inf->pid);
|
||
}
|
||
}
|
||
|
||
struct inferior *
|
||
find_inferior_id (int num)
|
||
{
|
||
struct inferior *inf;
|
||
|
||
for (inf = inferior_list; inf; inf = inf->next)
|
||
if (inf->num == num)
|
||
return inf;
|
||
|
||
return NULL;
|
||
}
|
||
|
||
struct inferior *
|
||
find_inferior_pid (int pid)
|
||
{
|
||
struct inferior *inf;
|
||
|
||
/* Looking for inferior pid == 0 is always wrong, and indicative of
|
||
a bug somewhere else. There may be more than one with pid == 0,
|
||
for instance. */
|
||
gdb_assert (pid != 0);
|
||
|
||
for (inf = inferior_list; inf; inf = inf->next)
|
||
if (inf->pid == pid)
|
||
return inf;
|
||
|
||
return NULL;
|
||
}
|
||
|
||
/* See inferior.h */
|
||
|
||
struct inferior *
|
||
find_inferior_ptid (ptid_t ptid)
|
||
{
|
||
return find_inferior_pid (ptid_get_pid (ptid));
|
||
}
|
||
|
||
/* See inferior.h. */
|
||
|
||
struct inferior *
|
||
find_inferior_for_program_space (struct program_space *pspace)
|
||
{
|
||
struct inferior *inf = current_inferior ();
|
||
|
||
if (inf->pspace == pspace)
|
||
return inf;
|
||
|
||
for (inf = inferior_list; inf != NULL; inf = inf->next)
|
||
{
|
||
if (inf->pspace == pspace)
|
||
return inf;
|
||
}
|
||
|
||
return NULL;
|
||
}
|
||
|
||
struct inferior *
|
||
iterate_over_inferiors (int (*callback) (struct inferior *, void *),
|
||
void *data)
|
||
{
|
||
struct inferior *inf, *infnext;
|
||
|
||
for (inf = inferior_list; inf; inf = infnext)
|
||
{
|
||
infnext = inf->next;
|
||
if ((*callback) (inf, data))
|
||
return inf;
|
||
}
|
||
|
||
return NULL;
|
||
}
|
||
|
||
int
|
||
valid_gdb_inferior_id (int num)
|
||
{
|
||
struct inferior *inf;
|
||
|
||
for (inf = inferior_list; inf; inf = inf->next)
|
||
if (inf->num == num)
|
||
return 1;
|
||
|
||
return 0;
|
||
}
|
||
|
||
int
|
||
pid_to_gdb_inferior_id (int pid)
|
||
{
|
||
struct inferior *inf;
|
||
|
||
for (inf = inferior_list; inf; inf = inf->next)
|
||
if (inf->pid == pid)
|
||
return inf->num;
|
||
|
||
return 0;
|
||
}
|
||
|
||
int
|
||
gdb_inferior_id_to_pid (int num)
|
||
{
|
||
struct inferior *inferior = find_inferior_id (num);
|
||
if (inferior)
|
||
return inferior->pid;
|
||
else
|
||
return -1;
|
||
}
|
||
|
||
int
|
||
in_inferior_list (int pid)
|
||
{
|
||
struct inferior *inf;
|
||
|
||
for (inf = inferior_list; inf; inf = inf->next)
|
||
if (inf->pid == pid)
|
||
return 1;
|
||
|
||
return 0;
|
||
}
|
||
|
||
int
|
||
have_inferiors (void)
|
||
{
|
||
struct inferior *inf;
|
||
|
||
for (inf = inferior_list; inf; inf = inf->next)
|
||
if (inf->pid != 0)
|
||
return 1;
|
||
|
||
return 0;
|
||
}
|
||
|
||
int
|
||
have_live_inferiors (void)
|
||
{
|
||
struct inferior *inf;
|
||
|
||
for (inf = inferior_list; inf; inf = inf->next)
|
||
if (inf->pid != 0)
|
||
{
|
||
struct thread_info *tp;
|
||
|
||
tp = any_thread_of_process (inf->pid);
|
||
if (tp && target_has_execution_1 (tp->ptid))
|
||
break;
|
||
}
|
||
|
||
return inf != NULL;
|
||
}
|
||
|
||
/* Prune away any unused inferiors, and then prune away no longer used
|
||
program spaces. */
|
||
|
||
void
|
||
prune_inferiors (void)
|
||
{
|
||
struct inferior *ss, **ss_link;
|
||
struct inferior *current = current_inferior ();
|
||
|
||
ss = inferior_list;
|
||
ss_link = &inferior_list;
|
||
while (ss)
|
||
{
|
||
if (ss == current
|
||
|| !ss->removable
|
||
|| ss->pid != 0)
|
||
{
|
||
ss_link = &ss->next;
|
||
ss = *ss_link;
|
||
continue;
|
||
}
|
||
|
||
*ss_link = ss->next;
|
||
delete_inferior (ss);
|
||
ss = *ss_link;
|
||
}
|
||
}
|
||
|
||
/* Simply returns the count of inferiors. */
|
||
|
||
int
|
||
number_of_inferiors (void)
|
||
{
|
||
struct inferior *inf;
|
||
int count = 0;
|
||
|
||
for (inf = inferior_list; inf != NULL; inf = inf->next)
|
||
count++;
|
||
|
||
return count;
|
||
}
|
||
|
||
/* Converts an inferior process id to a string. Like
|
||
target_pid_to_str, but special cases the null process. */
|
||
|
||
static char *
|
||
inferior_pid_to_str (int pid)
|
||
{
|
||
if (pid != 0)
|
||
return target_pid_to_str (pid_to_ptid (pid));
|
||
else
|
||
return _("<null>");
|
||
}
|
||
|
||
/* Prints the list of inferiors and their details on UIOUT. This is a
|
||
version of 'info_inferior_command' suitable for use from MI.
|
||
|
||
If REQUESTED_INFERIORS is not NULL, it's a list of GDB ids of the
|
||
inferiors that should be printed. Otherwise, all inferiors are
|
||
printed. */
|
||
|
||
static void
|
||
print_inferior (struct ui_out *uiout, char *requested_inferiors)
|
||
{
|
||
struct inferior *inf;
|
||
struct cleanup *old_chain;
|
||
int inf_count = 0;
|
||
|
||
/* Compute number of inferiors we will print. */
|
||
for (inf = inferior_list; inf; inf = inf->next)
|
||
{
|
||
if (!number_is_in_list (requested_inferiors, inf->num))
|
||
continue;
|
||
|
||
++inf_count;
|
||
}
|
||
|
||
if (inf_count == 0)
|
||
{
|
||
ui_out_message (uiout, 0, "No inferiors.\n");
|
||
return;
|
||
}
|
||
|
||
old_chain = make_cleanup_ui_out_table_begin_end (uiout, 4, inf_count,
|
||
"inferiors");
|
||
ui_out_table_header (uiout, 1, ui_left, "current", "");
|
||
ui_out_table_header (uiout, 4, ui_left, "number", "Num");
|
||
ui_out_table_header (uiout, 17, ui_left, "target-id", "Description");
|
||
ui_out_table_header (uiout, 17, ui_left, "exec", "Executable");
|
||
|
||
ui_out_table_body (uiout);
|
||
for (inf = inferior_list; inf; inf = inf->next)
|
||
{
|
||
struct cleanup *chain2;
|
||
|
||
if (!number_is_in_list (requested_inferiors, inf->num))
|
||
continue;
|
||
|
||
chain2 = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
|
||
|
||
if (inf == current_inferior ())
|
||
ui_out_field_string (uiout, "current", "*");
|
||
else
|
||
ui_out_field_skip (uiout, "current");
|
||
|
||
ui_out_field_int (uiout, "number", inf->num);
|
||
|
||
ui_out_field_string (uiout, "target-id",
|
||
inferior_pid_to_str (inf->pid));
|
||
|
||
if (inf->pspace->pspace_exec_filename != NULL)
|
||
ui_out_field_string (uiout, "exec", inf->pspace->pspace_exec_filename);
|
||
else
|
||
ui_out_field_skip (uiout, "exec");
|
||
|
||
/* Print extra info that isn't really fit to always present in
|
||
tabular form. Currently we print the vfork parent/child
|
||
relationships, if any. */
|
||
if (inf->vfork_parent)
|
||
{
|
||
ui_out_text (uiout, _("\n\tis vfork child of inferior "));
|
||
ui_out_field_int (uiout, "vfork-parent", inf->vfork_parent->num);
|
||
}
|
||
if (inf->vfork_child)
|
||
{
|
||
ui_out_text (uiout, _("\n\tis vfork parent of inferior "));
|
||
ui_out_field_int (uiout, "vfork-child", inf->vfork_child->num);
|
||
}
|
||
|
||
ui_out_text (uiout, "\n");
|
||
do_cleanups (chain2);
|
||
}
|
||
|
||
do_cleanups (old_chain);
|
||
}
|
||
|
||
static void
|
||
detach_inferior_command (char *args, int from_tty)
|
||
{
|
||
int num, pid;
|
||
struct thread_info *tp;
|
||
struct get_number_or_range_state state;
|
||
|
||
if (!args || !*args)
|
||
error (_("Requires argument (inferior id(s) to detach)"));
|
||
|
||
init_number_or_range (&state, args);
|
||
while (!state.finished)
|
||
{
|
||
num = get_number_or_range (&state);
|
||
|
||
if (!valid_gdb_inferior_id (num))
|
||
{
|
||
warning (_("Inferior ID %d not known."), num);
|
||
continue;
|
||
}
|
||
|
||
pid = gdb_inferior_id_to_pid (num);
|
||
if (pid == 0)
|
||
{
|
||
warning (_("Inferior ID %d is not running."), num);
|
||
continue;
|
||
}
|
||
|
||
tp = any_thread_of_process (pid);
|
||
if (!tp)
|
||
{
|
||
warning (_("Inferior ID %d has no threads."), num);
|
||
continue;
|
||
}
|
||
|
||
switch_to_thread (tp->ptid);
|
||
|
||
detach_command (NULL, from_tty);
|
||
}
|
||
}
|
||
|
||
static void
|
||
kill_inferior_command (char *args, int from_tty)
|
||
{
|
||
int num, pid;
|
||
struct thread_info *tp;
|
||
struct get_number_or_range_state state;
|
||
|
||
if (!args || !*args)
|
||
error (_("Requires argument (inferior id(s) to kill)"));
|
||
|
||
init_number_or_range (&state, args);
|
||
while (!state.finished)
|
||
{
|
||
num = get_number_or_range (&state);
|
||
|
||
if (!valid_gdb_inferior_id (num))
|
||
{
|
||
warning (_("Inferior ID %d not known."), num);
|
||
continue;
|
||
}
|
||
|
||
pid = gdb_inferior_id_to_pid (num);
|
||
if (pid == 0)
|
||
{
|
||
warning (_("Inferior ID %d is not running."), num);
|
||
continue;
|
||
}
|
||
|
||
tp = any_thread_of_process (pid);
|
||
if (!tp)
|
||
{
|
||
warning (_("Inferior ID %d has no threads."), num);
|
||
continue;
|
||
}
|
||
|
||
switch_to_thread (tp->ptid);
|
||
|
||
target_kill ();
|
||
}
|
||
|
||
bfd_cache_close_all ();
|
||
}
|
||
|
||
static void
|
||
inferior_command (char *args, int from_tty)
|
||
{
|
||
struct inferior *inf;
|
||
int num;
|
||
|
||
num = parse_and_eval_long (args);
|
||
|
||
inf = find_inferior_id (num);
|
||
if (inf == NULL)
|
||
error (_("Inferior ID %d not known."), num);
|
||
|
||
printf_filtered (_("[Switching to inferior %d [%s] (%s)]\n"),
|
||
inf->num,
|
||
inferior_pid_to_str (inf->pid),
|
||
(inf->pspace->pspace_exec_filename != NULL
|
||
? inf->pspace->pspace_exec_filename
|
||
: _("<noexec>")));
|
||
|
||
if (inf->pid != 0)
|
||
{
|
||
if (inf->pid != ptid_get_pid (inferior_ptid))
|
||
{
|
||
struct thread_info *tp;
|
||
|
||
tp = any_thread_of_process (inf->pid);
|
||
if (!tp)
|
||
error (_("Inferior has no threads."));
|
||
|
||
switch_to_thread (tp->ptid);
|
||
}
|
||
|
||
printf_filtered (_("[Switching to thread %d (%s)] "),
|
||
pid_to_thread_id (inferior_ptid),
|
||
target_pid_to_str (inferior_ptid));
|
||
}
|
||
else
|
||
{
|
||
struct inferior *inf;
|
||
|
||
inf = find_inferior_id (num);
|
||
set_current_inferior (inf);
|
||
switch_to_thread (null_ptid);
|
||
set_current_program_space (inf->pspace);
|
||
}
|
||
|
||
if (inf->pid != 0 && is_running (inferior_ptid))
|
||
ui_out_text (current_uiout, "(running)\n");
|
||
else if (inf->pid != 0)
|
||
{
|
||
ui_out_text (current_uiout, "\n");
|
||
print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC, 1);
|
||
}
|
||
}
|
||
|
||
/* Print information about currently known inferiors. */
|
||
|
||
static void
|
||
info_inferiors_command (char *args, int from_tty)
|
||
{
|
||
print_inferior (current_uiout, args);
|
||
}
|
||
|
||
/* remove-inferior ID */
|
||
|
||
static void
|
||
remove_inferior_command (char *args, int from_tty)
|
||
{
|
||
int num;
|
||
struct inferior *inf;
|
||
struct get_number_or_range_state state;
|
||
|
||
if (args == NULL || *args == '\0')
|
||
error (_("Requires an argument (inferior id(s) to remove)"));
|
||
|
||
init_number_or_range (&state, args);
|
||
while (!state.finished)
|
||
{
|
||
num = get_number_or_range (&state);
|
||
inf = find_inferior_id (num);
|
||
|
||
if (inf == NULL)
|
||
{
|
||
warning (_("Inferior ID %d not known."), num);
|
||
continue;
|
||
}
|
||
|
||
if (inf == current_inferior ())
|
||
{
|
||
warning (_("Can not remove current symbol inferior %d."), num);
|
||
continue;
|
||
}
|
||
|
||
if (inf->pid != 0)
|
||
{
|
||
warning (_("Can not remove active inferior %d."), num);
|
||
continue;
|
||
}
|
||
|
||
delete_inferior (inf);
|
||
}
|
||
}
|
||
|
||
struct inferior *
|
||
add_inferior_with_spaces (void)
|
||
{
|
||
struct address_space *aspace;
|
||
struct program_space *pspace;
|
||
struct inferior *inf;
|
||
struct gdbarch_info info;
|
||
|
||
/* If all inferiors share an address space on this system, this
|
||
doesn't really return a new address space; otherwise, it
|
||
really does. */
|
||
aspace = maybe_new_address_space ();
|
||
pspace = add_program_space (aspace);
|
||
inf = add_inferior (0);
|
||
inf->pspace = pspace;
|
||
inf->aspace = pspace->aspace;
|
||
|
||
/* Setup the inferior's initial arch, based on information obtained
|
||
from the global "set ..." options. */
|
||
gdbarch_info_init (&info);
|
||
inf->gdbarch = gdbarch_find_by_info (info);
|
||
/* The "set ..." options reject invalid settings, so we should
|
||
always have a valid arch by now. */
|
||
gdb_assert (inf->gdbarch != NULL);
|
||
|
||
return inf;
|
||
}
|
||
|
||
/* add-inferior [-copies N] [-exec FILENAME] */
|
||
|
||
static void
|
||
add_inferior_command (char *args, int from_tty)
|
||
{
|
||
int i, copies = 1;
|
||
char *exec = NULL;
|
||
char **argv;
|
||
struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
|
||
|
||
if (args)
|
||
{
|
||
argv = gdb_buildargv (args);
|
||
make_cleanup_freeargv (argv);
|
||
|
||
for (; *argv != NULL; argv++)
|
||
{
|
||
if (**argv == '-')
|
||
{
|
||
if (strcmp (*argv, "-copies") == 0)
|
||
{
|
||
++argv;
|
||
if (!*argv)
|
||
error (_("No argument to -copies"));
|
||
copies = parse_and_eval_long (*argv);
|
||
}
|
||
else if (strcmp (*argv, "-exec") == 0)
|
||
{
|
||
++argv;
|
||
if (!*argv)
|
||
error (_("No argument to -exec"));
|
||
exec = tilde_expand (*argv);
|
||
make_cleanup (xfree, exec);
|
||
}
|
||
}
|
||
else
|
||
error (_("Invalid argument"));
|
||
}
|
||
}
|
||
|
||
save_current_space_and_thread ();
|
||
|
||
for (i = 0; i < copies; ++i)
|
||
{
|
||
struct inferior *inf = add_inferior_with_spaces ();
|
||
|
||
printf_filtered (_("Added inferior %d\n"), inf->num);
|
||
|
||
if (exec != NULL)
|
||
{
|
||
/* Switch over temporarily, while reading executable and
|
||
symbols.q. */
|
||
set_current_program_space (inf->pspace);
|
||
set_current_inferior (inf);
|
||
switch_to_thread (null_ptid);
|
||
|
||
exec_file_attach (exec, from_tty);
|
||
symbol_file_add_main (exec, from_tty);
|
||
}
|
||
}
|
||
|
||
do_cleanups (old_chain);
|
||
}
|
||
|
||
/* clone-inferior [-copies N] [ID] */
|
||
|
||
static void
|
||
clone_inferior_command (char *args, int from_tty)
|
||
{
|
||
int i, copies = 1;
|
||
char **argv;
|
||
struct inferior *orginf = NULL;
|
||
struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
|
||
|
||
if (args)
|
||
{
|
||
argv = gdb_buildargv (args);
|
||
make_cleanup_freeargv (argv);
|
||
|
||
for (; *argv != NULL; argv++)
|
||
{
|
||
if (**argv == '-')
|
||
{
|
||
if (strcmp (*argv, "-copies") == 0)
|
||
{
|
||
++argv;
|
||
if (!*argv)
|
||
error (_("No argument to -copies"));
|
||
copies = parse_and_eval_long (*argv);
|
||
|
||
if (copies < 0)
|
||
error (_("Invalid copies number"));
|
||
}
|
||
}
|
||
else
|
||
{
|
||
if (orginf == NULL)
|
||
{
|
||
int num;
|
||
|
||
/* The first non-option (-) argument specified the
|
||
program space ID. */
|
||
num = parse_and_eval_long (*argv);
|
||
orginf = find_inferior_id (num);
|
||
|
||
if (orginf == NULL)
|
||
error (_("Inferior ID %d not known."), num);
|
||
continue;
|
||
}
|
||
else
|
||
error (_("Invalid argument"));
|
||
}
|
||
}
|
||
}
|
||
|
||
/* If no inferior id was specified, then the user wants to clone the
|
||
current inferior. */
|
||
if (orginf == NULL)
|
||
orginf = current_inferior ();
|
||
|
||
save_current_space_and_thread ();
|
||
|
||
for (i = 0; i < copies; ++i)
|
||
{
|
||
struct address_space *aspace;
|
||
struct program_space *pspace;
|
||
struct inferior *inf;
|
||
|
||
/* If all inferiors share an address space on this system, this
|
||
doesn't really return a new address space; otherwise, it
|
||
really does. */
|
||
aspace = maybe_new_address_space ();
|
||
pspace = add_program_space (aspace);
|
||
inf = add_inferior (0);
|
||
inf->pspace = pspace;
|
||
inf->aspace = pspace->aspace;
|
||
inf->gdbarch = orginf->gdbarch;
|
||
|
||
/* If the original inferior had a user specified target
|
||
description, make the clone use it too. */
|
||
if (target_desc_info_from_user_p (inf->tdesc_info))
|
||
copy_inferior_target_desc_info (inf, orginf);
|
||
|
||
printf_filtered (_("Added inferior %d.\n"), inf->num);
|
||
|
||
set_current_inferior (inf);
|
||
switch_to_thread (null_ptid);
|
||
clone_program_space (pspace, orginf->pspace);
|
||
}
|
||
|
||
do_cleanups (old_chain);
|
||
}
|
||
|
||
/* Print notices when new inferiors are created and die. */
|
||
static void
|
||
show_print_inferior_events (struct ui_file *file, int from_tty,
|
||
struct cmd_list_element *c, const char *value)
|
||
{
|
||
fprintf_filtered (file, _("Printing of inferior events is %s.\n"), value);
|
||
}
|
||
|
||
|
||
|
||
void
|
||
initialize_inferiors (void)
|
||
{
|
||
struct cmd_list_element *c = NULL;
|
||
|
||
/* There's always one inferior. Note that this function isn't an
|
||
automatic _initialize_foo function, since other _initialize_foo
|
||
routines may need to install their per-inferior data keys. We
|
||
can only allocate an inferior when all those modules have done
|
||
that. Do this after initialize_progspace, due to the
|
||
current_program_space reference. */
|
||
current_inferior_ = add_inferior (0);
|
||
current_inferior_->pspace = current_program_space;
|
||
current_inferior_->aspace = current_program_space->aspace;
|
||
/* The architecture will be initialized shortly, by
|
||
initialize_current_architecture. */
|
||
|
||
add_info ("inferiors", info_inferiors_command,
|
||
_("IDs of specified inferiors (all inferiors if no argument)."));
|
||
|
||
c = add_com ("add-inferior", no_class, add_inferior_command, _("\
|
||
Add a new inferior.\n\
|
||
Usage: add-inferior [-copies <N>] [-exec <FILENAME>]\n\
|
||
N is the optional number of inferiors to add, default is 1.\n\
|
||
FILENAME is the file name of the executable to use\n\
|
||
as main program."));
|
||
set_cmd_completer (c, filename_completer);
|
||
|
||
add_com ("remove-inferiors", no_class, remove_inferior_command, _("\
|
||
Remove inferior ID (or list of IDs).\n\
|
||
Usage: remove-inferiors ID..."));
|
||
|
||
add_com ("clone-inferior", no_class, clone_inferior_command, _("\
|
||
Clone inferior ID.\n\
|
||
Usage: clone-inferior [-copies <N>] [ID]\n\
|
||
Add N copies of inferior ID. The new inferior has the same\n\
|
||
executable loaded as the copied inferior. If -copies is not specified,\n\
|
||
adds 1 copy. If ID is not specified, it is the current inferior\n\
|
||
that is cloned."));
|
||
|
||
add_cmd ("inferiors", class_run, detach_inferior_command, _("\
|
||
Detach from inferior ID (or list of IDS)."),
|
||
&detachlist);
|
||
|
||
add_cmd ("inferiors", class_run, kill_inferior_command, _("\
|
||
Kill inferior ID (or list of IDs)."),
|
||
&killlist);
|
||
|
||
add_cmd ("inferior", class_run, inferior_command, _("\
|
||
Use this command to switch between inferiors.\n\
|
||
The new inferior ID must be currently known."),
|
||
&cmdlist);
|
||
|
||
add_setshow_boolean_cmd ("inferior-events", no_class,
|
||
&print_inferior_events, _("\
|
||
Set printing of inferior events (e.g., inferior start and exit)."), _("\
|
||
Show printing of inferior events (e.g., inferior start and exit)."), NULL,
|
||
NULL,
|
||
show_print_inferior_events,
|
||
&setprintlist, &showprintlist);
|
||
|
||
}
|