mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
f6ac5f3d63
I.e., use C++ virtual methods and inheritance instead of tables of function pointers. Unfortunately, there's no way to do a smooth transition. ALL native targets in the tree must be converted at the same time. I've tested all I could with cross compilers and with help from GCC compile farm, but naturally I haven't been able to test many of the ports. Still, I made a best effort to port everything over, and while I expect some build problems due to typos and such, which should be trivial to fix, I don't expect any design problems. * Implementation notes: - The flattened current_target is gone. References to current_target or current_target.beneath are replaced with references to target_stack (the top of the stack) directly. - To keep "set debug target" working, this adds a new debug_stratum layer that sits on top of the stack, prints the debug, and delegates to the target beneath. In addition, this makes the shortname and longname properties of target_ops be virtual methods instead of data fields, and makes the debug target defer those to the target beneath. This is so that debug code sprinkled around that does "if (debugtarget) ..." can transparently print the name of the target beneath. A patch later in the series actually splits out the shortname/longname methods to a separate structure, but I preferred to keep that chance separate as it is associated with changing a bit the design of how targets are registered and open. - Since you can't check whether a C++ virtual method is overridden, the old method of checking whether a target_ops implements a method by comparing the function pointer must be replaced with something else. Some cases are fixed by adding a parallel "can_do_foo" target_ops methods. E.g.,: + for (t = target_stack; t != NULL; t = t->beneath) { - if (t->to_create_inferior != NULL) + if (t->can_create_inferior ()) break; } Others are fixed by changing void return type to bool or int return type, and have the default implementation return false or -1, to indicate lack of support. - make-target-delegates was adjusted to generate C++ classes and methods. It needed tweaks to grok "virtual" in front of the target method name, and for the fact that methods are no longer function pointers. (In particular, the current code parsing the return type was simple because it could simply parse up until the '(' in '(*to_foo)'. It now generates a couple C++ classes that inherit target_ops: dummy_target and debug_target. Since we need to generate the class declarations as well, i.e., we need to emit methods twice, we now generate the code in two passes. - The core_target global is renamed to avoid conflict with the "core_target" class. - ctf/tfile targets init_tracefile_ops is replaced by a base class that is inherited by both ctf and tfile. - bsd-uthread The bsd_uthread_ops_hack hack is gone. It's not needed because nothing was extending a target created by bsd_uthread_target. - remote/extended-remote targets This is a first pass, just enough to C++ify target_ops. A later pass will convert more free functions to methods, and make remote_state be truly per remote instance, allowing multiple simultaneous instances of remote targets. - inf-child/"native" is converted to an actual base class (inf_child_target), that is inherited by all native targets. - GNU/Linux The old weird double-target linux_ops mechanism in linux-nat.c, is gone, replaced by adding a few virtual methods to linux-nat.h's target_ops, called low_XXX, that the concrete linux-nat implementations override. Sort of like gdbserver's linux_target_ops, but simpler, for requiring only one target_ops-like hierarchy, which spares implementing the same method twice when we need to forward the method to a low implementation. The low target simply reimplements the target_ops method directly in that case. There are a few remaining linux-nat.c hooks that would be better converted to low_ methods like above too. E.g.: linux_nat_set_new_thread (t, x86_linux_new_thread); linux_nat_set_new_fork (t, x86_linux_new_fork); linux_nat_set_forget_process That'll be done in a follow up patch. - We can no longer use functions like x86_use_watchpoints to install custom methods on an arbitrary base target. The patch replaces instances of such a pattern with template mixins. For example memory_breakpoint_target defined in target.h, or x86_nat_target in x86-nat.h. - linux_trad_target, MIPS and Alpha GNU/Linux The code in the new linux-nat-trad.h/c files which was split off of inf-ptrace.h/c recently, is converted to a C++ base class, and used by the MIPS and Alpha GNU/Linux ports. - BSD targets The $architecture x NetBSD/OpenBSD/FreeBSD support matrix complicates things a bit. There's common BSD target code, and there's common architecture-specific code shared between the different BSDs. Currently, all that is stiched together to form a final target, via the i386bsd_target, x86bsd_target, fbsd_nat_add_target functions etc. This introduces new fbsd_nat_target, obsd_nat_target and nbsd_nat_target classes that serve as base/prototype target for the corresponding BSD variant. And introduces generic i386/AMD64 BSD targets, to be used as template mixin to build a final target. Similarly, a generic SPARC target is added, used by both BSD and Linux ports. - bsd_kvm_add_target, BSD libkvm target I considered making bsd_kvm_supply_pcb a virtual method, and then have each port inherit bsd_kvm_target and override that method, but that was resulting in lots of unjustified churn, so I left the function pointer mechanism alone. gdb/ChangeLog: 2018-05-02 Pedro Alves <palves@redhat.com> John Baldwin <jhb@freebsd.org> * target.h (enum strata) <debug_stratum>: New. (struct target_ops) <all delegation methods>: Replace by C++ virtual methods, and drop "to_" prefix. All references updated throughout. <to_shortname, to_longname, to_doc, to_data, to_have_steppable_watchpoint, to_have_continuable_watchpoint, to_has_thread_control, to_attach_no_wait>: Delete, replaced by virtual methods. All references updated throughout. <can_attach, supports_terminal_ours, can_create_inferior, get_thread_control_capabilities, attach_no_wait>: New virtual methods. <insert_breakpoint, remove_breakpoint>: Now TARGET_DEFAULT_NORETURN methods. <info_proc>: Now returns bool. <to_magic>: Delete. (OPS_MAGIC): Delete. (current_target): Delete. All references replaced by references to ... (target_stack): ... this. New. (target_shortname, target_longname): Adjust. (target_can_run): Now a function declaration. (default_child_has_all_memory, default_child_has_memory) (default_child_has_stack, default_child_has_registers) (default_child_has_execution): Remove target_ops parameter. (complete_target_initialization): Delete. (memory_breakpoint_target): New template class. (test_target_ops): Refactor as a C++ class with virtual methods. * make-target-delegates (NAME_PART): Tighten. (POINTER_PART, CP_SYMBOL): New. (SIMPLE_RETURN_PART): Reimplement. (VEC_RETURN_PART): Expect less. (RETURN_PART, VIRTUAL_PART): New. (METHOD): Adjust to C++ virtual methods. (scan_target_h): Remove reference to C99. (dname): Output "target_ops::" prefix. (write_function_header): Adjust to output a C++ class method. (write_declaration): New. (write_delegator): Adjust to output a C++ class method. (tdname): Output "dummy_target::" prefix. (write_tdefault, write_debugmethod): Adjust to output a C++ class method. (tdefault_names, debug_names): Delete. (return_types, tdefaults, styles, argtypes_array): New. (top level): All methods are delegators. (print_class): New. (top level): Print dummy_target and debug_target classes. * target-delegates.c: Regenerate. * target-debug.h (target_debug_print_enum_info_proc_what) (target_debug_print_thread_control_capabilities) (target_debug_print_thread_info_p): New. * target.c (dummy_target): Delete. (the_dummy_target, the_debug_target): New. (target_stack): Now extern. (set_targetdebug): Push/unpush debug target. (default_child_has_all_memory, default_child_has_memory) (default_child_has_stack, default_child_has_registers) (default_child_has_execution): Remove target_ops parameter. (complete_target_initialization): Delete. (add_target_with_completer): No longer call complete_target_initialization. (target_supports_terminal_ours): Use regular delegation. (update_current_target): Delete. (push_target): No longer check magic number. Don't call update_current_target. (unpush_target): Don't call update_current_target. (target_is_pushed): No longer check magic number. (target_require_runnable): Skip for all stratums over process_stratum. (target_ops::info_proc): New. (target_info_proc): Use find_target_at and find_default_run_target. (target_supports_disable_randomization): Use regular delegation. (target_get_osdata): Use find_target_at. (target_ops::open, target_ops::close, target_ops::can_attach) (target_ops::attach, target_ops::can_create_inferior) (target_ops::create_inferior, target_ops::can_run) (target_can_run): New. (default_fileio_target): Use regular delegation. (target_ops::fileio_open, target_ops::fileio_pwrite) (target_ops::fileio_pread, target_ops::fileio_fstat) (target_ops::fileio_close, target_ops::fileio_unlink) (target_ops::fileio_readlink): New. (target_fileio_open_1, target_fileio_unlink) (target_fileio_readlink): Always call the target method. Handle FILEIO_ENOSYS. (return_zero, return_zero_has_execution): Delete. (init_dummy_target): Delete. (dummy_target::dummy_target, dummy_target::shortname) (dummy_target::longname, dummy_target::doc) (debug_target::debug_target, debug_target::shortname) (debug_target::longname, debug_target::doc): New. (target_supports_delete_record): Use regular delegation. (setup_target_debug): Delete. (maintenance_print_target_stack): Skip debug_stratum. (initialize_targets): Instantiate the_dummy_target and the_debug_target. * auxv.c (target_auxv_parse): Remove 'ops' parameter. Adjust to use target_stack. (target_auxv_search, fprint_target_auxv): Adjust. (info_auxv_command): Adjust to use target_stack. * auxv.h (target_auxv_parse): Remove 'ops' parameter. * exceptions.c (print_flush): Handle a NULL target_stack. * regcache.c (target_ops_no_register): Refactor as class with virtual methods. * exec.c (exec_target): New class. (exec_ops): Now an exec_target. (exec_open, exec_close_1, exec_get_section_table) (exec_xfer_partial, exec_files_info, exec_has_memory) (exec_make_note_section): Refactor as exec_target methods. (exec_file_clear, ignore, exec_remove_breakpoint, init_exec_ops): Delete. (exec_target::find_memory_regions): New. (_initialize_exec): Don't call init_exec_ops. * gdbcore.h (exec_file_clear): Delete. * corefile.c (core_target): Delete. (core_file_command): Adjust. * corelow.c (core_target): New class. (the_core_target): New. (core_close): Remove target_ops parameter. (core_close_cleanup): Adjust. (core_target::close): New. (core_open, core_detach, get_core_registers, core_files_info) (core_xfer_partial, core_thread_alive, core_read_description) (core_pid_to_str, core_thread_name, core_has_memory) (core_has_stack, core_has_registers, core_info_proc): Rework as core_target methods. (ignore, core_remove_breakpoint, init_core_ops): Delete. (_initialize_corelow): Initialize the_core_target. * gdbcore.h (core_target): Delete. (the_core_target): New. * ctf.c: (ctf_target): New class. (ctf_ops): Now a ctf_target. (ctf_open, ctf_close, ctf_files_info, ctf_fetch_registers) (ctf_xfer_partial, ctf_get_trace_state_variable_value) (ctf_trace_find, ctf_traceframe_info): Refactor as ctf_target methods. (init_ctf_ops): Delete. (_initialize_ctf): Don't call it. * tracefile-tfile.c (tfile_target): New class. (tfile_ops): Now a tfile_target. (tfile_open, tfile_close, tfile_files_info) (tfile_get_tracepoint_status, tfile_trace_find) (tfile_fetch_registers, tfile_xfer_partial) (tfile_get_trace_state_variable_value, tfile_traceframe_info): Refactor as tfile_target methods. (tfile_xfer_partial_features): Remove target_ops parameter. (init_tfile_ops): Delete. (_initialize_tracefile_tfile): Don't call it. * tracefile.c (tracefile_has_all_memory, tracefile_has_memory) (tracefile_has_stack, tracefile_has_registers) (tracefile_thread_alive, tracefile_get_trace_status): Refactor as tracefile_target methods. (init_tracefile_ops): Delete. (tracefile_target::tracefile_target): New. * tracefile.h: Include "target.h". (tracefile_target): New class. (init_tracefile_ops): Delete. * spu-multiarch.c (spu_multiarch_target): New class. (spu_ops): Now a spu_multiarch_target. (spu_thread_architecture, spu_region_ok_for_hw_watchpoint) (spu_fetch_registers, spu_store_registers, spu_xfer_partial) (spu_search_memory, spu_mourn_inferior): Refactor as spu_multiarch_target methods. (init_spu_ops): Delete. (_initialize_spu_multiarch): Remove references to init_spu_ops, complete_target_initialization. * ravenscar-thread.c (ravenscar_thread_target): New class. (ravenscar_ops): Now a ravenscar_thread_target. (ravenscar_resume, ravenscar_wait, ravenscar_update_thread_list) (ravenscar_thread_alive, ravenscar_pid_to_str) (ravenscar_fetch_registers, ravenscar_store_registers) (ravenscar_prepare_to_store, ravenscar_stopped_by_sw_breakpoint) (ravenscar_stopped_by_hw_breakpoint) (ravenscar_stopped_by_watchpoint, ravenscar_stopped_data_address) (ravenscar_mourn_inferior, ravenscar_core_of_thread) (ravenscar_get_ada_task_ptid): Refactor as ravenscar_thread_target methods. (init_ravenscar_thread_ops): Delete. (_initialize_ravenscar): Remove references to init_ravenscar_thread_ops and complete_target_initialization. * bsd-uthread.c (bsd_uthread_ops_hack): Delete. (bsd_uthread_target): New class. (bsd_uthread_ops): Now a bsd_uthread_target. (bsd_uthread_activate): Adjust to refer to bsd_uthread_ops. (bsd_uthread_close, bsd_uthread_mourn_inferior) (bsd_uthread_fetch_registers, bsd_uthread_store_registers) (bsd_uthread_wait, bsd_uthread_resume, bsd_uthread_thread_alive) (bsd_uthread_update_thread_list, bsd_uthread_extra_thread_info) (bsd_uthread_pid_to_str): Refactor as bsd_uthread_target methods. (bsd_uthread_target): Delete function. (_initialize_bsd_uthread): Remove reference to complete_target_initialization. * bfd-target.c (target_bfd_data): Delete. Fields folded into ... (target_bfd): ... this new class. (target_bfd_xfer_partial, target_bfd_get_section_table) (target_bfd_close): Refactor as target_bfd methods. (target_bfd::~target_bfd): New. (target_bfd_reopen): Adjust. (target_bfd::close): New. * record-btrace.c (record_btrace_target): New class. (record_btrace_ops): Now a record_btrace_target. (record_btrace_open, record_btrace_stop_recording) (record_btrace_disconnect, record_btrace_close) (record_btrace_async, record_btrace_info) (record_btrace_insn_history, record_btrace_insn_history_range) (record_btrace_insn_history_from, record_btrace_call_history) (record_btrace_call_history_range) (record_btrace_call_history_from, record_btrace_record_method) (record_btrace_is_replaying, record_btrace_will_replay) (record_btrace_xfer_partial, record_btrace_insert_breakpoint) (record_btrace_remove_breakpoint, record_btrace_fetch_registers) (record_btrace_store_registers, record_btrace_prepare_to_store) (record_btrace_to_get_unwinder) (record_btrace_to_get_tailcall_unwinder, record_btrace_resume) (record_btrace_commit_resume, record_btrace_wait) (record_btrace_stop, record_btrace_can_execute_reverse) (record_btrace_stopped_by_sw_breakpoint) (record_btrace_supports_stopped_by_sw_breakpoint) (record_btrace_stopped_by_hw_breakpoint) (record_btrace_supports_stopped_by_hw_breakpoint) (record_btrace_update_thread_list, record_btrace_thread_alive) (record_btrace_goto_begin, record_btrace_goto_end) (record_btrace_goto, record_btrace_stop_replaying_all) (record_btrace_execution_direction) (record_btrace_prepare_to_generate_core) (record_btrace_done_generating_core): Refactor as record_btrace_target methods. (init_record_btrace_ops): Delete. (_initialize_record_btrace): Remove reference to init_record_btrace_ops. * record-full.c (RECORD_FULL_IS_REPLAY): Adjust to always refer to the execution_direction global. (record_full_base_target, record_full_target) (record_full_core_target): New classes. (record_full_ops): Now a record_full_target. (record_full_core_ops): Now a record_full_core_target. (record_full_target::detach, record_full_target::disconnect) (record_full_core_target::disconnect) (record_full_target::mourn_inferior, record_full_target::kill): New. (record_full_open, record_full_close, record_full_async): Refactor as methods of the record_full_base_target class. (record_full_resume, record_full_commit_resume): Refactor as methods of the record_full_target class. (record_full_wait, record_full_stopped_by_watchpoint) (record_full_stopped_data_address) (record_full_stopped_by_sw_breakpoint) (record_full_supports_stopped_by_sw_breakpoint) (record_full_stopped_by_hw_breakpoint) (record_full_supports_stopped_by_hw_breakpoint): Refactor as methods of the record_full_base_target class. (record_full_store_registers, record_full_xfer_partial) (record_full_insert_breakpoint, record_full_remove_breakpoint): Refactor as methods of the record_full_target class. (record_full_can_execute_reverse, record_full_get_bookmark) (record_full_goto_bookmark, record_full_execution_direction) (record_full_record_method, record_full_info, record_full_delete) (record_full_is_replaying, record_full_will_replay) (record_full_goto_begin, record_full_goto_end, record_full_goto) (record_full_stop_replaying): Refactor as methods of the record_full_base_target class. (record_full_core_resume, record_full_core_kill) (record_full_core_fetch_registers) (record_full_core_prepare_to_store) (record_full_core_store_registers, record_full_core_xfer_partial) (record_full_core_insert_breakpoint) (record_full_core_remove_breakpoint) (record_full_core_has_execution): Refactor as methods of the record_full_core_target class. (record_full_base_target::supports_delete_record): New. (init_record_full_ops): Delete. (init_record_full_core_ops): Delete. (record_full_save): Refactor as method of the record_full_base_target class. (_initialize_record_full): Remove references to init_record_full_ops and init_record_full_core_ops. * remote.c (remote_target, extended_remote_target): New classes. (remote_ops): Now a remote_target. (extended_remote_ops): Now an extended_remote_target. (remote_insert_fork_catchpoint, remote_remove_fork_catchpoint) (remote_insert_vfork_catchpoint, remote_remove_vfork_catchpoint) (remote_insert_exec_catchpoint, remote_remove_exec_catchpoint) (remote_pass_signals, remote_set_syscall_catchpoint) (remote_program_signals, ) (remote_thread_always_alive): Remove target_ops parameter. (remote_thread_alive, remote_thread_name) (remote_update_thread_list, remote_threads_extra_info) (remote_static_tracepoint_marker_at) (remote_static_tracepoint_markers_by_strid) (remote_get_ada_task_ptid, remote_close, remote_start_remote) (remote_open): Refactor as methods of remote_target. (extended_remote_open, extended_remote_detach) (extended_remote_attach, extended_remote_post_attach): (extended_remote_supports_disable_randomization) (extended_remote_create_inferior): : Refactor as method of extended_remote_target. (remote_set_permissions, remote_open_1, remote_detach) (remote_follow_fork, remote_follow_exec, remote_disconnect) (remote_resume, remote_commit_resume, remote_stop) (remote_interrupt, remote_pass_ctrlc, remote_terminal_inferior) (remote_terminal_ours, remote_wait, remote_fetch_registers) (remote_prepare_to_store, remote_store_registers) (remote_flash_erase, remote_flash_done, remote_files_info) (remote_kill, remote_mourn, remote_insert_breakpoint) (remote_remove_breakpoint, remote_insert_watchpoint) (remote_watchpoint_addr_within_range) (remote_remove_watchpoint, remote_region_ok_for_hw_watchpoint) (remote_check_watch_resources, remote_stopped_by_sw_breakpoint) (remote_supports_stopped_by_sw_breakpoint) (remote_stopped_by_hw_breakpoint) (remote_supports_stopped_by_hw_breakpoint) (remote_stopped_by_watchpoint, remote_stopped_data_address) (remote_insert_hw_breakpoint, remote_remove_hw_breakpoint) (remote_verify_memory): Refactor as methods of remote_target. (remote_write_qxfer, remote_read_qxfer): Remove target_ops parameter. (remote_xfer_partial, remote_get_memory_xfer_limit) (remote_search_memory, remote_rcmd, remote_memory_map) (remote_pid_to_str, remote_get_thread_local_address) (remote_get_tib_address, remote_read_description): Refactor as methods of remote_target. (remote_target::fileio_open, remote_target::fileio_pwrite) (remote_target::fileio_pread, remote_target::fileio_close): New. (remote_hostio_readlink, remote_hostio_fstat) (remote_filesystem_is_local, remote_can_execute_reverse) (remote_supports_non_stop, remote_supports_disable_randomization) (remote_supports_multi_process, remote_supports_cond_breakpoints) (remote_supports_enable_disable_tracepoint) (remote_supports_string_tracing) (remote_can_run_breakpoint_commands, remote_trace_init) (remote_download_tracepoint, remote_can_download_tracepoint) (remote_download_trace_state_variable, remote_enable_tracepoint) (remote_disable_tracepoint, remote_trace_set_readonly_regions) (remote_trace_start, remote_get_trace_status) (remote_get_tracepoint_status, remote_trace_stop) (remote_trace_find, remote_get_trace_state_variable_value) (remote_save_trace_data, remote_get_raw_trace_data) (remote_set_disconnected_tracing, remote_core_of_thread) (remote_set_circular_trace_buffer, remote_traceframe_info) (remote_get_min_fast_tracepoint_insn_len) (remote_set_trace_buffer_size, remote_set_trace_notes) (remote_use_agent, remote_can_use_agent, remote_enable_btrace) (remote_disable_btrace, remote_teardown_btrace) (remote_read_btrace, remote_btrace_conf) (remote_augmented_libraries_svr4_read, remote_load) (remote_pid_to_exec_file, remote_can_do_single_step) (remote_execution_direction, remote_thread_handle_to_thread_info): Refactor as methods of remote_target. (init_remote_ops, init_extended_remote_ops): Delete. (remote_can_async_p, remote_is_async_p, remote_async) (remote_thread_events, remote_upload_tracepoints) (remote_upload_trace_state_variables): Refactor as methods of remote_target. (_initialize_remote): Remove references to init_remote_ops and init_extended_remote_ops. * remote-sim.c (gdbsim_target): New class. (gdbsim_fetch_register, gdbsim_store_register, gdbsim_kill) (gdbsim_load, gdbsim_create_inferior, gdbsim_open, gdbsim_close) (gdbsim_detach, gdbsim_resume, gdbsim_interrupt) (gdbsim_wait, gdbsim_prepare_to_store, gdbsim_xfer_partial) (gdbsim_files_info, gdbsim_mourn_inferior, gdbsim_thread_alive) (gdbsim_pid_to_str, gdbsim_has_all_memory, gdbsim_has_memory): Refactor as methods of gdbsim_target. (gdbsim_ops): Now a gdbsim_target. (init_gdbsim_ops): Delete. (gdbsim_cntrl_c): Adjust. (_initialize_remote_sim): Remove reference to init_gdbsim_ops. * amd64-linux-nat.c (amd64_linux_nat_target): New class. (the_amd64_linux_nat_target): New. (amd64_linux_fetch_inferior_registers) (amd64_linux_store_inferior_registers): Refactor as methods of amd64_linux_nat_target. (_initialize_amd64_linux_nat): Adjust. Set linux_target. * i386-linux-nat.c: Don't include "linux-nat.h". (i386_linux_nat_target): New class. (the_i386_linux_nat_target): New. (i386_linux_fetch_inferior_registers) (i386_linux_store_inferior_registers, i386_linux_resume): Refactor as methods of i386_linux_nat_target. (_initialize_i386_linux_nat): Adjust. Set linux_target. * inf-child.c (inf_child_ops): Delete. (inf_child_fetch_inferior_registers) (inf_child_store_inferior_registers): Delete. (inf_child_post_attach, inf_child_prepare_to_store): Refactor as methods of inf_child_target. (inf_child_target::supports_terminal_ours) (inf_child_target::terminal_init) (inf_child_target::terminal_inferior) (inf_child_target::terminal_ours_for_output) (inf_child_target::terminal_ours, inf_child_target::interrupt) (inf_child_target::pass_ctrlc, inf_child_target::terminal_info): New. (inf_child_open, inf_child_disconnect, inf_child_close) (inf_child_mourn_inferior, inf_child_maybe_unpush_target) (inf_child_post_startup_inferior, inf_child_can_run) (inf_child_pid_to_exec_file): Refactor as methods of inf_child_target. (inf_child_follow_fork): Delete. (inf_child_target::can_create_inferior) (inf_child_target::can_attach): New. (inf_child_target::has_all_memory, inf_child_target::has_memory) (inf_child_target::has_stack, inf_child_target::has_registers) (inf_child_target::has_execution): New. (inf_child_fileio_open, inf_child_fileio_pwrite) (inf_child_fileio_pread, inf_child_fileio_fstat) (inf_child_fileio_close, inf_child_fileio_unlink) (inf_child_fileio_readlink, inf_child_use_agent) (inf_child_can_use_agent): Refactor as methods of inf_child_target. (return_zero, inf_child_target): Delete. (inf_child_target::inf_child_target): New. * inf-child.h: Include "target.h". (inf_child_target): Delete function prototype. (inf_child_target): New class. (inf_child_open_target, inf_child_mourn_inferior) (inf_child_maybe_unpush_target): Delete. * inf-ptrace.c (inf_ptrace_target::~inf_ptrace_target): New. (inf_ptrace_follow_fork, inf_ptrace_insert_fork_catchpoint) (inf_ptrace_remove_fork_catchpoint, inf_ptrace_create_inferior) (inf_ptrace_post_startup_inferior, inf_ptrace_mourn_inferior) (inf_ptrace_attach, inf_ptrace_post_attach, inf_ptrace_detach) (inf_ptrace_detach_success, inf_ptrace_kill, inf_ptrace_resume) (inf_ptrace_wait, inf_ptrace_xfer_partial) (inf_ptrace_thread_alive, inf_ptrace_files_info) (inf_ptrace_pid_to_str, inf_ptrace_auxv_parse): Refactor as methods of inf_ptrace_target. (inf_ptrace_target): Delete function. * inf-ptrace.h: Include "inf-child.h". (inf_ptrace_target): Delete function declaration. (inf_ptrace_target): New class. (inf_ptrace_trad_target, inf_ptrace_detach_success): Delete. * linux-nat.c (linux_target): New. (linux_ops, linux_ops_saved, super_xfer_partial): Delete. (linux_nat_target::~linux_nat_target): New. (linux_child_post_attach, linux_child_post_startup_inferior) (linux_child_follow_fork, linux_child_insert_fork_catchpoint) (linux_child_remove_fork_catchpoint) (linux_child_insert_vfork_catchpoint) (linux_child_remove_vfork_catchpoint) (linux_child_insert_exec_catchpoint) (linux_child_remove_exec_catchpoint) (linux_child_set_syscall_catchpoint, linux_nat_pass_signals) (linux_nat_create_inferior, linux_nat_attach, linux_nat_detach) (linux_nat_resume, linux_nat_stopped_by_watchpoint) (linux_nat_stopped_data_address) (linux_nat_stopped_by_sw_breakpoint) (linux_nat_supports_stopped_by_sw_breakpoint) (linux_nat_stopped_by_hw_breakpoint) (linux_nat_supports_stopped_by_hw_breakpoint, linux_nat_wait) (linux_nat_kill, linux_nat_mourn_inferior) (linux_nat_xfer_partial, linux_nat_thread_alive) (linux_nat_update_thread_list, linux_nat_pid_to_str) (linux_nat_thread_name, linux_child_pid_to_exec_file) (linux_child_static_tracepoint_markers_by_strid) (linux_nat_is_async_p, linux_nat_can_async_p) (linux_nat_supports_non_stop, linux_nat_always_non_stop_p) (linux_nat_supports_multi_process) (linux_nat_supports_disable_randomization, linux_nat_async) (linux_nat_stop, linux_nat_close, linux_nat_thread_address_space) (linux_nat_core_of_thread, linux_nat_filesystem_is_local) (linux_nat_fileio_open, linux_nat_fileio_readlink) (linux_nat_fileio_unlink, linux_nat_thread_events): Refactor as methods of linux_nat_target. (linux_nat_wait_1, linux_xfer_siginfo, linux_proc_xfer_partial) (linux_proc_xfer_spu, linux_nat_xfer_osdata): Remove target_ops parameter. (check_stopped_by_watchpoint): Adjust. (linux_xfer_partial): Delete. (linux_target_install_ops, linux_target, linux_nat_add_target): Delete. (linux_nat_target::linux_nat_target): New. * linux-nat.h: Include "inf-ptrace.h". (linux_nat_target): New. (linux_target, linux_target_install_ops, linux_nat_add_target): Delete function declarations. (linux_target): Declare global. * linux-thread-db.c (thread_db_target): New. (thread_db_target::thread_db_target): New. (thread_db_ops): Delete. (the_thread_db_target): New. (thread_db_detach, thread_db_wait, thread_db_mourn_inferior) (thread_db_update_thread_list, thread_db_pid_to_str) (thread_db_extra_thread_info) (thread_db_thread_handle_to_thread_info) (thread_db_get_thread_local_address, thread_db_get_ada_task_ptid) (thread_db_resume): Refactor as methods of thread_db_target. (init_thread_db_ops): Delete. (_initialize_thread_db): Remove reference to init_thread_db_ops. * x86-linux-nat.c: Don't include "linux-nat.h". (super_post_startup_inferior): Delete. (x86_linux_nat_target::~x86_linux_nat_target): New. (x86_linux_child_post_startup_inferior) (x86_linux_read_description, x86_linux_enable_btrace) (x86_linux_disable_btrace, x86_linux_teardown_btrace) (x86_linux_read_btrace, x86_linux_btrace_conf): Refactor as methods of x86_linux_nat_target. (x86_linux_create_target): Delete. Bits folded ... (x86_linux_add_target): ... here. Now takes a linux_nat_target pointer. * x86-linux-nat.h: Include "linux-nat.h" and "x86-nat.h". (x86_linux_nat_target): New class. (x86_linux_create_target): Delete. (x86_linux_add_target): Now takes a linux_nat_target pointer. * x86-nat.c (x86_insert_watchpoint, x86_remove_watchpoint) (x86_region_ok_for_watchpoint, x86_stopped_data_address) (x86_stopped_by_watchpoint, x86_insert_hw_breakpoint) (x86_remove_hw_breakpoint, x86_can_use_hw_breakpoint) (x86_stopped_by_hw_breakpoint): Remove target_ops parameter and make extern. (x86_use_watchpoints): Delete. * x86-nat.h: Include "breakpoint.h" and "target.h". (x86_use_watchpoints): Delete. (x86_can_use_hw_breakpoint, x86_region_ok_for_hw_watchpoint) (x86_stopped_by_watchpoint, x86_stopped_data_address) (x86_insert_watchpoint, x86_remove_watchpoint) (x86_insert_hw_breakpoint, x86_remove_hw_breakpoint) (x86_stopped_by_hw_breakpoint): New declarations. (x86_nat_target): New template class. * ppc-linux-nat.c (ppc_linux_nat_target): New class. (the_ppc_linux_nat_target): New. (ppc_linux_fetch_inferior_registers) (ppc_linux_can_use_hw_breakpoint) (ppc_linux_region_ok_for_hw_watchpoint) (ppc_linux_ranged_break_num_registers) (ppc_linux_insert_hw_breakpoint, ppc_linux_remove_hw_breakpoint) (ppc_linux_insert_mask_watchpoint) (ppc_linux_remove_mask_watchpoint) (ppc_linux_can_accel_watchpoint_condition) (ppc_linux_insert_watchpoint, ppc_linux_remove_watchpoint) (ppc_linux_stopped_data_address, ppc_linux_stopped_by_watchpoint) (ppc_linux_watchpoint_addr_within_range) (ppc_linux_masked_watch_num_registers) (ppc_linux_store_inferior_registers, ppc_linux_auxv_parse) (ppc_linux_read_description): Refactor as methods of ppc_linux_nat_target. (_initialize_ppc_linux_nat): Adjust. Set linux_target. * procfs.c (procfs_xfer_partial): Delete forward declaration. (procfs_target): New class. (the_procfs_target): New. (procfs_target): Delete function. (procfs_auxv_parse, procfs_attach, procfs_detach) (procfs_fetch_registers, procfs_store_registers, procfs_wait) (procfs_xfer_partial, procfs_resume, procfs_pass_signals) (procfs_files_info, procfs_kill_inferior, procfs_mourn_inferior) (procfs_create_inferior, procfs_update_thread_list) (procfs_thread_alive, procfs_pid_to_str) (procfs_can_use_hw_breakpoint, procfs_stopped_by_watchpoint) (procfs_stopped_data_address, procfs_insert_watchpoint) (procfs_remove_watchpoint, procfs_region_ok_for_hw_watchpoint) (proc_find_memory_regions, procfs_info_proc) (procfs_make_note_section): Refactor as methods of procfs_target. (_initialize_procfs): Adjust. * sol-thread.c (sol_thread_target): New class. (sol_thread_ops): Now a sol_thread_target. (sol_thread_detach, sol_thread_resume, sol_thread_wait) (sol_thread_fetch_registers, sol_thread_store_registers) (sol_thread_xfer_partial, sol_thread_mourn_inferior) (sol_thread_alive, solaris_pid_to_str, sol_update_thread_list) (sol_get_ada_task_ptid): Refactor as methods of sol_thread_target. (init_sol_thread_ops): Delete. (_initialize_sol_thread): Adjust. Remove references to init_sol_thread_ops and complete_target_initialization. * windows-nat.c (windows_nat_target): New class. (windows_fetch_inferior_registers) (windows_store_inferior_registers, windows_resume, windows_wait) (windows_attach, windows_detach, windows_pid_to_exec_file) (windows_files_info, windows_create_inferior) (windows_mourn_inferior, windows_interrupt, windows_kill_inferior) (windows_close, windows_pid_to_str, windows_xfer_partial) (windows_get_tib_address, windows_get_ada_task_ptid) (windows_thread_name, windows_thread_alive): Refactor as windows_nat_target methods. (do_initial_windows_stuff): Adjust. (windows_target): Delete function. (_initialize_windows_nat): Adjust. * darwin-nat.c (darwin_resume, darwin_wait_to, darwin_interrupt) (darwin_mourn_inferior, darwin_kill_inferior) (darwin_create_inferior, darwin_attach, darwin_detach) (darwin_pid_to_str, darwin_thread_alive, darwin_xfer_partial) (darwin_pid_to_exec_file, darwin_get_ada_task_ptid) (darwin_supports_multi_process): Refactor as darwin_nat_target methods. (darwin_resume_to, darwin_files_info): Delete. (_initialize_darwin_inferior): Rename to ... (_initialize_darwin_nat): ... this. Adjust to C++ification. * darwin-nat.h: Include "inf-child.h". (darwin_nat_target): New class. (darwin_complete_target): Delete. * i386-darwin-nat.c (i386_darwin_nat_target): New class. (darwin_target): New. (i386_darwin_fetch_inferior_registers) (i386_darwin_store_inferior_registers): Refactor as methods of darwin_nat_target. (darwin_complete_target): Delete, with ... (_initialize_i386_darwin_nat): ... bits factored out here. * alpha-linux-nat.c (alpha_linux_nat_target): New class. (the_alpha_linux_nat_target): New. (alpha_linux_register_u_offset): Refactor as alpha_linux_nat_target method. (_initialize_alpha_linux_nat): Adjust. * linux-nat-trad.c (inf_ptrace_register_u_offset): Delete. (inf_ptrace_fetch_register, inf_ptrace_fetch_registers) (inf_ptrace_store_register, inf_ptrace_store_registers): Refact as methods of linux_nat_trad_target. (linux_trad_target): Delete. * linux-nat-trad.h (linux_trad_target): Delete function. (linux_nat_trad_target): New class. * mips-linux-nat.c (mips_linux_nat_target): New class. (super_fetch_registers, super_store_registers, super_close): Delete. (the_mips_linux_nat_target): New. (mips64_linux_regsets_fetch_registers) (mips64_linux_regsets_store_registers) (mips64_linux_fetch_registers, mips64_linux_store_registers) (mips_linux_register_u_offset, mips_linux_read_description) (mips_linux_can_use_hw_breakpoint) (mips_linux_stopped_by_watchpoint) (mips_linux_stopped_data_address) (mips_linux_region_ok_for_hw_watchpoint) (mips_linux_insert_watchpoint, mips_linux_remove_watchpoint) (mips_linux_close): Refactor as methods of mips_linux_nat. (_initialize_mips_linux_nat): Adjust to C++ification. * aix-thread.c (aix_thread_target): New class. (aix_thread_ops): Now an aix_thread_target. (aix_thread_detach, aix_thread_resume, aix_thread_wait) (aix_thread_fetch_registers, aix_thread_store_registers) (aix_thread_xfer_partial, aix_thread_mourn_inferior) (aix_thread_thread_alive, aix_thread_pid_to_str) (aix_thread_extra_thread_info, aix_thread_get_ada_task_ptid): Refactor as methods of aix_thread_target. (init_aix_thread_ops): Delete. (_initialize_aix_thread): Remove references to init_aix_thread_ops and complete_target_initialization. * rs6000-nat.c (rs6000_xfer_shared_libraries): Delete. (rs6000_nat_target): New class. (the_rs6000_nat_target): New. (rs6000_fetch_inferior_registers, rs6000_store_inferior_registers) (rs6000_xfer_partial, rs6000_wait, rs6000_create_inferior) (rs6000_xfer_shared_libraries): Refactor as rs6000_nat_target methods. (super_create_inferior): Delete. (_initialize_rs6000_nat): Adjust to C++ification. * arm-linux-nat.c (arm_linux_nat_target): New class. (the_arm_linux_nat_target): New. (arm_linux_fetch_inferior_registers) (arm_linux_store_inferior_registers, arm_linux_read_description) (arm_linux_can_use_hw_breakpoint, arm_linux_insert_hw_breakpoint) (arm_linux_remove_hw_breakpoint) (arm_linux_region_ok_for_hw_watchpoint) (arm_linux_insert_watchpoint, arm_linux_remove_watchpoint) (arm_linux_stopped_data_address, arm_linux_stopped_by_watchpoint) (arm_linux_watchpoint_addr_within_range): Refactor as methods of arm_linux_nat_target. (_initialize_arm_linux_nat): Adjust to C++ification. * aarch64-linux-nat.c (aarch64_linux_nat_target): New class. (the_aarch64_linux_nat_target): New. (aarch64_linux_fetch_inferior_registers) (aarch64_linux_store_inferior_registers) (aarch64_linux_child_post_startup_inferior) (aarch64_linux_read_description) (aarch64_linux_can_use_hw_breakpoint) (aarch64_linux_insert_hw_breakpoint) (aarch64_linux_remove_hw_breakpoint) (aarch64_linux_insert_watchpoint, aarch64_linux_remove_watchpoint) (aarch64_linux_region_ok_for_hw_watchpoint) (aarch64_linux_stopped_data_address) (aarch64_linux_stopped_by_watchpoint) (aarch64_linux_watchpoint_addr_within_range) (aarch64_linux_can_do_single_step): Refactor as methods of aarch64_linux_nat_target. (super_post_startup_inferior): Delete. (_initialize_aarch64_linux_nat): Adjust to C++ification. * hppa-linux-nat.c (hppa_linux_nat_target): New class. (the_hppa_linux_nat_target): New. (hppa_linux_fetch_inferior_registers) (hppa_linux_store_inferior_registers): Refactor as methods of hppa_linux_nat_target. (_initialize_hppa_linux_nat): Adjust to C++ification. * ia64-linux-nat.c (ia64_linux_nat_target): New class. (the_ia64_linux_nat_target): New. (ia64_linux_insert_watchpoint, ia64_linux_remove_watchpoint) (ia64_linux_stopped_data_address) (ia64_linux_stopped_by_watchpoint, ia64_linux_fetch_registers) (ia64_linux_store_registers, ia64_linux_xfer_partial): Refactor as ia64_linux_nat_target methods. (super_xfer_partial): Delete. (_initialize_ia64_linux_nat): Adjust to C++ification. * m32r-linux-nat.c (m32r_linux_nat_target): New class. (the_m32r_linux_nat_target): New. (m32r_linux_fetch_inferior_registers) (m32r_linux_store_inferior_registers): Refactor as m32r_linux_nat_target methods. (_initialize_m32r_linux_nat): Adjust to C++ification. * m68k-linux-nat.c (m68k_linux_nat_target): New class. (the_m68k_linux_nat_target): New. (m68k_linux_fetch_inferior_registers) (m68k_linux_store_inferior_registers): Refactor as m68k_linux_nat_target methods. (_initialize_m68k_linux_nat): Adjust to C++ification. * s390-linux-nat.c (s390_linux_nat_target): New class. (the_s390_linux_nat_target): New. (s390_linux_fetch_inferior_registers) (s390_linux_store_inferior_registers, s390_stopped_by_watchpoint) (s390_insert_watchpoint, s390_remove_watchpoint) (s390_can_use_hw_breakpoint, s390_insert_hw_breakpoint) (s390_remove_hw_breakpoint, s390_region_ok_for_hw_watchpoint) (s390_auxv_parse, s390_read_description): Refactor as methods of s390_linux_nat_target. (_initialize_s390_nat): Adjust to C++ification. * sparc-linux-nat.c (sparc_linux_nat_target): New class. (the_sparc_linux_nat_target): New. (_initialize_sparc_linux_nat): Adjust to C++ification. * sparc-nat.c (sparc_fetch_inferior_registers) (sparc_store_inferior_registers): Remove target_ops parameter. * sparc-nat.h (sparc_fetch_inferior_registers) (sparc_store_inferior_registers): Remove target_ops parameter. * sparc64-linux-nat.c (sparc64_linux_nat_target): New class. (the_sparc64_linux_nat_target): New. (_initialize_sparc64_linux_nat): Adjust to C++ification. * spu-linux-nat.c (spu_linux_nat_target): New class. (the_spu_linux_nat_target): New. (spu_child_post_startup_inferior, spu_child_post_attach) (spu_child_wait, spu_fetch_inferior_registers) (spu_store_inferior_registers, spu_xfer_partial) (spu_can_use_hw_breakpoint): Refactor as spu_linux_nat_target methods. (_initialize_spu_nat): Adjust to C++ification. * tilegx-linux-nat.c (tilegx_linux_nat_target): New class. (the_tilegx_linux_nat_target): New. (fetch_inferior_registers, store_inferior_registers): Refactor as methods. (_initialize_tile_linux_nat): Adjust to C++ification. * xtensa-linux-nat.c (xtensa_linux_nat_target): New class. (the_xtensa_linux_nat_target): New. (xtensa_linux_fetch_inferior_registers) (xtensa_linux_store_inferior_registers): Refactor as xtensa_linux_nat_target methods. (_initialize_xtensa_linux_nat): Adjust to C++ification. * fbsd-nat.c (USE_SIGTRAP_SIGINFO): Delete. (fbsd_pid_to_exec_file, fbsd_find_memory_regions) (fbsd_find_memory_regions, fbsd_info_proc, fbsd_xfer_partial) (fbsd_thread_alive, fbsd_pid_to_str, fbsd_thread_name) (fbsd_update_thread_list, fbsd_resume, fbsd_wait) (fbsd_stopped_by_sw_breakpoint) (fbsd_supports_stopped_by_sw_breakpoint, fbsd_follow_fork) (fbsd_insert_fork_catchpoint, fbsd_remove_fork_catchpoint) (fbsd_insert_vfork_catchpoint, fbsd_remove_vfork_catchpoint) (fbsd_post_startup_inferior, fbsd_post_attach) (fbsd_insert_exec_catchpoint, fbsd_remove_exec_catchpoint) (fbsd_set_syscall_catchpoint) (super_xfer_partial, super_resume, super_wait) (fbsd_supports_stopped_by_hw_breakpoint): Delete. (fbsd_handle_debug_trap): Remove target_ops parameter. (fbsd_nat_add_target): Delete. * fbsd-nat.h: Include "inf-ptrace.h". (fbsd_nat_add_target): Delete. (USE_SIGTRAP_SIGINFO): Define. (fbsd_nat_target): New class. * amd64-bsd-nat.c (amd64bsd_fetch_inferior_registers) (amd64bsd_store_inferior_registers): Remove target_ops parameter. (amd64bsd_target): Delete. * amd64-bsd-nat.h: New file. * amd64-fbsd-nat.c: Include "amd64-bsd-nat.h" instead of "x86-bsd-nat.h". (amd64_fbsd_nat_target): New class. (the_amd64_fbsd_nat_target): New. (amd64fbsd_read_description): Refactor as method of amd64_fbsd_nat_target. (amd64_fbsd_nat_target::supports_stopped_by_hw_breakpoint): New. (_initialize_amd64fbsd_nat): Adjust to C++ification. * amd64-nat.h (amd64bsd_target): Delete function declaration. * i386-bsd-nat.c (i386bsd_fetch_inferior_registers) (i386bsd_store_inferior_registers): Remove target_ops parameter. (i386bsd_target): Delete. * i386-bsd-nat.h (i386bsd_target): Delete function declaration. (i386bsd_fetch_inferior_registers) (i386bsd_store_inferior_registers): Declare. (i386_bsd_nat_target): New class. * i386-fbsd-nat.c (i386_fbsd_nat_target): New class. (the_i386_fbsd_nat_target): New. (i386fbsd_resume, i386fbsd_read_description): Refactor as i386_fbsd_nat_target methods. (i386_fbsd_nat_target::supports_stopped_by_hw_breakpoint): New. (_initialize_i386fbsd_nat): Adjust to C++ification. * x86-bsd-nat.c (super_mourn_inferior): Delete. (x86bsd_mourn_inferior, x86bsd_target): Delete. (_initialize_x86_bsd_nat): Adjust to C++ification. * x86-bsd-nat.h: Include "x86-nat.h". (x86bsd_target): Delete declaration. (x86bsd_nat_target): New class. * aarch64-fbsd-nat.c (aarch64_fbsd_nat_target): New class. (the_aarch64_fbsd_nat_target): New. (aarch64_fbsd_fetch_inferior_registers) (aarch64_fbsd_store_inferior_registers): Refactor as methods of aarch64_fbsd_nat_target. (_initialize_aarch64_fbsd_nat): Adjust to C++ification. * alpha-bsd-nat.c (alpha_bsd_nat_target): New class. (the_alpha_bsd_nat_target): New. (alphabsd_fetch_inferior_registers) (alphabsd_store_inferior_registers): Refactor as alpha_bsd_nat_target methods. (_initialize_alphabsd_nat): Refactor as methods of alpha_bsd_nat_target. * amd64-nbsd-nat.c: Include "amd64-bsd-nat.h". (the_amd64_nbsd_nat_target): New. (_initialize_amd64nbsd_nat): Adjust to C++ification. * amd64-obsd-nat.c: Include "amd64-bsd-nat.h". (the_amd64_obsd_nat_target): New. (_initialize_amd64obsd_nat): Adjust to C++ification. * arm-fbsd-nat.c (arm_fbsd_nat_target): New. (the_arm_fbsd_nat_target): New. (arm_fbsd_fetch_inferior_registers) (arm_fbsd_store_inferior_registers, arm_fbsd_read_description): (_initialize_arm_fbsd_nat): Refactor as methods of arm_fbsd_nat_target. (_initialize_arm_fbsd_nat): Adjust to C++ification. * arm-nbsd-nat.c (arm_netbsd_nat_target): New class. (the_arm_netbsd_nat_target): New. (armnbsd_fetch_registers, armnbsd_store_registers): Refactor as arm_netbsd_nat_target. (_initialize_arm_netbsd_nat): Adjust to C++ification. * hppa-nbsd-nat.c (hppa_nbsd_nat_target): New class. (the_hppa_nbsd_nat_target): New. (hppanbsd_fetch_registers, hppanbsd_store_registers): Refactor as hppa_nbsd_nat_target methods. (_initialize_hppanbsd_nat): Adjust to C++ification. * hppa-obsd-nat.c (hppa_obsd_nat_target): New class. (the_hppa_obsd_nat_target): New. (hppaobsd_fetch_registers, hppaobsd_store_registers): Refactor as methods of hppa_obsd_nat_target. (_initialize_hppaobsd_nat): Adjust to C++ification. Use add_target. * i386-nbsd-nat.c (the_i386_nbsd_nat_target): New. (_initialize_i386nbsd_nat): Adjust to C++ification. Use add_target. * i386-obsd-nat.c (the_i386_obsd_nat_target): New. (_initialize_i386obsd_nat): Use add_target. * m68k-bsd-nat.c (m68k_bsd_nat_target): New class. (the_m68k_bsd_nat_target): New. (m68kbsd_fetch_inferior_registers) (m68kbsd_store_inferior_registers): Refactor as methods of m68k_bsd_nat_target. (_initialize_m68kbsd_nat): Adjust to C++ification. * mips-fbsd-nat.c (mips_fbsd_nat_target): New class. (the_mips_fbsd_nat_target): New. (mips_fbsd_fetch_inferior_registers) (mips_fbsd_store_inferior_registers): Refactor as methods of mips_fbsd_nat_target. (_initialize_mips_fbsd_nat): Adjust to C++ification. Use add_target. * mips-nbsd-nat.c (mips_nbsd_nat_target): New class. (the_mips_nbsd_nat_target): New. (mipsnbsd_fetch_inferior_registers) (mipsnbsd_store_inferior_registers): Refactor as methods of mips_nbsd_nat_target. (_initialize_mipsnbsd_nat): Adjust to C++ification. * mips64-obsd-nat.c (mips64_obsd_nat_target): New class. (the_mips64_obsd_nat_target): New. (mips64obsd_fetch_inferior_registers) (mips64obsd_store_inferior_registers): Refactor as methods of mips64_obsd_nat_target. (_initialize_mips64obsd_nat): Adjust to C++ification. Use add_target. * nbsd-nat.c (nbsd_pid_to_exec_file): Refactor as method of nbsd_nat_target. * nbsd-nat.h: Include "inf-ptrace.h". (nbsd_nat_target): New class. * obsd-nat.c (obsd_pid_to_str, obsd_update_thread_list) (obsd_wait): Refactor as methods of obsd_nat_target. (obsd_add_target): Delete. * obsd-nat.h: Include "inf-ptrace.h". (obsd_nat_target): New class. * ppc-fbsd-nat.c (ppc_fbsd_nat_target): New class. (the_ppc_fbsd_nat_target): New. (ppcfbsd_fetch_inferior_registers) (ppcfbsd_store_inferior_registers): Refactor as methods of ppc_fbsd_nat_target. (_initialize_ppcfbsd_nat): Adjust to C++ification. Use add_target. * ppc-nbsd-nat.c (ppc_nbsd_nat_target): New class. (the_ppc_nbsd_nat_target): New. (ppcnbsd_fetch_inferior_registers) (ppcnbsd_store_inferior_registers): Refactor as methods of ppc_nbsd_nat_target. (_initialize_ppcnbsd_nat): Adjust to C++ification. * ppc-obsd-nat.c (ppc_obsd_nat_target): New class. (the_ppc_obsd_nat_target): New. (ppcobsd_fetch_registers, ppcobsd_store_registers): Refactor as methods of ppc_obsd_nat_target. (_initialize_ppcobsd_nat): Adjust to C++ification. Use add_target. * sh-nbsd-nat.c (sh_nbsd_nat_target): New class. (the_sh_nbsd_nat_target): New. (shnbsd_fetch_inferior_registers) (shnbsd_store_inferior_registers): Refactor as methods of sh_nbsd_nat_target. (_initialize_shnbsd_nat): Adjust to C++ification. * sparc-nat.c (sparc_xfer_wcookie): Make extern. (inf_ptrace_xfer_partial): Delete. (sparc_xfer_partial, sparc_target): Delete. * sparc-nat.h (sparc_fetch_inferior_registers) (sparc_store_inferior_registers, sparc_xfer_wcookie): Declare. (sparc_target): Delete function declaration. (sparc_target): New template class. * sparc-nbsd-nat.c (the_sparc_nbsd_nat_target): New. (_initialize_sparcnbsd_nat): Adjust to C++ification. * sparc64-fbsd-nat.c (the_sparc64_fbsd_nat_target): New. (_initialize_sparc64fbsd_nat): Adjust to C++ification. Use add_target. * sparc64-nbsd-nat.c (the_sparc64_nbsd_nat_target): New. (_initialize_sparc64nbsd_nat): Adjust to C++ification. * sparc64-obsd-nat.c (the_sparc64_obsd_nat_target): New. (_initialize_sparc64obsd_nat): Adjust to C++ification. Use add_target. * vax-bsd-nat.c (vax_bsd_nat_target): New class. (the_vax_bsd_nat_target): New. (vaxbsd_fetch_inferior_registers) (vaxbsd_store_inferior_registers): Refactor as vax_bsd_nat_target methods. (_initialize_vaxbsd_nat): Adjust to C++ification. * bsd-kvm.c (bsd_kvm_target): New class. (bsd_kvm_ops): Now a bsd_kvm_target. (bsd_kvm_open, bsd_kvm_close, bsd_kvm_xfer_partial) (bsd_kvm_files_info, bsd_kvm_fetch_registers) (bsd_kvm_thread_alive, bsd_kvm_pid_to_str): Refactor as methods of bsd_kvm_target. (bsd_kvm_return_one): Delete. (bsd_kvm_add_target): Adjust to C++ification. * nto-procfs.c (nto_procfs_target, nto_procfs_target_native) (nto_procfs_target_procfs): New classes. (procfs_open_1, procfs_thread_alive, procfs_update_thread_list) (procfs_files_info, procfs_pid_to_exec_file, procfs_attach) (procfs_post_attach, procfs_wait, procfs_fetch_registers) (procfs_xfer_partial, procfs_detach, procfs_insert_breakpoint) (procfs_remove_breakpoint, procfs_insert_hw_breakpoint) (procfs_remove_hw_breakpoint, procfs_resume) (procfs_mourn_inferior, procfs_create_inferior, procfs_interrupt) (procfs_kill_inferior, procfs_store_registers) (procfs_pass_signals, procfs_pid_to_str, procfs_can_run): Refactor as methods of nto_procfs_target. (nto_procfs_ops): Now an nto_procfs_target_procfs. (nto_native_ops): Delete. (procfs_open, procfs_native_open): Delete. (nto_native_ops): Now an nto_procfs_target_native. (init_procfs_targets): Adjust to C++ification. (procfs_can_use_hw_breakpoint, procfs_remove_hw_watchpoint) (procfs_insert_hw_watchpoint, procfs_stopped_by_watchpoint): Refactor as methods of nto_procfs_target. * go32-nat.c (go32_nat_target): New class. (the_go32_nat_target): New. (go32_attach, go32_resume, go32_wait, go32_fetch_registers) (go32_store_registers, go32_xfer_partial, go32_files_info) (go32_kill_inferior, go32_create_inferior, go32_mourn_inferior) (go32_terminal_init, go32_terminal_info, go32_terminal_inferior) (go32_terminal_ours, go32_pass_ctrlc, go32_thread_alive) (go32_pid_to_str): Refactor as methods of go32_nat_target. (go32_target): Delete. (_initialize_go32_nat): Adjust to C++ification. * gnu-nat.c (gnu_wait, gnu_resume, gnu_kill_inferior) (gnu_mourn_inferior, gnu_create_inferior, gnu_attach, gnu_detach) (gnu_stop, gnu_thread_alive, gnu_xfer_partial) (gnu_find_memory_regions, gnu_pid_to_str): Refactor as methods of gnu_nat_target. (gnu_target): Delete. * gnu-nat.h (gnu_target): Delete. (gnu_nat_target): New class. * i386-gnu-nat.c (gnu_base_target): New. (i386_gnu_nat_target): New class. (the_i386_gnu_nat_target): New. (_initialize_i386gnu_nat): Adjust to C++ification. gdb/testsuite/ChangeLog: 2018-05-02 Pedro Alves <palves@redhat.com> * gdb.base/breakpoint-in-ro-region.exp: Adjust to to_resume and to_log_command renames. * gdb.base/sss-bp-on-user-bp-2.exp: Likewise.
806 lines
24 KiB
C
806 lines
24 KiB
C
/* Copyright (C) 2013-2018 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 "solib-aix.h"
|
|
#include "solist.h"
|
|
#include "inferior.h"
|
|
#include "gdb_bfd.h"
|
|
#include "gdbcore.h"
|
|
#include "objfiles.h"
|
|
#include "symtab.h"
|
|
#include "xcoffread.h"
|
|
#include "observable.h"
|
|
#include "gdbcmd.h"
|
|
|
|
/* Variable controlling the output of the debugging traces for
|
|
this module. */
|
|
static int solib_aix_debug;
|
|
|
|
/* Our private data in struct so_list. */
|
|
|
|
struct lm_info_aix : public lm_info_base
|
|
{
|
|
/* The name of the file mapped by the loader. Apart from the entry
|
|
for the main executable, this is usually a shared library (which,
|
|
on AIX, is an archive library file, created using the "ar"
|
|
command). */
|
|
std::string filename;
|
|
|
|
/* The name of the shared object file with the actual dynamic
|
|
loading dependency. This may be empty (Eg. main executable). */
|
|
std::string member_name;
|
|
|
|
/* The address in inferior memory where the text section got mapped. */
|
|
CORE_ADDR text_addr = 0;
|
|
|
|
/* The size of the text section, obtained via the loader data. */
|
|
ULONGEST text_size = 0;
|
|
|
|
/* The address in inferior memory where the data section got mapped. */
|
|
CORE_ADDR data_addr = 0;
|
|
|
|
/* The size of the data section, obtained via the loader data. */
|
|
ULONGEST data_size = 0;
|
|
};
|
|
|
|
typedef lm_info_aix *lm_info_aix_p;
|
|
DEF_VEC_P(lm_info_aix_p);
|
|
|
|
/* This module's per-inferior data. */
|
|
|
|
struct solib_aix_inferior_data
|
|
{
|
|
/* The list of shared libraries. NULL if not computed yet.
|
|
|
|
Note that the first element of this list is always the main
|
|
executable, which is not technically a shared library. But
|
|
we need that information to perform its relocation, and
|
|
the same principles applied to shared libraries also apply
|
|
to the main executable. So it's simpler to keep it as part
|
|
of this list. */
|
|
VEC (lm_info_aix_p) *library_list;
|
|
};
|
|
|
|
/* Key to our per-inferior data. */
|
|
static const struct inferior_data *solib_aix_inferior_data_handle;
|
|
|
|
/* Return this module's data for the given inferior.
|
|
If none is found, add a zero'ed one now. */
|
|
|
|
static struct solib_aix_inferior_data *
|
|
get_solib_aix_inferior_data (struct inferior *inf)
|
|
{
|
|
struct solib_aix_inferior_data *data;
|
|
|
|
data = ((struct solib_aix_inferior_data *)
|
|
inferior_data (inf, solib_aix_inferior_data_handle));
|
|
if (data == NULL)
|
|
{
|
|
data = XCNEW (struct solib_aix_inferior_data);
|
|
set_inferior_data (inf, solib_aix_inferior_data_handle, data);
|
|
}
|
|
|
|
return data;
|
|
}
|
|
|
|
#if !defined(HAVE_LIBEXPAT)
|
|
|
|
/* Dummy implementation if XML support is not compiled in. */
|
|
|
|
static VEC (lm_info_aix_p) *
|
|
solib_aix_parse_libraries (const char *library)
|
|
{
|
|
static int have_warned;
|
|
|
|
if (!have_warned)
|
|
{
|
|
have_warned = 1;
|
|
warning (_("Can not parse XML library list; XML support was disabled "
|
|
"at compile time"));
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/* Dummy implementation if XML support is not compiled in. */
|
|
|
|
static void
|
|
solib_aix_free_library_list (void *p)
|
|
{
|
|
}
|
|
|
|
#else /* HAVE_LIBEXPAT */
|
|
|
|
#include "xml-support.h"
|
|
|
|
/* Handle the start of a <library> element. */
|
|
|
|
static void
|
|
library_list_start_library (struct gdb_xml_parser *parser,
|
|
const struct gdb_xml_element *element,
|
|
void *user_data,
|
|
std::vector<gdb_xml_value> &attributes)
|
|
{
|
|
VEC (lm_info_aix_p) **list = (VEC (lm_info_aix_p) **) user_data;
|
|
lm_info_aix *item = new lm_info_aix;
|
|
struct gdb_xml_value *attr;
|
|
|
|
attr = xml_find_attribute (attributes, "name");
|
|
item->filename = xstrdup ((const char *) attr->value.get ());
|
|
|
|
attr = xml_find_attribute (attributes, "member");
|
|
if (attr != NULL)
|
|
item->member_name = xstrdup ((const char *) attr->value.get ());
|
|
|
|
attr = xml_find_attribute (attributes, "text_addr");
|
|
item->text_addr = * (ULONGEST *) attr->value.get ();
|
|
|
|
attr = xml_find_attribute (attributes, "text_size");
|
|
item->text_size = * (ULONGEST *) attr->value.get ();
|
|
|
|
attr = xml_find_attribute (attributes, "data_addr");
|
|
item->data_addr = * (ULONGEST *) attr->value.get ();
|
|
|
|
attr = xml_find_attribute (attributes, "data_size");
|
|
item->data_size = * (ULONGEST *) attr->value.get ();
|
|
|
|
VEC_safe_push (lm_info_aix_p, *list, item);
|
|
}
|
|
|
|
/* Handle the start of a <library-list-aix> element. */
|
|
|
|
static void
|
|
library_list_start_list (struct gdb_xml_parser *parser,
|
|
const struct gdb_xml_element *element,
|
|
void *user_data,
|
|
std::vector<gdb_xml_value> &attributes)
|
|
{
|
|
char *version
|
|
= (char *) xml_find_attribute (attributes, "version")->value.get ();
|
|
|
|
if (strcmp (version, "1.0") != 0)
|
|
gdb_xml_error (parser,
|
|
_("Library list has unsupported version \"%s\""),
|
|
version);
|
|
}
|
|
|
|
/* Discard the constructed library list. */
|
|
|
|
static void
|
|
solib_aix_free_library_list (void *p)
|
|
{
|
|
VEC (lm_info_aix_p) **result = (VEC (lm_info_aix_p) **) p;
|
|
lm_info_aix *info;
|
|
int ix;
|
|
|
|
if (solib_aix_debug)
|
|
fprintf_unfiltered (gdb_stdlog, "DEBUG: solib_aix_free_library_list\n");
|
|
|
|
for (ix = 0; VEC_iterate (lm_info_aix_p, *result, ix, info); ix++)
|
|
delete info;
|
|
|
|
VEC_free (lm_info_aix_p, *result);
|
|
*result = NULL;
|
|
}
|
|
|
|
/* The allowed elements and attributes for an AIX library list
|
|
described in XML format. The root element is a <library-list-aix>. */
|
|
|
|
static const struct gdb_xml_attribute library_attributes[] =
|
|
{
|
|
{ "name", GDB_XML_AF_NONE, NULL, NULL },
|
|
{ "member", GDB_XML_AF_OPTIONAL, NULL, NULL },
|
|
{ "text_addr", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL },
|
|
{ "text_size", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL },
|
|
{ "data_addr", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL },
|
|
{ "data_size", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL },
|
|
{ NULL, GDB_XML_AF_NONE, NULL, NULL }
|
|
};
|
|
|
|
static const struct gdb_xml_element library_list_children[] =
|
|
{
|
|
{ "library", library_attributes, NULL,
|
|
GDB_XML_EF_REPEATABLE | GDB_XML_EF_OPTIONAL,
|
|
library_list_start_library, NULL},
|
|
{ NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL }
|
|
};
|
|
|
|
static const struct gdb_xml_attribute library_list_attributes[] =
|
|
{
|
|
{ "version", GDB_XML_AF_NONE, NULL, NULL },
|
|
{ NULL, GDB_XML_AF_NONE, NULL, NULL }
|
|
};
|
|
|
|
static const struct gdb_xml_element library_list_elements[] =
|
|
{
|
|
{ "library-list-aix", library_list_attributes, library_list_children,
|
|
GDB_XML_EF_NONE, library_list_start_list, NULL },
|
|
{ NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL }
|
|
};
|
|
|
|
/* Parse LIBRARY, a string containing the loader info in XML format,
|
|
and return an lm_info_aix_p vector.
|
|
|
|
Return NULL if the parsing failed. */
|
|
|
|
static VEC (lm_info_aix_p) *
|
|
solib_aix_parse_libraries (const char *library)
|
|
{
|
|
VEC (lm_info_aix_p) *result = NULL;
|
|
struct cleanup *back_to = make_cleanup (solib_aix_free_library_list,
|
|
&result);
|
|
|
|
if (gdb_xml_parse_quick (_("aix library list"), "library-list-aix.dtd",
|
|
library_list_elements, library, &result) == 0)
|
|
{
|
|
/* Parsed successfully, keep the result. */
|
|
discard_cleanups (back_to);
|
|
return result;
|
|
}
|
|
|
|
do_cleanups (back_to);
|
|
return NULL;
|
|
}
|
|
|
|
#endif /* HAVE_LIBEXPAT */
|
|
|
|
/* Return the loader info for the given inferior (INF), or NULL if
|
|
the list could not be computed.
|
|
|
|
Cache the result in per-inferior data, so as to avoid recomputing it
|
|
each time this function is called.
|
|
|
|
If an error occurs while computing this list, and WARNING_MSG
|
|
is not NULL, then print a warning including WARNING_MSG and
|
|
a description of the error. */
|
|
|
|
static VEC (lm_info_aix_p) *
|
|
solib_aix_get_library_list (struct inferior *inf, const char *warning_msg)
|
|
{
|
|
struct solib_aix_inferior_data *data;
|
|
|
|
/* If already computed, return the cached value. */
|
|
data = get_solib_aix_inferior_data (inf);
|
|
if (data->library_list != NULL)
|
|
return data->library_list;
|
|
|
|
gdb::optional<gdb::char_vector> library_document
|
|
= target_read_stralloc (target_stack, TARGET_OBJECT_LIBRARIES_AIX,
|
|
NULL);
|
|
if (!library_document && warning_msg != NULL)
|
|
{
|
|
warning (_("%s (failed to read TARGET_OBJECT_LIBRARIES_AIX)"),
|
|
warning_msg);
|
|
return NULL;
|
|
}
|
|
|
|
if (solib_aix_debug)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"DEBUG: TARGET_OBJECT_LIBRARIES_AIX = \n%s\n",
|
|
library_document->data ());
|
|
|
|
data->library_list = solib_aix_parse_libraries (library_document->data ());
|
|
if (data->library_list == NULL && warning_msg != NULL)
|
|
{
|
|
warning (_("%s (missing XML support?)"), warning_msg);
|
|
return NULL;
|
|
}
|
|
|
|
return data->library_list;
|
|
}
|
|
|
|
/* If the .bss section's VMA is set to an address located before
|
|
the end of the .data section, causing the two sections to overlap,
|
|
return the overlap in bytes. Otherwise, return zero.
|
|
|
|
Motivation:
|
|
|
|
The GNU linker sometimes sets the start address of the .bss session
|
|
before the end of the .data section, making the 2 sections overlap.
|
|
The loader appears to handle this situation gracefully, by simply
|
|
loading the bss section right after the end of the .data section.
|
|
|
|
This means that the .data and the .bss sections are sometimes
|
|
no longer relocated by the same amount. The problem is that
|
|
the ldinfo data does not contain any information regarding
|
|
the relocation of the .bss section, assuming that it would be
|
|
identical to the information provided for the .data section
|
|
(this is what would normally happen if the program was linked
|
|
correctly).
|
|
|
|
GDB therefore needs to detect those cases, and make the corresponding
|
|
adjustment to the .bss section offset computed from the ldinfo data
|
|
when necessary. This function returns the adjustment amount (or
|
|
zero when no adjustment is needed). */
|
|
|
|
static CORE_ADDR
|
|
solib_aix_bss_data_overlap (bfd *abfd)
|
|
{
|
|
struct bfd_section *data_sect, *bss_sect;
|
|
|
|
data_sect = bfd_get_section_by_name (abfd, ".data");
|
|
if (data_sect == NULL)
|
|
return 0; /* No overlap possible. */
|
|
|
|
bss_sect = bfd_get_section_by_name (abfd, ".bss");
|
|
if (bss_sect == NULL)
|
|
return 0; /* No overlap possible. */
|
|
|
|
/* Assume the problem only occurs with linkers that place the .bss
|
|
section after the .data section (the problem has only been
|
|
observed when using the GNU linker, and the default linker
|
|
script always places the .data and .bss sections in that order). */
|
|
if (bfd_section_vma (abfd, bss_sect)
|
|
< bfd_section_vma (abfd, data_sect))
|
|
return 0;
|
|
|
|
if (bfd_section_vma (abfd, bss_sect)
|
|
< bfd_section_vma (abfd, data_sect) + bfd_get_section_size (data_sect))
|
|
return ((bfd_section_vma (abfd, data_sect)
|
|
+ bfd_get_section_size (data_sect))
|
|
- bfd_section_vma (abfd, bss_sect));
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Implement the "relocate_section_addresses" target_so_ops method. */
|
|
|
|
static void
|
|
solib_aix_relocate_section_addresses (struct so_list *so,
|
|
struct target_section *sec)
|
|
{
|
|
struct bfd_section *bfd_sect = sec->the_bfd_section;
|
|
bfd *abfd = bfd_sect->owner;
|
|
const char *section_name = bfd_section_name (abfd, bfd_sect);
|
|
lm_info_aix *info = (lm_info_aix *) so->lm_info;
|
|
|
|
if (strcmp (section_name, ".text") == 0)
|
|
{
|
|
sec->addr = info->text_addr;
|
|
sec->endaddr = sec->addr + info->text_size;
|
|
|
|
/* The text address given to us by the loader contains
|
|
XCOFF headers, so we need to adjust by this much. */
|
|
sec->addr += bfd_sect->filepos;
|
|
}
|
|
else if (strcmp (section_name, ".data") == 0)
|
|
{
|
|
sec->addr = info->data_addr;
|
|
sec->endaddr = sec->addr + info->data_size;
|
|
}
|
|
else if (strcmp (section_name, ".bss") == 0)
|
|
{
|
|
/* The information provided by the loader does not include
|
|
the address of the .bss section, but we know that it gets
|
|
relocated by the same offset as the .data section. So,
|
|
compute the relocation offset for the .data section, and
|
|
apply it to the .bss section as well. If the .data section
|
|
is not defined (which seems highly unlikely), do our best
|
|
by assuming no relocation. */
|
|
struct bfd_section *data_sect
|
|
= bfd_get_section_by_name (abfd, ".data");
|
|
CORE_ADDR data_offset = 0;
|
|
|
|
if (data_sect != NULL)
|
|
data_offset = info->data_addr - bfd_section_vma (abfd, data_sect);
|
|
|
|
sec->addr = bfd_section_vma (abfd, bfd_sect) + data_offset;
|
|
sec->addr += solib_aix_bss_data_overlap (abfd);
|
|
sec->endaddr = sec->addr + bfd_section_size (abfd, bfd_sect);
|
|
}
|
|
else
|
|
{
|
|
/* All other sections should not be relocated. */
|
|
sec->addr = bfd_section_vma (abfd, bfd_sect);
|
|
sec->endaddr = sec->addr + bfd_section_size (abfd, bfd_sect);
|
|
}
|
|
}
|
|
|
|
/* Implement the "free_so" target_so_ops method. */
|
|
|
|
static void
|
|
solib_aix_free_so (struct so_list *so)
|
|
{
|
|
lm_info_aix *li = (lm_info_aix *) so->lm_info;
|
|
|
|
if (solib_aix_debug)
|
|
fprintf_unfiltered (gdb_stdlog, "DEBUG: solib_aix_free_so (%s)\n",
|
|
so->so_name);
|
|
|
|
delete li;
|
|
}
|
|
|
|
/* Implement the "clear_solib" target_so_ops method. */
|
|
|
|
static void
|
|
solib_aix_clear_solib (void)
|
|
{
|
|
/* Nothing needed. */
|
|
}
|
|
|
|
/* Compute and return the OBJFILE's section_offset array, using
|
|
the associated loader info (INFO).
|
|
|
|
The resulting array is computed on the heap and must be
|
|
deallocated after use. */
|
|
|
|
static struct section_offsets *
|
|
solib_aix_get_section_offsets (struct objfile *objfile,
|
|
lm_info_aix *info)
|
|
{
|
|
struct section_offsets *offsets;
|
|
bfd *abfd = objfile->obfd;
|
|
|
|
offsets = XCNEWVEC (struct section_offsets, objfile->num_sections);
|
|
|
|
/* .text */
|
|
|
|
if (objfile->sect_index_text != -1)
|
|
{
|
|
struct bfd_section *sect
|
|
= objfile->sections[objfile->sect_index_text].the_bfd_section;
|
|
|
|
offsets->offsets[objfile->sect_index_text]
|
|
= info->text_addr + sect->filepos - bfd_section_vma (abfd, sect);
|
|
}
|
|
|
|
/* .data */
|
|
|
|
if (objfile->sect_index_data != -1)
|
|
{
|
|
struct bfd_section *sect
|
|
= objfile->sections[objfile->sect_index_data].the_bfd_section;
|
|
|
|
offsets->offsets[objfile->sect_index_data]
|
|
= info->data_addr - bfd_section_vma (abfd, sect);
|
|
}
|
|
|
|
/* .bss
|
|
|
|
The offset of the .bss section should be identical to the offset
|
|
of the .data section. If no .data section (which seems hard to
|
|
believe it is possible), assume it is zero. */
|
|
|
|
if (objfile->sect_index_bss != -1
|
|
&& objfile->sect_index_data != -1)
|
|
{
|
|
offsets->offsets[objfile->sect_index_bss]
|
|
= (offsets->offsets[objfile->sect_index_data]
|
|
+ solib_aix_bss_data_overlap (abfd));
|
|
}
|
|
|
|
/* All other sections should not need relocation. */
|
|
|
|
return offsets;
|
|
}
|
|
|
|
/* Implement the "solib_create_inferior_hook" target_so_ops method. */
|
|
|
|
static void
|
|
solib_aix_solib_create_inferior_hook (int from_tty)
|
|
{
|
|
const char *warning_msg = "unable to relocate main executable";
|
|
VEC (lm_info_aix_p) *library_list;
|
|
lm_info_aix *exec_info;
|
|
|
|
/* We need to relocate the main executable... */
|
|
|
|
library_list = solib_aix_get_library_list (current_inferior (),
|
|
warning_msg);
|
|
if (library_list == NULL)
|
|
return; /* Warning already printed. */
|
|
|
|
if (VEC_length (lm_info_aix_p, library_list) < 1)
|
|
{
|
|
warning (_("unable to relocate main executable (no info from loader)"));
|
|
return;
|
|
}
|
|
|
|
exec_info = VEC_index (lm_info_aix_p, library_list, 0);
|
|
|
|
if (symfile_objfile != NULL)
|
|
{
|
|
struct section_offsets *offsets
|
|
= solib_aix_get_section_offsets (symfile_objfile, exec_info);
|
|
struct cleanup *cleanup = make_cleanup (xfree, offsets);
|
|
|
|
objfile_relocate (symfile_objfile, offsets);
|
|
do_cleanups (cleanup);
|
|
}
|
|
}
|
|
|
|
/* Implement the "current_sos" target_so_ops method. */
|
|
|
|
static struct so_list *
|
|
solib_aix_current_sos (void)
|
|
{
|
|
struct so_list *start = NULL, *last = NULL;
|
|
VEC (lm_info_aix_p) *library_list;
|
|
lm_info_aix *info;
|
|
int ix;
|
|
|
|
library_list = solib_aix_get_library_list (current_inferior (), NULL);
|
|
if (library_list == NULL)
|
|
return NULL;
|
|
|
|
/* Build a struct so_list for each entry on the list.
|
|
We skip the first entry, since this is the entry corresponding
|
|
to the main executable, not a shared library. */
|
|
for (ix = 1; VEC_iterate (lm_info_aix_p, library_list, ix, info); ix++)
|
|
{
|
|
struct so_list *new_solib = XCNEW (struct so_list);
|
|
std::string so_name;
|
|
|
|
if (info->member_name.empty ())
|
|
{
|
|
/* INFO->FILENAME is probably not an archive, but rather
|
|
a shared object. Unusual, but it should be possible
|
|
to link a program against a shared object directory,
|
|
without having to put it in an archive first. */
|
|
so_name = info->filename;
|
|
}
|
|
else
|
|
{
|
|
/* This is the usual case on AIX, where the shared object
|
|
is a member of an archive. Create a synthetic so_name
|
|
that follows the same convention as AIX's ldd tool
|
|
(Eg: "/lib/libc.a(shr.o)"). */
|
|
so_name = string_printf ("%s(%s)", info->filename.c_str (),
|
|
info->member_name.c_str ());
|
|
}
|
|
strncpy (new_solib->so_original_name, so_name.c_str (),
|
|
SO_NAME_MAX_PATH_SIZE - 1);
|
|
new_solib->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
|
|
memcpy (new_solib->so_name, new_solib->so_original_name,
|
|
SO_NAME_MAX_PATH_SIZE);
|
|
new_solib->lm_info = new lm_info_aix (*info);
|
|
|
|
/* Add it to the list. */
|
|
if (!start)
|
|
last = start = new_solib;
|
|
else
|
|
{
|
|
last->next = new_solib;
|
|
last = new_solib;
|
|
}
|
|
}
|
|
|
|
return start;
|
|
}
|
|
|
|
/* Implement the "open_symbol_file_object" target_so_ops method. */
|
|
|
|
static int
|
|
solib_aix_open_symbol_file_object (int from_tty)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
/* Implement the "in_dynsym_resolve_code" target_so_ops method. */
|
|
|
|
static int
|
|
solib_aix_in_dynsym_resolve_code (CORE_ADDR pc)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
/* Implement the "bfd_open" target_so_ops method. */
|
|
|
|
static gdb_bfd_ref_ptr
|
|
solib_aix_bfd_open (const char *pathname)
|
|
{
|
|
/* The pathname is actually a synthetic filename with the following
|
|
form: "/path/to/sharedlib(member.o)" (double-quotes excluded).
|
|
split this into archive name and member name.
|
|
|
|
FIXME: This is a little hacky. Perhaps we should provide access
|
|
to the solib's lm_info here? */
|
|
const int path_len = strlen (pathname);
|
|
const char *sep;
|
|
int filename_len;
|
|
int found_file;
|
|
|
|
if (pathname[path_len - 1] != ')')
|
|
return solib_bfd_open (pathname);
|
|
|
|
/* Search for the associated parens. */
|
|
sep = strrchr (pathname, '(');
|
|
if (sep == NULL)
|
|
{
|
|
/* Should never happen, but recover as best as we can (trying
|
|
to open pathname without decoding, possibly leading to
|
|
a failure), rather than triggering an assert failure). */
|
|
warning (_("missing '(' in shared object pathname: %s"), pathname);
|
|
return solib_bfd_open (pathname);
|
|
}
|
|
filename_len = sep - pathname;
|
|
|
|
std::string filename (string_printf ("%.*s", filename_len, pathname));
|
|
std::string member_name (string_printf ("%.*s", path_len - filename_len - 2,
|
|
sep + 1));
|
|
|
|
/* Calling solib_find makes certain that sysroot path is set properly
|
|
if program has a dependency on .a archive and sysroot is set via
|
|
set sysroot command. */
|
|
gdb::unique_xmalloc_ptr<char> found_pathname
|
|
= solib_find (filename.c_str (), &found_file);
|
|
if (found_pathname == NULL)
|
|
perror_with_name (pathname);
|
|
gdb_bfd_ref_ptr archive_bfd (solib_bfd_fopen (found_pathname.get (),
|
|
found_file));
|
|
if (archive_bfd == NULL)
|
|
{
|
|
warning (_("Could not open `%s' as an executable file: %s"),
|
|
filename.c_str (), bfd_errmsg (bfd_get_error ()));
|
|
return NULL;
|
|
}
|
|
|
|
if (bfd_check_format (archive_bfd.get (), bfd_object))
|
|
return archive_bfd;
|
|
|
|
if (! bfd_check_format (archive_bfd.get (), bfd_archive))
|
|
{
|
|
warning (_("\"%s\": not in executable format: %s."),
|
|
filename.c_str (), bfd_errmsg (bfd_get_error ()));
|
|
return NULL;
|
|
}
|
|
|
|
gdb_bfd_ref_ptr object_bfd
|
|
(gdb_bfd_openr_next_archived_file (archive_bfd.get (), NULL));
|
|
while (object_bfd != NULL)
|
|
{
|
|
if (member_name == object_bfd->filename)
|
|
break;
|
|
|
|
object_bfd = gdb_bfd_openr_next_archived_file (archive_bfd.get (),
|
|
object_bfd.get ());
|
|
}
|
|
|
|
if (object_bfd == NULL)
|
|
{
|
|
warning (_("\"%s\": member \"%s\" missing."), filename.c_str (),
|
|
member_name.c_str ());
|
|
return NULL;
|
|
}
|
|
|
|
if (! bfd_check_format (object_bfd.get (), bfd_object))
|
|
{
|
|
warning (_("%s(%s): not in object format: %s."),
|
|
filename.c_str (), member_name.c_str (),
|
|
bfd_errmsg (bfd_get_error ()));
|
|
return NULL;
|
|
}
|
|
|
|
/* Override the returned bfd's name with the name returned from solib_find
|
|
along with appended parenthesized member name in order to allow commands
|
|
listing all shared libraries to display. Otherwise, we would only be
|
|
displaying the name of the archive member object. */
|
|
xfree (bfd_get_filename (object_bfd.get ()));
|
|
object_bfd->filename = xstrprintf ("%s%s",
|
|
bfd_get_filename (archive_bfd.get ()),
|
|
sep);
|
|
|
|
return object_bfd;
|
|
}
|
|
|
|
/* Return the obj_section corresponding to OBJFILE's data section,
|
|
or NULL if not found. */
|
|
/* FIXME: Define in a more general location? */
|
|
|
|
static struct obj_section *
|
|
data_obj_section_from_objfile (struct objfile *objfile)
|
|
{
|
|
struct obj_section *osect;
|
|
|
|
ALL_OBJFILE_OSECTIONS (objfile, osect)
|
|
if (strcmp (bfd_section_name (objfile->obfd, osect->the_bfd_section),
|
|
".data") == 0)
|
|
return osect;
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/* Return the TOC value corresponding to the given PC address,
|
|
or raise an error if the value could not be determined. */
|
|
|
|
CORE_ADDR
|
|
solib_aix_get_toc_value (CORE_ADDR pc)
|
|
{
|
|
struct obj_section *pc_osect = find_pc_section (pc);
|
|
struct obj_section *data_osect;
|
|
CORE_ADDR result;
|
|
|
|
if (pc_osect == NULL)
|
|
error (_("unable to find TOC entry for pc %s "
|
|
"(no section contains this PC)"),
|
|
core_addr_to_string (pc));
|
|
|
|
data_osect = data_obj_section_from_objfile (pc_osect->objfile);
|
|
if (data_osect == NULL)
|
|
error (_("unable to find TOC entry for pc %s "
|
|
"(%s has no data section)"),
|
|
core_addr_to_string (pc), objfile_name (pc_osect->objfile));
|
|
|
|
result = (obj_section_addr (data_osect)
|
|
+ xcoff_get_toc_offset (pc_osect->objfile));
|
|
if (solib_aix_debug)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"DEBUG: solib_aix_get_toc_value (pc=%s) -> %s\n",
|
|
core_addr_to_string (pc),
|
|
core_addr_to_string (result));
|
|
|
|
return result;
|
|
}
|
|
|
|
/* This module's normal_stop observer. */
|
|
|
|
static void
|
|
solib_aix_normal_stop_observer (struct bpstats *unused_1, int unused_2)
|
|
{
|
|
struct solib_aix_inferior_data *data
|
|
= get_solib_aix_inferior_data (current_inferior ());
|
|
|
|
/* The inferior execution has been resumed, and it just stopped
|
|
again. This means that the list of shared libraries may have
|
|
evolved. Reset our cached value. */
|
|
solib_aix_free_library_list (&data->library_list);
|
|
}
|
|
|
|
/* Implements the "show debug aix-solib" command. */
|
|
|
|
static void
|
|
show_solib_aix_debug (struct ui_file *file, int from_tty,
|
|
struct cmd_list_element *c, const char *value)
|
|
{
|
|
fprintf_filtered (file, _("solib-aix debugging is %s.\n"), value);
|
|
}
|
|
|
|
/* The target_so_ops for AIX targets. */
|
|
struct target_so_ops solib_aix_so_ops;
|
|
|
|
void
|
|
_initialize_solib_aix (void)
|
|
{
|
|
solib_aix_so_ops.relocate_section_addresses
|
|
= solib_aix_relocate_section_addresses;
|
|
solib_aix_so_ops.free_so = solib_aix_free_so;
|
|
solib_aix_so_ops.clear_solib = solib_aix_clear_solib;
|
|
solib_aix_so_ops.solib_create_inferior_hook
|
|
= solib_aix_solib_create_inferior_hook;
|
|
solib_aix_so_ops.current_sos = solib_aix_current_sos;
|
|
solib_aix_so_ops.open_symbol_file_object
|
|
= solib_aix_open_symbol_file_object;
|
|
solib_aix_so_ops.in_dynsym_resolve_code
|
|
= solib_aix_in_dynsym_resolve_code;
|
|
solib_aix_so_ops.bfd_open = solib_aix_bfd_open;
|
|
|
|
solib_aix_inferior_data_handle = register_inferior_data ();
|
|
|
|
gdb::observers::normal_stop.attach (solib_aix_normal_stop_observer);
|
|
|
|
/* Debug this file's internals. */
|
|
add_setshow_boolean_cmd ("aix-solib", class_maintenance,
|
|
&solib_aix_debug, _("\
|
|
Control the debugging traces for the solib-aix module."), _("\
|
|
Show whether solib-aix debugging traces are enabled."), _("\
|
|
When on, solib-aix debugging traces are enabled."),
|
|
NULL,
|
|
show_solib_aix_debug,
|
|
&setdebuglist, &showdebuglist);
|
|
}
|