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.
1886 lines
54 KiB
C
1886 lines
54 KiB
C
/* Low level interface for debugging AIX 4.3+ pthreads.
|
|
|
|
Copyright (C) 1999-2018 Free Software Foundation, Inc.
|
|
Written by Nick Duffek <nsd@redhat.com>.
|
|
|
|
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/>. */
|
|
|
|
|
|
/* This module uses the libpthdebug.a library provided by AIX 4.3+ for
|
|
debugging pthread applications.
|
|
|
|
Some name prefix conventions:
|
|
pthdb_ provided by libpthdebug.a
|
|
pdc_ callbacks that this module provides to libpthdebug.a
|
|
pd_ variables or functions interfacing with libpthdebug.a
|
|
|
|
libpthdebug peculiarities:
|
|
|
|
- pthdb_ptid_pthread() is prototyped in <sys/pthdebug.h>, but
|
|
it's not documented, and after several calls it stops working
|
|
and causes other libpthdebug functions to fail.
|
|
|
|
- pthdb_tid_pthread() doesn't always work after
|
|
pthdb_session_update(), but it does work after cycling through
|
|
all threads using pthdb_pthread().
|
|
|
|
*/
|
|
|
|
#include "defs.h"
|
|
#include "gdbthread.h"
|
|
#include "target.h"
|
|
#include "inferior.h"
|
|
#include "regcache.h"
|
|
#include "gdbcmd.h"
|
|
#include "ppc-tdep.h"
|
|
#include "observable.h"
|
|
#include "objfiles.h"
|
|
|
|
#include <procinfo.h>
|
|
#include <sys/types.h>
|
|
#include <sys/ptrace.h>
|
|
#include <sys/reg.h>
|
|
#include <sched.h>
|
|
#include <sys/pthdebug.h>
|
|
|
|
#if !HAVE_DECL_GETTHRDS
|
|
extern int getthrds (pid_t, struct thrdsinfo64 *, int, tid_t *, int);
|
|
#endif
|
|
|
|
/* Whether to emit debugging output. */
|
|
static int debug_aix_thread;
|
|
|
|
/* In AIX 5.1, functions use pthdb_tid_t instead of tid_t. */
|
|
#ifndef PTHDB_VERSION_3
|
|
#define pthdb_tid_t tid_t
|
|
#endif
|
|
|
|
/* Return whether to treat PID as a debuggable thread id. */
|
|
|
|
#define PD_TID(ptid) (pd_active && ptid_get_tid (ptid) != 0)
|
|
|
|
/* pthdb_user_t value that we pass to pthdb functions. 0 causes
|
|
PTHDB_BAD_USER errors, so use 1. */
|
|
|
|
#define PD_USER 1
|
|
|
|
/* Success and failure values returned by pthdb callbacks. */
|
|
|
|
#define PDC_SUCCESS PTHDB_SUCCESS
|
|
#define PDC_FAILURE PTHDB_CALLBACK
|
|
|
|
/* Private data attached to each element in GDB's thread list. */
|
|
|
|
struct aix_thread_info : public private_thread_info
|
|
{
|
|
pthdb_pthread_t pdtid; /* thread's libpthdebug id */
|
|
pthdb_tid_t tid; /* kernel thread id */
|
|
};
|
|
|
|
/* Return the aix_thread_info attached to THREAD. */
|
|
|
|
static aix_thread_info *
|
|
get_aix_thread_info (thread_info *thread)
|
|
{
|
|
return static_cast<aix_thread_info *> (thread->priv.get ());
|
|
}
|
|
|
|
/* Information about a thread of which libpthdebug is aware. */
|
|
|
|
struct pd_thread {
|
|
pthdb_pthread_t pdtid;
|
|
pthread_t pthid;
|
|
pthdb_tid_t tid;
|
|
};
|
|
|
|
/* This module's target-specific operations, active while pd_able is true. */
|
|
|
|
class aix_thread_target final : public target_ops
|
|
{
|
|
public:
|
|
aix_thread_target ()
|
|
{ to_stratum = thread_stratum; }
|
|
|
|
const char *shortname () override
|
|
{ return "aix-threads"; }
|
|
const char *longname () override
|
|
{ return _("AIX pthread support"); }
|
|
const char *doc () override
|
|
{ return _("AIX pthread support"); }
|
|
|
|
void detach (inferior *, int) override;
|
|
void resume (ptid_t, int, enum gdb_signal) override;
|
|
ptid_t wait (ptid_t, struct target_waitstatus *, int) override;
|
|
|
|
void fetch_registers (struct regcache *, int) override;
|
|
void store_registers (struct regcache *, int) override;
|
|
|
|
enum target_xfer_status xfer_partial (enum target_object object,
|
|
const char *annex,
|
|
gdb_byte *readbuf,
|
|
const gdb_byte *writebuf,
|
|
ULONGEST offset, ULONGEST len,
|
|
ULONGEST *xfered_len) override;
|
|
|
|
void mourn_inferior () override;
|
|
|
|
int thread_alive (ptid_t ptid) override;
|
|
|
|
const char *pid_to_str (ptid_t) override;
|
|
|
|
const char *extra_thread_info (struct thread_info *) override;
|
|
|
|
ptid_t get_ada_task_ptid (long lwp, long thread) override;
|
|
};
|
|
|
|
static aix_thread_target aix_thread_ops;
|
|
|
|
/* Address of the function that libpthread will call when libpthdebug
|
|
is ready to be initialized. */
|
|
|
|
static CORE_ADDR pd_brk_addr;
|
|
|
|
/* Whether the current application is debuggable by pthdb. */
|
|
|
|
static int pd_able = 0;
|
|
|
|
/* Whether a threaded application is being debugged. */
|
|
|
|
static int pd_active = 0;
|
|
|
|
/* Whether the current architecture is 64-bit.
|
|
Only valid when pd_able is true. */
|
|
|
|
static int arch64;
|
|
|
|
/* Forward declarations for pthdb callbacks. */
|
|
|
|
static int pdc_symbol_addrs (pthdb_user_t, pthdb_symbol_t *, int);
|
|
static int pdc_read_data (pthdb_user_t, void *, pthdb_addr_t, size_t);
|
|
static int pdc_write_data (pthdb_user_t, void *, pthdb_addr_t, size_t);
|
|
static int pdc_read_regs (pthdb_user_t user, pthdb_tid_t tid,
|
|
unsigned long long flags,
|
|
pthdb_context_t *context);
|
|
static int pdc_write_regs (pthdb_user_t user, pthdb_tid_t tid,
|
|
unsigned long long flags,
|
|
pthdb_context_t *context);
|
|
static int pdc_alloc (pthdb_user_t, size_t, void **);
|
|
static int pdc_realloc (pthdb_user_t, void *, size_t, void **);
|
|
static int pdc_dealloc (pthdb_user_t, void *);
|
|
|
|
/* pthdb callbacks. */
|
|
|
|
static pthdb_callbacks_t pd_callbacks = {
|
|
pdc_symbol_addrs,
|
|
pdc_read_data,
|
|
pdc_write_data,
|
|
pdc_read_regs,
|
|
pdc_write_regs,
|
|
pdc_alloc,
|
|
pdc_realloc,
|
|
pdc_dealloc,
|
|
NULL
|
|
};
|
|
|
|
/* Current pthdb session. */
|
|
|
|
static pthdb_session_t pd_session;
|
|
|
|
/* Return a printable representation of pthdebug function return
|
|
STATUS. */
|
|
|
|
static const char *
|
|
pd_status2str (int status)
|
|
{
|
|
switch (status)
|
|
{
|
|
case PTHDB_SUCCESS: return "SUCCESS";
|
|
case PTHDB_NOSYS: return "NOSYS";
|
|
case PTHDB_NOTSUP: return "NOTSUP";
|
|
case PTHDB_BAD_VERSION: return "BAD_VERSION";
|
|
case PTHDB_BAD_USER: return "BAD_USER";
|
|
case PTHDB_BAD_SESSION: return "BAD_SESSION";
|
|
case PTHDB_BAD_MODE: return "BAD_MODE";
|
|
case PTHDB_BAD_FLAGS: return "BAD_FLAGS";
|
|
case PTHDB_BAD_CALLBACK: return "BAD_CALLBACK";
|
|
case PTHDB_BAD_POINTER: return "BAD_POINTER";
|
|
case PTHDB_BAD_CMD: return "BAD_CMD";
|
|
case PTHDB_BAD_PTHREAD: return "BAD_PTHREAD";
|
|
case PTHDB_BAD_ATTR: return "BAD_ATTR";
|
|
case PTHDB_BAD_MUTEX: return "BAD_MUTEX";
|
|
case PTHDB_BAD_MUTEXATTR: return "BAD_MUTEXATTR";
|
|
case PTHDB_BAD_COND: return "BAD_COND";
|
|
case PTHDB_BAD_CONDATTR: return "BAD_CONDATTR";
|
|
case PTHDB_BAD_RWLOCK: return "BAD_RWLOCK";
|
|
case PTHDB_BAD_RWLOCKATTR: return "BAD_RWLOCKATTR";
|
|
case PTHDB_BAD_KEY: return "BAD_KEY";
|
|
case PTHDB_BAD_PTID: return "BAD_PTID";
|
|
case PTHDB_BAD_TID: return "BAD_TID";
|
|
case PTHDB_CALLBACK: return "CALLBACK";
|
|
case PTHDB_CONTEXT: return "CONTEXT";
|
|
case PTHDB_HELD: return "HELD";
|
|
case PTHDB_NOT_HELD: return "NOT_HELD";
|
|
case PTHDB_MEMORY: return "MEMORY";
|
|
case PTHDB_NOT_PTHREADED: return "NOT_PTHREADED";
|
|
case PTHDB_SYMBOL: return "SYMBOL";
|
|
case PTHDB_NOT_AVAIL: return "NOT_AVAIL";
|
|
case PTHDB_INTERNAL: return "INTERNAL";
|
|
default: return "UNKNOWN";
|
|
}
|
|
}
|
|
|
|
/* A call to ptrace(REQ, ID, ...) just returned RET. Check for
|
|
exceptional conditions and either return nonlocally or else return
|
|
1 for success and 0 for failure. */
|
|
|
|
static int
|
|
ptrace_check (int req, int id, int ret)
|
|
{
|
|
if (ret == 0 && !errno)
|
|
return 1;
|
|
|
|
/* According to ptrace(2), ptrace may fail with EPERM if "the
|
|
Identifier parameter corresponds to a kernel thread which is
|
|
stopped in kernel mode and whose computational state cannot be
|
|
read or written." This happens quite often with register reads. */
|
|
|
|
switch (req)
|
|
{
|
|
case PTT_READ_GPRS:
|
|
case PTT_READ_FPRS:
|
|
case PTT_READ_SPRS:
|
|
if (ret == -1 && errno == EPERM)
|
|
{
|
|
if (debug_aix_thread)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"ptrace (%d, %d) = %d (errno = %d)\n",
|
|
req, id, ret, errno);
|
|
return ret == -1 ? 0 : 1;
|
|
}
|
|
break;
|
|
}
|
|
error (_("aix-thread: ptrace (%d, %d) returned %d (errno = %d %s)"),
|
|
req, id, ret, errno, safe_strerror (errno));
|
|
return 0; /* Not reached. */
|
|
}
|
|
|
|
/* Call ptracex (REQ, ID, ADDR, DATA, BUF) or
|
|
ptrace64 (REQ, ID, ADDR, DATA, BUF) if HAVE_PTRACE64.
|
|
Return success. */
|
|
|
|
#ifdef HAVE_PTRACE64
|
|
# define ptracex(request, pid, addr, data, buf) \
|
|
ptrace64 (request, pid, addr, data, buf)
|
|
#endif
|
|
|
|
static int
|
|
ptrace64aix (int req, int id, long long addr, int data, int *buf)
|
|
{
|
|
errno = 0;
|
|
return ptrace_check (req, id, ptracex (req, id, addr, data, buf));
|
|
}
|
|
|
|
/* Call ptrace (REQ, ID, ADDR, DATA, BUF) or
|
|
ptrace64 (REQ, ID, ADDR, DATA, BUF) if HAVE_PTRACE64.
|
|
Return success. */
|
|
|
|
#ifdef HAVE_PTRACE64
|
|
# define ptrace(request, pid, addr, data, buf) \
|
|
ptrace64 (request, pid, addr, data, buf)
|
|
# define addr_ptr long long
|
|
#else
|
|
# define addr_ptr int *
|
|
#endif
|
|
|
|
static int
|
|
ptrace32 (int req, int id, addr_ptr addr, int data, int *buf)
|
|
{
|
|
errno = 0;
|
|
return ptrace_check (req, id,
|
|
ptrace (req, id, addr, data, buf));
|
|
}
|
|
|
|
/* If *PIDP is a composite process/thread id, convert it to a
|
|
process id. */
|
|
|
|
static void
|
|
pid_to_prc (ptid_t *ptidp)
|
|
{
|
|
ptid_t ptid;
|
|
|
|
ptid = *ptidp;
|
|
if (PD_TID (ptid))
|
|
*ptidp = pid_to_ptid (ptid_get_pid (ptid));
|
|
}
|
|
|
|
/* pthdb callback: for <i> from 0 to COUNT, set SYMBOLS[<i>].addr to
|
|
the address of SYMBOLS[<i>].name. */
|
|
|
|
static int
|
|
pdc_symbol_addrs (pthdb_user_t user, pthdb_symbol_t *symbols, int count)
|
|
{
|
|
struct bound_minimal_symbol ms;
|
|
int i;
|
|
char *name;
|
|
|
|
if (debug_aix_thread)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"pdc_symbol_addrs (user = %ld, symbols = 0x%lx, count = %d)\n",
|
|
user, (long) symbols, count);
|
|
|
|
for (i = 0; i < count; i++)
|
|
{
|
|
name = symbols[i].name;
|
|
if (debug_aix_thread)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
" symbols[%d].name = \"%s\"\n", i, name);
|
|
|
|
if (!*name)
|
|
symbols[i].addr = 0;
|
|
else
|
|
{
|
|
ms = lookup_minimal_symbol (name, NULL, NULL);
|
|
if (ms.minsym == NULL)
|
|
{
|
|
if (debug_aix_thread)
|
|
fprintf_unfiltered (gdb_stdlog, " returning PDC_FAILURE\n");
|
|
return PDC_FAILURE;
|
|
}
|
|
symbols[i].addr = BMSYMBOL_VALUE_ADDRESS (ms);
|
|
}
|
|
if (debug_aix_thread)
|
|
fprintf_unfiltered (gdb_stdlog, " symbols[%d].addr = %s\n",
|
|
i, hex_string (symbols[i].addr));
|
|
}
|
|
if (debug_aix_thread)
|
|
fprintf_unfiltered (gdb_stdlog, " returning PDC_SUCCESS\n");
|
|
return PDC_SUCCESS;
|
|
}
|
|
|
|
/* Read registers call back function should be able to read the
|
|
context information of a debuggee kernel thread from an active
|
|
process or from a core file. The information should be formatted
|
|
in context64 form for both 32-bit and 64-bit process.
|
|
If successful return 0, else non-zero is returned. */
|
|
|
|
static int
|
|
pdc_read_regs (pthdb_user_t user,
|
|
pthdb_tid_t tid,
|
|
unsigned long long flags,
|
|
pthdb_context_t *context)
|
|
{
|
|
/* This function doesn't appear to be used, so we could probably
|
|
just return 0 here. HOWEVER, if it is not defined, the OS will
|
|
complain and several thread debug functions will fail. In case
|
|
this is needed, I have implemented what I think it should do,
|
|
however this code is untested. */
|
|
|
|
uint64_t gprs64[ppc_num_gprs];
|
|
uint32_t gprs32[ppc_num_gprs];
|
|
double fprs[ppc_num_fprs];
|
|
struct ptxsprs sprs64;
|
|
struct ptsprs sprs32;
|
|
|
|
if (debug_aix_thread)
|
|
fprintf_unfiltered (gdb_stdlog, "pdc_read_regs tid=%d flags=%s\n",
|
|
(int) tid, hex_string (flags));
|
|
|
|
/* General-purpose registers. */
|
|
if (flags & PTHDB_FLAG_GPRS)
|
|
{
|
|
if (arch64)
|
|
{
|
|
if (!ptrace64aix (PTT_READ_GPRS, tid,
|
|
(unsigned long) gprs64, 0, NULL))
|
|
memset (gprs64, 0, sizeof (gprs64));
|
|
memcpy (context->gpr, gprs64, sizeof(gprs64));
|
|
}
|
|
else
|
|
{
|
|
if (!ptrace32 (PTT_READ_GPRS, tid, (uintptr_t) gprs32, 0, NULL))
|
|
memset (gprs32, 0, sizeof (gprs32));
|
|
memcpy (context->gpr, gprs32, sizeof(gprs32));
|
|
}
|
|
}
|
|
|
|
/* Floating-point registers. */
|
|
if (flags & PTHDB_FLAG_FPRS)
|
|
{
|
|
if (!ptrace32 (PTT_READ_FPRS, tid, (uintptr_t) fprs, 0, NULL))
|
|
memset (fprs, 0, sizeof (fprs));
|
|
memcpy (context->fpr, fprs, sizeof(fprs));
|
|
}
|
|
|
|
/* Special-purpose registers. */
|
|
if (flags & PTHDB_FLAG_SPRS)
|
|
{
|
|
if (arch64)
|
|
{
|
|
if (!ptrace64aix (PTT_READ_SPRS, tid,
|
|
(unsigned long) &sprs64, 0, NULL))
|
|
memset (&sprs64, 0, sizeof (sprs64));
|
|
memcpy (&context->msr, &sprs64, sizeof(sprs64));
|
|
}
|
|
else
|
|
{
|
|
if (!ptrace32 (PTT_READ_SPRS, tid, (uintptr_t) &sprs32, 0, NULL))
|
|
memset (&sprs32, 0, sizeof (sprs32));
|
|
memcpy (&context->msr, &sprs32, sizeof(sprs32));
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* Write register function should be able to write requested context
|
|
information to specified debuggee's kernel thread id.
|
|
If successful return 0, else non-zero is returned. */
|
|
|
|
static int
|
|
pdc_write_regs (pthdb_user_t user,
|
|
pthdb_tid_t tid,
|
|
unsigned long long flags,
|
|
pthdb_context_t *context)
|
|
{
|
|
/* This function doesn't appear to be used, so we could probably
|
|
just return 0 here. HOWEVER, if it is not defined, the OS will
|
|
complain and several thread debug functions will fail. In case
|
|
this is needed, I have implemented what I think it should do,
|
|
however this code is untested. */
|
|
|
|
if (debug_aix_thread)
|
|
fprintf_unfiltered (gdb_stdlog, "pdc_write_regs tid=%d flags=%s\n",
|
|
(int) tid, hex_string (flags));
|
|
|
|
/* General-purpose registers. */
|
|
if (flags & PTHDB_FLAG_GPRS)
|
|
{
|
|
if (arch64)
|
|
ptrace64aix (PTT_WRITE_GPRS, tid,
|
|
(unsigned long) context->gpr, 0, NULL);
|
|
else
|
|
ptrace32 (PTT_WRITE_GPRS, tid, (uintptr_t) context->gpr, 0, NULL);
|
|
}
|
|
|
|
/* Floating-point registers. */
|
|
if (flags & PTHDB_FLAG_FPRS)
|
|
{
|
|
ptrace32 (PTT_WRITE_FPRS, tid, (uintptr_t) context->fpr, 0, NULL);
|
|
}
|
|
|
|
/* Special-purpose registers. */
|
|
if (flags & PTHDB_FLAG_SPRS)
|
|
{
|
|
if (arch64)
|
|
{
|
|
ptrace64aix (PTT_WRITE_SPRS, tid,
|
|
(unsigned long) &context->msr, 0, NULL);
|
|
}
|
|
else
|
|
{
|
|
ptrace32 (PTT_WRITE_SPRS, tid, (uintptr_t) &context->msr, 0, NULL);
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* pthdb callback: read LEN bytes from process ADDR into BUF. */
|
|
|
|
static int
|
|
pdc_read_data (pthdb_user_t user, void *buf,
|
|
pthdb_addr_t addr, size_t len)
|
|
{
|
|
int status, ret;
|
|
|
|
if (debug_aix_thread)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"pdc_read_data (user = %ld, buf = 0x%lx, addr = %s, len = %ld)\n",
|
|
user, (long) buf, hex_string (addr), len);
|
|
|
|
status = target_read_memory (addr, (gdb_byte *) buf, len);
|
|
ret = status == 0 ? PDC_SUCCESS : PDC_FAILURE;
|
|
|
|
if (debug_aix_thread)
|
|
fprintf_unfiltered (gdb_stdlog, " status=%d, returning %s\n",
|
|
status, pd_status2str (ret));
|
|
return ret;
|
|
}
|
|
|
|
/* pthdb callback: write LEN bytes from BUF to process ADDR. */
|
|
|
|
static int
|
|
pdc_write_data (pthdb_user_t user, void *buf,
|
|
pthdb_addr_t addr, size_t len)
|
|
{
|
|
int status, ret;
|
|
|
|
if (debug_aix_thread)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"pdc_write_data (user = %ld, buf = 0x%lx, addr = %s, len = %ld)\n",
|
|
user, (long) buf, hex_string (addr), len);
|
|
|
|
status = target_write_memory (addr, (gdb_byte *) buf, len);
|
|
ret = status == 0 ? PDC_SUCCESS : PDC_FAILURE;
|
|
|
|
if (debug_aix_thread)
|
|
fprintf_unfiltered (gdb_stdlog, " status=%d, returning %s\n", status,
|
|
pd_status2str (ret));
|
|
return ret;
|
|
}
|
|
|
|
/* pthdb callback: allocate a LEN-byte buffer and store a pointer to it
|
|
in BUFP. */
|
|
|
|
static int
|
|
pdc_alloc (pthdb_user_t user, size_t len, void **bufp)
|
|
{
|
|
if (debug_aix_thread)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"pdc_alloc (user = %ld, len = %ld, bufp = 0x%lx)\n",
|
|
user, len, (long) bufp);
|
|
*bufp = xmalloc (len);
|
|
if (debug_aix_thread)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
" malloc returned 0x%lx\n", (long) *bufp);
|
|
|
|
/* Note: xmalloc() can't return 0; therefore PDC_FAILURE will never
|
|
be returned. */
|
|
|
|
return *bufp ? PDC_SUCCESS : PDC_FAILURE;
|
|
}
|
|
|
|
/* pthdb callback: reallocate BUF, which was allocated by the alloc or
|
|
realloc callback, so that it contains LEN bytes, and store a
|
|
pointer to the result in BUFP. */
|
|
|
|
static int
|
|
pdc_realloc (pthdb_user_t user, void *buf, size_t len, void **bufp)
|
|
{
|
|
if (debug_aix_thread)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"pdc_realloc (user = %ld, buf = 0x%lx, len = %ld, bufp = 0x%lx)\n",
|
|
user, (long) buf, len, (long) bufp);
|
|
*bufp = xrealloc (buf, len);
|
|
if (debug_aix_thread)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
" realloc returned 0x%lx\n", (long) *bufp);
|
|
return *bufp ? PDC_SUCCESS : PDC_FAILURE;
|
|
}
|
|
|
|
/* pthdb callback: free BUF, which was allocated by the alloc or
|
|
realloc callback. */
|
|
|
|
static int
|
|
pdc_dealloc (pthdb_user_t user, void *buf)
|
|
{
|
|
if (debug_aix_thread)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"pdc_free (user = %ld, buf = 0x%lx)\n", user,
|
|
(long) buf);
|
|
xfree (buf);
|
|
return PDC_SUCCESS;
|
|
}
|
|
|
|
/* Return a printable representation of pthread STATE. */
|
|
|
|
static char *
|
|
state2str (pthdb_state_t state)
|
|
{
|
|
switch (state)
|
|
{
|
|
case PST_IDLE:
|
|
/* i18n: Like "Thread-Id %d, [state] idle" */
|
|
return _("idle"); /* being created */
|
|
case PST_RUN:
|
|
/* i18n: Like "Thread-Id %d, [state] running" */
|
|
return _("running"); /* running */
|
|
case PST_SLEEP:
|
|
/* i18n: Like "Thread-Id %d, [state] sleeping" */
|
|
return _("sleeping"); /* awaiting an event */
|
|
case PST_READY:
|
|
/* i18n: Like "Thread-Id %d, [state] ready" */
|
|
return _("ready"); /* runnable */
|
|
case PST_TERM:
|
|
/* i18n: Like "Thread-Id %d, [state] finished" */
|
|
return _("finished"); /* awaiting a join/detach */
|
|
default:
|
|
/* i18n: Like "Thread-Id %d, [state] unknown" */
|
|
return _("unknown");
|
|
}
|
|
}
|
|
|
|
/* qsort() comparison function for sorting pd_thread structs by pthid. */
|
|
|
|
static int
|
|
pcmp (const void *p1v, const void *p2v)
|
|
{
|
|
struct pd_thread *p1 = (struct pd_thread *) p1v;
|
|
struct pd_thread *p2 = (struct pd_thread *) p2v;
|
|
return p1->pthid < p2->pthid ? -1 : p1->pthid > p2->pthid;
|
|
}
|
|
|
|
/* iterate_over_threads() callback for counting GDB threads.
|
|
|
|
Do not count the main thread (whose tid is zero). This matches
|
|
the list of threads provided by the pthreaddebug library, which
|
|
does not include that main thread either, and thus allows us
|
|
to compare the two lists. */
|
|
|
|
static int
|
|
giter_count (struct thread_info *thread, void *countp)
|
|
{
|
|
if (PD_TID (thread->ptid))
|
|
(*(int *) countp)++;
|
|
return 0;
|
|
}
|
|
|
|
/* iterate_over_threads() callback for accumulating GDB thread pids.
|
|
|
|
Do not include the main thread (whose tid is zero). This matches
|
|
the list of threads provided by the pthreaddebug library, which
|
|
does not include that main thread either, and thus allows us
|
|
to compare the two lists. */
|
|
|
|
static int
|
|
giter_accum (struct thread_info *thread, void *bufp)
|
|
{
|
|
if (PD_TID (thread->ptid))
|
|
{
|
|
**(struct thread_info ***) bufp = thread;
|
|
(*(struct thread_info ***) bufp)++;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* ptid comparison function */
|
|
|
|
static int
|
|
ptid_cmp (ptid_t ptid1, ptid_t ptid2)
|
|
{
|
|
int pid1, pid2;
|
|
|
|
if (ptid_get_pid (ptid1) < ptid_get_pid (ptid2))
|
|
return -1;
|
|
else if (ptid_get_pid (ptid1) > ptid_get_pid (ptid2))
|
|
return 1;
|
|
else if (ptid_get_tid (ptid1) < ptid_get_tid (ptid2))
|
|
return -1;
|
|
else if (ptid_get_tid (ptid1) > ptid_get_tid (ptid2))
|
|
return 1;
|
|
else if (ptid_get_lwp (ptid1) < ptid_get_lwp (ptid2))
|
|
return -1;
|
|
else if (ptid_get_lwp (ptid1) > ptid_get_lwp (ptid2))
|
|
return 1;
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
/* qsort() comparison function for sorting thread_info structs by pid. */
|
|
|
|
static int
|
|
gcmp (const void *t1v, const void *t2v)
|
|
{
|
|
struct thread_info *t1 = *(struct thread_info **) t1v;
|
|
struct thread_info *t2 = *(struct thread_info **) t2v;
|
|
return ptid_cmp (t1->ptid, t2->ptid);
|
|
}
|
|
|
|
/* Search through the list of all kernel threads for the thread
|
|
that has stopped on a SIGTRAP signal, and return its TID.
|
|
Return 0 if none found. */
|
|
|
|
static pthdb_tid_t
|
|
get_signaled_thread (void)
|
|
{
|
|
struct thrdsinfo64 thrinf;
|
|
tid_t ktid = 0;
|
|
int result = 0;
|
|
|
|
while (1)
|
|
{
|
|
if (getthrds (ptid_get_pid (inferior_ptid), &thrinf,
|
|
sizeof (thrinf), &ktid, 1) != 1)
|
|
break;
|
|
|
|
if (thrinf.ti_cursig == SIGTRAP)
|
|
return thrinf.ti_tid;
|
|
}
|
|
|
|
/* Didn't find any thread stopped on a SIGTRAP signal. */
|
|
return 0;
|
|
}
|
|
|
|
/* Synchronize GDB's thread list with libpthdebug's.
|
|
|
|
There are some benefits of doing this every time the inferior stops:
|
|
|
|
- allows users to run thread-specific commands without needing to
|
|
run "info threads" first
|
|
|
|
- helps pthdb_tid_pthread() work properly (see "libpthdebug
|
|
peculiarities" at the top of this module)
|
|
|
|
- simplifies the demands placed on libpthdebug, which seems to
|
|
have difficulty with certain call patterns */
|
|
|
|
static void
|
|
sync_threadlists (void)
|
|
{
|
|
int cmd, status, infpid;
|
|
int pcount, psize, pi, gcount, gi;
|
|
struct pd_thread *pbuf;
|
|
struct thread_info **gbuf, **g, *thread;
|
|
pthdb_pthread_t pdtid;
|
|
pthread_t pthid;
|
|
pthdb_tid_t tid;
|
|
|
|
/* Accumulate an array of libpthdebug threads sorted by pthread id. */
|
|
|
|
pcount = 0;
|
|
psize = 1;
|
|
pbuf = XNEWVEC (struct pd_thread, psize);
|
|
|
|
for (cmd = PTHDB_LIST_FIRST;; cmd = PTHDB_LIST_NEXT)
|
|
{
|
|
status = pthdb_pthread (pd_session, &pdtid, cmd);
|
|
if (status != PTHDB_SUCCESS || pdtid == PTHDB_INVALID_PTHREAD)
|
|
break;
|
|
|
|
status = pthdb_pthread_ptid (pd_session, pdtid, &pthid);
|
|
if (status != PTHDB_SUCCESS || pthid == PTHDB_INVALID_PTID)
|
|
continue;
|
|
|
|
if (pcount == psize)
|
|
{
|
|
psize *= 2;
|
|
pbuf = (struct pd_thread *) xrealloc (pbuf,
|
|
psize * sizeof *pbuf);
|
|
}
|
|
pbuf[pcount].pdtid = pdtid;
|
|
pbuf[pcount].pthid = pthid;
|
|
pcount++;
|
|
}
|
|
|
|
for (pi = 0; pi < pcount; pi++)
|
|
{
|
|
status = pthdb_pthread_tid (pd_session, pbuf[pi].pdtid, &tid);
|
|
if (status != PTHDB_SUCCESS)
|
|
tid = PTHDB_INVALID_TID;
|
|
pbuf[pi].tid = tid;
|
|
}
|
|
|
|
qsort (pbuf, pcount, sizeof *pbuf, pcmp);
|
|
|
|
/* Accumulate an array of GDB threads sorted by pid. */
|
|
|
|
gcount = 0;
|
|
iterate_over_threads (giter_count, &gcount);
|
|
g = gbuf = XNEWVEC (struct thread_info *, gcount);
|
|
iterate_over_threads (giter_accum, &g);
|
|
qsort (gbuf, gcount, sizeof *gbuf, gcmp);
|
|
|
|
/* Apply differences between the two arrays to GDB's thread list. */
|
|
|
|
infpid = ptid_get_pid (inferior_ptid);
|
|
for (pi = gi = 0; pi < pcount || gi < gcount;)
|
|
{
|
|
if (pi == pcount)
|
|
{
|
|
delete_thread (gbuf[gi]->ptid);
|
|
gi++;
|
|
}
|
|
else if (gi == gcount)
|
|
{
|
|
aix_thread_info *priv = new aix_thread_info;
|
|
priv->pdtid = pbuf[pi].pdtid;
|
|
priv->tid = pbuf[pi].tid;
|
|
|
|
thread = add_thread_with_info (ptid_t (infpid, 0, pbuf[pi].pthid), priv);
|
|
|
|
pi++;
|
|
}
|
|
else
|
|
{
|
|
ptid_t pptid, gptid;
|
|
int cmp_result;
|
|
|
|
pptid = ptid_build (infpid, 0, pbuf[pi].pthid);
|
|
gptid = gbuf[gi]->ptid;
|
|
pdtid = pbuf[pi].pdtid;
|
|
tid = pbuf[pi].tid;
|
|
|
|
cmp_result = ptid_cmp (pptid, gptid);
|
|
|
|
if (cmp_result == 0)
|
|
{
|
|
aix_thread_info *priv = get_aix_thread_info (gbuf[gi]);
|
|
|
|
priv->pdtid = pdtid;
|
|
priv->tid = tid;
|
|
pi++;
|
|
gi++;
|
|
}
|
|
else if (cmp_result > 0)
|
|
{
|
|
delete_thread (gptid);
|
|
gi++;
|
|
}
|
|
else
|
|
{
|
|
thread = add_thread (pptid);
|
|
|
|
aix_thread_info *priv = new aix_thread_info;
|
|
thread->priv.reset (priv);
|
|
priv->pdtid = pdtid;
|
|
priv->tid = tid;
|
|
pi++;
|
|
}
|
|
}
|
|
}
|
|
|
|
xfree (pbuf);
|
|
xfree (gbuf);
|
|
}
|
|
|
|
/* Iterate_over_threads() callback for locating a thread, using
|
|
the TID of its associated kernel thread. */
|
|
|
|
static int
|
|
iter_tid (struct thread_info *thread, void *tidp)
|
|
{
|
|
const pthdb_tid_t tid = *(pthdb_tid_t *)tidp;
|
|
aix_thread_info *priv = get_aix_thread_info (thread);
|
|
|
|
return priv->tid == tid;
|
|
}
|
|
|
|
/* Synchronize libpthdebug's state with the inferior and with GDB,
|
|
generate a composite process/thread <pid> for the current thread,
|
|
set inferior_ptid to <pid> if SET_INFPID, and return <pid>. */
|
|
|
|
static ptid_t
|
|
pd_update (int set_infpid)
|
|
{
|
|
int status;
|
|
ptid_t ptid;
|
|
pthdb_tid_t tid;
|
|
struct thread_info *thread = NULL;
|
|
|
|
if (!pd_active)
|
|
return inferior_ptid;
|
|
|
|
status = pthdb_session_update (pd_session);
|
|
if (status != PTHDB_SUCCESS)
|
|
return inferior_ptid;
|
|
|
|
sync_threadlists ();
|
|
|
|
/* Define "current thread" as one that just received a trap signal. */
|
|
|
|
tid = get_signaled_thread ();
|
|
if (tid != 0)
|
|
thread = iterate_over_threads (iter_tid, &tid);
|
|
if (!thread)
|
|
ptid = inferior_ptid;
|
|
else
|
|
{
|
|
ptid = thread->ptid;
|
|
if (set_infpid)
|
|
inferior_ptid = ptid;
|
|
}
|
|
return ptid;
|
|
}
|
|
|
|
/* Try to start debugging threads in the current process.
|
|
If successful and SET_INFPID, set inferior_ptid to reflect the
|
|
current thread. */
|
|
|
|
static ptid_t
|
|
pd_activate (int set_infpid)
|
|
{
|
|
int status;
|
|
|
|
status = pthdb_session_init (PD_USER, arch64 ? PEM_64BIT : PEM_32BIT,
|
|
PTHDB_FLAG_REGS, &pd_callbacks,
|
|
&pd_session);
|
|
if (status != PTHDB_SUCCESS)
|
|
{
|
|
return inferior_ptid;
|
|
}
|
|
pd_active = 1;
|
|
return pd_update (set_infpid);
|
|
}
|
|
|
|
/* Undo the effects of pd_activate(). */
|
|
|
|
static void
|
|
pd_deactivate (void)
|
|
{
|
|
if (!pd_active)
|
|
return;
|
|
pthdb_session_destroy (pd_session);
|
|
|
|
pid_to_prc (&inferior_ptid);
|
|
pd_active = 0;
|
|
}
|
|
|
|
/* An object file has just been loaded. Check whether the current
|
|
application is pthreaded, and if so, prepare for thread debugging. */
|
|
|
|
static void
|
|
pd_enable (void)
|
|
{
|
|
int status;
|
|
char *stub_name;
|
|
struct bound_minimal_symbol ms;
|
|
|
|
/* Don't initialize twice. */
|
|
if (pd_able)
|
|
return;
|
|
|
|
/* Check application word size. */
|
|
arch64 = register_size (target_gdbarch (), 0) == 8;
|
|
|
|
/* Check whether the application is pthreaded. */
|
|
stub_name = NULL;
|
|
status = pthdb_session_pthreaded (PD_USER, PTHDB_FLAG_REGS,
|
|
&pd_callbacks, &stub_name);
|
|
if ((status != PTHDB_SUCCESS
|
|
&& status != PTHDB_NOT_PTHREADED) || !stub_name)
|
|
return;
|
|
|
|
/* Set a breakpoint on the returned stub function. */
|
|
ms = lookup_minimal_symbol (stub_name, NULL, NULL);
|
|
if (ms.minsym == NULL)
|
|
return;
|
|
pd_brk_addr = BMSYMBOL_VALUE_ADDRESS (ms);
|
|
if (!create_thread_event_breakpoint (target_gdbarch (), pd_brk_addr))
|
|
return;
|
|
|
|
/* Prepare for thread debugging. */
|
|
push_target (&aix_thread_ops);
|
|
pd_able = 1;
|
|
|
|
/* If we're debugging a core file or an attached inferior, the
|
|
pthread library may already have been initialized, so try to
|
|
activate thread debugging. */
|
|
pd_activate (1);
|
|
}
|
|
|
|
/* Undo the effects of pd_enable(). */
|
|
|
|
static void
|
|
pd_disable (void)
|
|
{
|
|
if (!pd_able)
|
|
return;
|
|
if (pd_active)
|
|
pd_deactivate ();
|
|
pd_able = 0;
|
|
unpush_target (&aix_thread_ops);
|
|
}
|
|
|
|
/* new_objfile observer callback.
|
|
|
|
If OBJFILE is non-null, check whether a threaded application is
|
|
being debugged, and if so, prepare for thread debugging.
|
|
|
|
If OBJFILE is null, stop debugging threads. */
|
|
|
|
static void
|
|
new_objfile (struct objfile *objfile)
|
|
{
|
|
if (objfile)
|
|
pd_enable ();
|
|
else
|
|
pd_disable ();
|
|
}
|
|
|
|
/* Attach to process specified by ARGS. */
|
|
|
|
static void
|
|
aix_thread_inferior_created (struct target_ops *ops, int from_tty)
|
|
{
|
|
pd_enable ();
|
|
}
|
|
|
|
/* Detach from the process attached to by aix_thread_attach(). */
|
|
|
|
void
|
|
aix_thread_target::detach (inferior *inf, int from_tty)
|
|
{
|
|
struct target_ops *beneath = find_target_beneath (this);
|
|
|
|
pd_disable ();
|
|
beneath->detach (inf, from_tty);
|
|
}
|
|
|
|
/* Tell the inferior process to continue running thread PID if != -1
|
|
and all threads otherwise. */
|
|
|
|
void
|
|
aix_thread_target::resume (ptid_t ptid, int step, enum gdb_signal sig)
|
|
{
|
|
struct thread_info *thread;
|
|
pthdb_tid_t tid[2];
|
|
|
|
if (!PD_TID (ptid))
|
|
{
|
|
scoped_restore save_inferior_ptid = make_scoped_restore (&inferior_ptid);
|
|
struct target_ops *beneath = find_target_beneath (this);
|
|
|
|
inferior_ptid = pid_to_ptid (ptid_get_pid (inferior_ptid));
|
|
beneath->resume (ptid, step, sig);
|
|
}
|
|
else
|
|
{
|
|
thread = find_thread_ptid (ptid);
|
|
if (!thread)
|
|
error (_("aix-thread resume: unknown pthread %ld"),
|
|
ptid_get_lwp (ptid));
|
|
|
|
aix_thread_info *priv = get_aix_thread_info (thread);
|
|
|
|
tid[0] = priv->tid;
|
|
if (tid[0] == PTHDB_INVALID_TID)
|
|
error (_("aix-thread resume: no tid for pthread %ld"),
|
|
ptid_get_lwp (ptid));
|
|
tid[1] = 0;
|
|
|
|
if (arch64)
|
|
ptrace64aix (PTT_CONTINUE, tid[0], (long long) 1,
|
|
gdb_signal_to_host (sig), (PTRACE_TYPE_ARG5) tid);
|
|
else
|
|
ptrace32 (PTT_CONTINUE, tid[0], (addr_ptr) 1,
|
|
gdb_signal_to_host (sig), (PTRACE_TYPE_ARG5) tid);
|
|
}
|
|
}
|
|
|
|
/* Wait for thread/process ID if != -1 or for any thread otherwise.
|
|
If an error occurs, return -1, else return the pid of the stopped
|
|
thread. */
|
|
|
|
ptid_t
|
|
aix_thread_target::wait (ptid_t ptid, struct target_waitstatus *status,
|
|
int options)
|
|
{
|
|
struct target_ops *beneath = find_target_beneath (this);
|
|
|
|
{
|
|
scoped_restore save_inferior_ptid = make_scoped_restore (&inferior_ptid);
|
|
|
|
pid_to_prc (&ptid);
|
|
|
|
inferior_ptid = pid_to_ptid (ptid_get_pid (inferior_ptid));
|
|
ptid = beneath->wait (ptid, status, options);
|
|
}
|
|
|
|
if (ptid_get_pid (ptid) == -1)
|
|
return pid_to_ptid (-1);
|
|
|
|
/* Check whether libpthdebug might be ready to be initialized. */
|
|
if (!pd_active && status->kind == TARGET_WAITKIND_STOPPED
|
|
&& status->value.sig == GDB_SIGNAL_TRAP)
|
|
{
|
|
struct regcache *regcache = get_thread_regcache (ptid);
|
|
struct gdbarch *gdbarch = regcache->arch ();
|
|
|
|
if (regcache_read_pc (regcache)
|
|
- gdbarch_decr_pc_after_break (gdbarch) == pd_brk_addr)
|
|
return pd_activate (0);
|
|
}
|
|
|
|
return pd_update (0);
|
|
}
|
|
|
|
/* Record that the 64-bit general-purpose registers contain VALS. */
|
|
|
|
static void
|
|
supply_gprs64 (struct regcache *regcache, uint64_t *vals)
|
|
{
|
|
struct gdbarch_tdep *tdep = gdbarch_tdep (regcache->arch ());
|
|
int regno;
|
|
|
|
for (regno = 0; regno < ppc_num_gprs; regno++)
|
|
regcache_raw_supply (regcache, tdep->ppc_gp0_regnum + regno,
|
|
(char *) (vals + regno));
|
|
}
|
|
|
|
/* Record that 32-bit register REGNO contains VAL. */
|
|
|
|
static void
|
|
supply_reg32 (struct regcache *regcache, int regno, uint32_t val)
|
|
{
|
|
regcache_raw_supply (regcache, regno, (char *) &val);
|
|
}
|
|
|
|
/* Record that the floating-point registers contain VALS. */
|
|
|
|
static void
|
|
supply_fprs (struct regcache *regcache, double *vals)
|
|
{
|
|
struct gdbarch *gdbarch = regcache->arch ();
|
|
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
|
|
int regno;
|
|
|
|
/* This function should never be called on architectures without
|
|
floating-point registers. */
|
|
gdb_assert (ppc_floating_point_unit_p (gdbarch));
|
|
|
|
for (regno = tdep->ppc_fp0_regnum;
|
|
regno < tdep->ppc_fp0_regnum + ppc_num_fprs;
|
|
regno++)
|
|
regcache_raw_supply (regcache, regno,
|
|
(char *) (vals + regno - tdep->ppc_fp0_regnum));
|
|
}
|
|
|
|
/* Predicate to test whether given register number is a "special" register. */
|
|
static int
|
|
special_register_p (struct gdbarch *gdbarch, int regno)
|
|
{
|
|
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
|
|
|
|
return regno == gdbarch_pc_regnum (gdbarch)
|
|
|| regno == tdep->ppc_ps_regnum
|
|
|| regno == tdep->ppc_cr_regnum
|
|
|| regno == tdep->ppc_lr_regnum
|
|
|| regno == tdep->ppc_ctr_regnum
|
|
|| regno == tdep->ppc_xer_regnum
|
|
|| (tdep->ppc_fpscr_regnum >= 0 && regno == tdep->ppc_fpscr_regnum)
|
|
|| (tdep->ppc_mq_regnum >= 0 && regno == tdep->ppc_mq_regnum);
|
|
}
|
|
|
|
|
|
/* Record that the special registers contain the specified 64-bit and
|
|
32-bit values. */
|
|
|
|
static void
|
|
supply_sprs64 (struct regcache *regcache,
|
|
uint64_t iar, uint64_t msr, uint32_t cr,
|
|
uint64_t lr, uint64_t ctr, uint32_t xer,
|
|
uint32_t fpscr)
|
|
{
|
|
struct gdbarch *gdbarch = regcache->arch ();
|
|
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
|
|
|
|
regcache_raw_supply (regcache, gdbarch_pc_regnum (gdbarch),
|
|
(char *) &iar);
|
|
regcache_raw_supply (regcache, tdep->ppc_ps_regnum, (char *) &msr);
|
|
regcache_raw_supply (regcache, tdep->ppc_cr_regnum, (char *) &cr);
|
|
regcache_raw_supply (regcache, tdep->ppc_lr_regnum, (char *) &lr);
|
|
regcache_raw_supply (regcache, tdep->ppc_ctr_regnum, (char *) &ctr);
|
|
regcache_raw_supply (regcache, tdep->ppc_xer_regnum, (char *) &xer);
|
|
if (tdep->ppc_fpscr_regnum >= 0)
|
|
regcache_raw_supply (regcache, tdep->ppc_fpscr_regnum,
|
|
(char *) &fpscr);
|
|
}
|
|
|
|
/* Record that the special registers contain the specified 32-bit
|
|
values. */
|
|
|
|
static void
|
|
supply_sprs32 (struct regcache *regcache,
|
|
uint32_t iar, uint32_t msr, uint32_t cr,
|
|
uint32_t lr, uint32_t ctr, uint32_t xer,
|
|
uint32_t fpscr)
|
|
{
|
|
struct gdbarch *gdbarch = regcache->arch ();
|
|
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
|
|
|
|
regcache_raw_supply (regcache, gdbarch_pc_regnum (gdbarch),
|
|
(char *) &iar);
|
|
regcache_raw_supply (regcache, tdep->ppc_ps_regnum, (char *) &msr);
|
|
regcache_raw_supply (regcache, tdep->ppc_cr_regnum, (char *) &cr);
|
|
regcache_raw_supply (regcache, tdep->ppc_lr_regnum, (char *) &lr);
|
|
regcache_raw_supply (regcache, tdep->ppc_ctr_regnum, (char *) &ctr);
|
|
regcache_raw_supply (regcache, tdep->ppc_xer_regnum, (char *) &xer);
|
|
if (tdep->ppc_fpscr_regnum >= 0)
|
|
regcache_raw_supply (regcache, tdep->ppc_fpscr_regnum,
|
|
(char *) &fpscr);
|
|
}
|
|
|
|
/* Fetch all registers from pthread PDTID, which doesn't have a kernel
|
|
thread.
|
|
|
|
There's no way to query a single register from a non-kernel
|
|
pthread, so there's no need for a single-register version of this
|
|
function. */
|
|
|
|
static void
|
|
fetch_regs_user_thread (struct regcache *regcache, pthdb_pthread_t pdtid)
|
|
{
|
|
struct gdbarch *gdbarch = regcache->arch ();
|
|
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
|
|
int status, i;
|
|
pthdb_context_t ctx;
|
|
|
|
if (debug_aix_thread)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"fetch_regs_user_thread %lx\n", (long) pdtid);
|
|
status = pthdb_pthread_context (pd_session, pdtid, &ctx);
|
|
if (status != PTHDB_SUCCESS)
|
|
error (_("aix-thread: fetch_registers: pthdb_pthread_context returned %s"),
|
|
pd_status2str (status));
|
|
|
|
/* General-purpose registers. */
|
|
|
|
if (arch64)
|
|
supply_gprs64 (regcache, ctx.gpr);
|
|
else
|
|
for (i = 0; i < ppc_num_gprs; i++)
|
|
supply_reg32 (regcache, tdep->ppc_gp0_regnum + i, ctx.gpr[i]);
|
|
|
|
/* Floating-point registers. */
|
|
|
|
if (ppc_floating_point_unit_p (gdbarch))
|
|
supply_fprs (regcache, ctx.fpr);
|
|
|
|
/* Special registers. */
|
|
|
|
if (arch64)
|
|
supply_sprs64 (regcache, ctx.iar, ctx.msr, ctx.cr, ctx.lr, ctx.ctr,
|
|
ctx.xer, ctx.fpscr);
|
|
else
|
|
supply_sprs32 (regcache, ctx.iar, ctx.msr, ctx.cr, ctx.lr, ctx.ctr,
|
|
ctx.xer, ctx.fpscr);
|
|
}
|
|
|
|
/* Fetch register REGNO if != -1 or all registers otherwise from
|
|
kernel thread TID.
|
|
|
|
AIX provides a way to query all of a kernel thread's GPRs, FPRs, or
|
|
SPRs, but there's no way to query individual registers within those
|
|
groups. Therefore, if REGNO != -1, this function fetches an entire
|
|
group.
|
|
|
|
Unfortunately, kernel thread register queries often fail with
|
|
EPERM, indicating that the thread is in kernel space. This breaks
|
|
backtraces of threads other than the current one. To make that
|
|
breakage obvious without throwing an error to top level (which is
|
|
bad e.g. during "info threads" output), zero registers that can't
|
|
be retrieved. */
|
|
|
|
static void
|
|
fetch_regs_kernel_thread (struct regcache *regcache, int regno,
|
|
pthdb_tid_t tid)
|
|
{
|
|
struct gdbarch *gdbarch = regcache->arch ();
|
|
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
|
|
uint64_t gprs64[ppc_num_gprs];
|
|
uint32_t gprs32[ppc_num_gprs];
|
|
double fprs[ppc_num_fprs];
|
|
struct ptxsprs sprs64;
|
|
struct ptsprs sprs32;
|
|
int i;
|
|
|
|
if (debug_aix_thread)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"fetch_regs_kernel_thread tid=%lx regno=%d arch64=%d\n",
|
|
(long) tid, regno, arch64);
|
|
|
|
/* General-purpose registers. */
|
|
if (regno == -1
|
|
|| (tdep->ppc_gp0_regnum <= regno
|
|
&& regno < tdep->ppc_gp0_regnum + ppc_num_gprs))
|
|
{
|
|
if (arch64)
|
|
{
|
|
if (!ptrace64aix (PTT_READ_GPRS, tid,
|
|
(unsigned long) gprs64, 0, NULL))
|
|
memset (gprs64, 0, sizeof (gprs64));
|
|
supply_gprs64 (regcache, gprs64);
|
|
}
|
|
else
|
|
{
|
|
if (!ptrace32 (PTT_READ_GPRS, tid, (uintptr_t) gprs32, 0, NULL))
|
|
memset (gprs32, 0, sizeof (gprs32));
|
|
for (i = 0; i < ppc_num_gprs; i++)
|
|
supply_reg32 (regcache, tdep->ppc_gp0_regnum + i, gprs32[i]);
|
|
}
|
|
}
|
|
|
|
/* Floating-point registers. */
|
|
|
|
if (ppc_floating_point_unit_p (gdbarch)
|
|
&& (regno == -1
|
|
|| (regno >= tdep->ppc_fp0_regnum
|
|
&& regno < tdep->ppc_fp0_regnum + ppc_num_fprs)))
|
|
{
|
|
if (!ptrace32 (PTT_READ_FPRS, tid, (uintptr_t) fprs, 0, NULL))
|
|
memset (fprs, 0, sizeof (fprs));
|
|
supply_fprs (regcache, fprs);
|
|
}
|
|
|
|
/* Special-purpose registers. */
|
|
|
|
if (regno == -1 || special_register_p (gdbarch, regno))
|
|
{
|
|
if (arch64)
|
|
{
|
|
if (!ptrace64aix (PTT_READ_SPRS, tid,
|
|
(unsigned long) &sprs64, 0, NULL))
|
|
memset (&sprs64, 0, sizeof (sprs64));
|
|
supply_sprs64 (regcache, sprs64.pt_iar, sprs64.pt_msr,
|
|
sprs64.pt_cr, sprs64.pt_lr, sprs64.pt_ctr,
|
|
sprs64.pt_xer, sprs64.pt_fpscr);
|
|
}
|
|
else
|
|
{
|
|
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
|
|
|
|
if (!ptrace32 (PTT_READ_SPRS, tid, (uintptr_t) &sprs32, 0, NULL))
|
|
memset (&sprs32, 0, sizeof (sprs32));
|
|
supply_sprs32 (regcache, sprs32.pt_iar, sprs32.pt_msr, sprs32.pt_cr,
|
|
sprs32.pt_lr, sprs32.pt_ctr, sprs32.pt_xer,
|
|
sprs32.pt_fpscr);
|
|
|
|
if (tdep->ppc_mq_regnum >= 0)
|
|
regcache_raw_supply (regcache, tdep->ppc_mq_regnum,
|
|
(char *) &sprs32.pt_mq);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Fetch register REGNO if != -1 or all registers otherwise from the
|
|
thread/process connected to REGCACHE. */
|
|
|
|
void
|
|
aix_thread_target::fetch_registers (struct regcache *regcache, int regno)
|
|
{
|
|
struct thread_info *thread;
|
|
pthdb_tid_t tid;
|
|
struct target_ops *beneath = find_target_beneath (this);
|
|
|
|
if (!PD_TID (regcache_get_ptid (regcache)))
|
|
beneath->fetch_registers (regcache, regno);
|
|
else
|
|
{
|
|
thread = find_thread_ptid (regcache_get_ptid (regcache));
|
|
aix_thread_info *priv = get_aix_thread_info (thread);
|
|
tid = priv->tid;
|
|
|
|
if (tid == PTHDB_INVALID_TID)
|
|
fetch_regs_user_thread (regcache, priv->pdtid);
|
|
else
|
|
fetch_regs_kernel_thread (regcache, regno, tid);
|
|
}
|
|
}
|
|
|
|
/* Store the gp registers into an array of uint32_t or uint64_t. */
|
|
|
|
static void
|
|
fill_gprs64 (const struct regcache *regcache, uint64_t *vals)
|
|
{
|
|
struct gdbarch_tdep *tdep = gdbarch_tdep (regcache->arch ());
|
|
int regno;
|
|
|
|
for (regno = 0; regno < ppc_num_gprs; regno++)
|
|
if (REG_VALID == regcache_register_status (regcache,
|
|
tdep->ppc_gp0_regnum + regno))
|
|
regcache_raw_collect (regcache, tdep->ppc_gp0_regnum + regno,
|
|
vals + regno);
|
|
}
|
|
|
|
static void
|
|
fill_gprs32 (const struct regcache *regcache, uint32_t *vals)
|
|
{
|
|
struct gdbarch_tdep *tdep = gdbarch_tdep (regcache->arch ());
|
|
int regno;
|
|
|
|
for (regno = 0; regno < ppc_num_gprs; regno++)
|
|
if (REG_VALID == regcache_register_status (regcache,
|
|
tdep->ppc_gp0_regnum + regno))
|
|
regcache_raw_collect (regcache, tdep->ppc_gp0_regnum + regno,
|
|
vals + regno);
|
|
}
|
|
|
|
/* Store the floating point registers into a double array. */
|
|
static void
|
|
fill_fprs (const struct regcache *regcache, double *vals)
|
|
{
|
|
struct gdbarch *gdbarch = regcache->arch ();
|
|
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
|
|
int regno;
|
|
|
|
/* This function should never be called on architectures without
|
|
floating-point registers. */
|
|
gdb_assert (ppc_floating_point_unit_p (gdbarch));
|
|
|
|
for (regno = tdep->ppc_fp0_regnum;
|
|
regno < tdep->ppc_fp0_regnum + ppc_num_fprs;
|
|
regno++)
|
|
if (REG_VALID == regcache_register_status (regcache, regno))
|
|
regcache_raw_collect (regcache, regno,
|
|
vals + regno - tdep->ppc_fp0_regnum);
|
|
}
|
|
|
|
/* Store the special registers into the specified 64-bit and 32-bit
|
|
locations. */
|
|
|
|
static void
|
|
fill_sprs64 (const struct regcache *regcache,
|
|
uint64_t *iar, uint64_t *msr, uint32_t *cr,
|
|
uint64_t *lr, uint64_t *ctr, uint32_t *xer,
|
|
uint32_t *fpscr)
|
|
{
|
|
struct gdbarch *gdbarch = regcache->arch ();
|
|
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
|
|
|
|
/* Verify that the size of the size of the IAR buffer is the
|
|
same as the raw size of the PC (in the register cache). If
|
|
they're not, then either GDB has been built incorrectly, or
|
|
there's some other kind of internal error. To be really safe,
|
|
we should check all of the sizes. */
|
|
gdb_assert (sizeof (*iar) == register_size
|
|
(gdbarch, gdbarch_pc_regnum (gdbarch)));
|
|
|
|
if (REG_VALID == regcache_register_status (regcache,
|
|
gdbarch_pc_regnum (gdbarch)))
|
|
regcache_raw_collect (regcache, gdbarch_pc_regnum (gdbarch), iar);
|
|
if (REG_VALID == regcache_register_status (regcache, tdep->ppc_ps_regnum))
|
|
regcache_raw_collect (regcache, tdep->ppc_ps_regnum, msr);
|
|
if (REG_VALID == regcache_register_status (regcache, tdep->ppc_cr_regnum))
|
|
regcache_raw_collect (regcache, tdep->ppc_cr_regnum, cr);
|
|
if (REG_VALID == regcache_register_status (regcache, tdep->ppc_lr_regnum))
|
|
regcache_raw_collect (regcache, tdep->ppc_lr_regnum, lr);
|
|
if (REG_VALID == regcache_register_status (regcache, tdep->ppc_ctr_regnum))
|
|
regcache_raw_collect (regcache, tdep->ppc_ctr_regnum, ctr);
|
|
if (REG_VALID == regcache_register_status (regcache, tdep->ppc_xer_regnum))
|
|
regcache_raw_collect (regcache, tdep->ppc_xer_regnum, xer);
|
|
if (tdep->ppc_fpscr_regnum >= 0
|
|
&& REG_VALID == regcache_register_status (regcache,
|
|
tdep->ppc_fpscr_regnum))
|
|
regcache_raw_collect (regcache, tdep->ppc_fpscr_regnum, fpscr);
|
|
}
|
|
|
|
static void
|
|
fill_sprs32 (const struct regcache *regcache,
|
|
uint32_t *iar, uint32_t *msr, uint32_t *cr,
|
|
uint32_t *lr, uint32_t *ctr, uint32_t *xer,
|
|
uint32_t *fpscr)
|
|
{
|
|
struct gdbarch *gdbarch = regcache->arch ();
|
|
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
|
|
|
|
/* Verify that the size of the size of the IAR buffer is the
|
|
same as the raw size of the PC (in the register cache). If
|
|
they're not, then either GDB has been built incorrectly, or
|
|
there's some other kind of internal error. To be really safe,
|
|
we should check all of the sizes. */
|
|
gdb_assert (sizeof (*iar) == register_size (gdbarch,
|
|
gdbarch_pc_regnum (gdbarch)));
|
|
|
|
if (REG_VALID == regcache_register_status (regcache,
|
|
gdbarch_pc_regnum (gdbarch)))
|
|
regcache_raw_collect (regcache, gdbarch_pc_regnum (gdbarch), iar);
|
|
if (REG_VALID == regcache_register_status (regcache, tdep->ppc_ps_regnum))
|
|
regcache_raw_collect (regcache, tdep->ppc_ps_regnum, msr);
|
|
if (REG_VALID == regcache_register_status (regcache, tdep->ppc_cr_regnum))
|
|
regcache_raw_collect (regcache, tdep->ppc_cr_regnum, cr);
|
|
if (REG_VALID == regcache_register_status (regcache, tdep->ppc_lr_regnum))
|
|
regcache_raw_collect (regcache, tdep->ppc_lr_regnum, lr);
|
|
if (REG_VALID == regcache_register_status (regcache, tdep->ppc_ctr_regnum))
|
|
regcache_raw_collect (regcache, tdep->ppc_ctr_regnum, ctr);
|
|
if (REG_VALID == regcache_register_status (regcache, tdep->ppc_xer_regnum))
|
|
regcache_raw_collect (regcache, tdep->ppc_xer_regnum, xer);
|
|
if (tdep->ppc_fpscr_regnum >= 0
|
|
&& REG_VALID == regcache_register_status (regcache, tdep->ppc_fpscr_regnum))
|
|
regcache_raw_collect (regcache, tdep->ppc_fpscr_regnum, fpscr);
|
|
}
|
|
|
|
/* Store all registers into pthread PDTID, which doesn't have a kernel
|
|
thread.
|
|
|
|
It's possible to store a single register into a non-kernel pthread,
|
|
but I doubt it's worth the effort. */
|
|
|
|
static void
|
|
store_regs_user_thread (const struct regcache *regcache, pthdb_pthread_t pdtid)
|
|
{
|
|
struct gdbarch *gdbarch = regcache->arch ();
|
|
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
|
|
int status, i;
|
|
pthdb_context_t ctx;
|
|
uint32_t int32;
|
|
uint64_t int64;
|
|
double dbl;
|
|
|
|
if (debug_aix_thread)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"store_regs_user_thread %lx\n", (long) pdtid);
|
|
|
|
/* Retrieve the thread's current context for its non-register
|
|
values. */
|
|
status = pthdb_pthread_context (pd_session, pdtid, &ctx);
|
|
if (status != PTHDB_SUCCESS)
|
|
error (_("aix-thread: store_registers: pthdb_pthread_context returned %s"),
|
|
pd_status2str (status));
|
|
|
|
/* Collect general-purpose register values from the regcache. */
|
|
|
|
for (i = 0; i < ppc_num_gprs; i++)
|
|
if (REG_VALID == regcache_register_status (regcache,
|
|
tdep->ppc_gp0_regnum + i))
|
|
{
|
|
if (arch64)
|
|
{
|
|
regcache_raw_collect (regcache, tdep->ppc_gp0_regnum + i,
|
|
(void *) &int64);
|
|
ctx.gpr[i] = int64;
|
|
}
|
|
else
|
|
{
|
|
regcache_raw_collect (regcache, tdep->ppc_gp0_regnum + i,
|
|
(void *) &int32);
|
|
ctx.gpr[i] = int32;
|
|
}
|
|
}
|
|
|
|
/* Collect floating-point register values from the regcache. */
|
|
if (ppc_floating_point_unit_p (gdbarch))
|
|
fill_fprs (regcache, ctx.fpr);
|
|
|
|
/* Special registers (always kept in ctx as 64 bits). */
|
|
if (arch64)
|
|
{
|
|
fill_sprs64 (regcache, &ctx.iar, &ctx.msr, &ctx.cr, &ctx.lr, &ctx.ctr,
|
|
&ctx.xer, &ctx.fpscr);
|
|
}
|
|
else
|
|
{
|
|
/* Problem: ctx.iar etc. are 64 bits, but raw_registers are 32.
|
|
Solution: use 32-bit temp variables. */
|
|
uint32_t tmp_iar, tmp_msr, tmp_cr, tmp_lr, tmp_ctr, tmp_xer,
|
|
tmp_fpscr;
|
|
|
|
fill_sprs32 (regcache, &tmp_iar, &tmp_msr, &tmp_cr, &tmp_lr, &tmp_ctr,
|
|
&tmp_xer, &tmp_fpscr);
|
|
if (REG_VALID == regcache_register_status (regcache,
|
|
gdbarch_pc_regnum (gdbarch)))
|
|
ctx.iar = tmp_iar;
|
|
if (REG_VALID == regcache_register_status (regcache, tdep->ppc_ps_regnum))
|
|
ctx.msr = tmp_msr;
|
|
if (REG_VALID == regcache_register_status (regcache, tdep->ppc_cr_regnum))
|
|
ctx.cr = tmp_cr;
|
|
if (REG_VALID == regcache_register_status (regcache, tdep->ppc_lr_regnum))
|
|
ctx.lr = tmp_lr;
|
|
if (REG_VALID == regcache_register_status (regcache,
|
|
tdep->ppc_ctr_regnum))
|
|
ctx.ctr = tmp_ctr;
|
|
if (REG_VALID == regcache_register_status (regcache,
|
|
tdep->ppc_xer_regnum))
|
|
ctx.xer = tmp_xer;
|
|
if (REG_VALID == regcache_register_status (regcache,
|
|
tdep->ppc_xer_regnum))
|
|
ctx.fpscr = tmp_fpscr;
|
|
}
|
|
|
|
status = pthdb_pthread_setcontext (pd_session, pdtid, &ctx);
|
|
if (status != PTHDB_SUCCESS)
|
|
error (_("aix-thread: store_registers: "
|
|
"pthdb_pthread_setcontext returned %s"),
|
|
pd_status2str (status));
|
|
}
|
|
|
|
/* Store register REGNO if != -1 or all registers otherwise into
|
|
kernel thread TID.
|
|
|
|
AIX provides a way to set all of a kernel thread's GPRs, FPRs, or
|
|
SPRs, but there's no way to set individual registers within those
|
|
groups. Therefore, if REGNO != -1, this function stores an entire
|
|
group. */
|
|
|
|
static void
|
|
store_regs_kernel_thread (const struct regcache *regcache, int regno,
|
|
pthdb_tid_t tid)
|
|
{
|
|
struct gdbarch *gdbarch = regcache->arch ();
|
|
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
|
|
uint64_t gprs64[ppc_num_gprs];
|
|
uint32_t gprs32[ppc_num_gprs];
|
|
double fprs[ppc_num_fprs];
|
|
struct ptxsprs sprs64;
|
|
struct ptsprs sprs32;
|
|
int i;
|
|
|
|
if (debug_aix_thread)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"store_regs_kernel_thread tid=%lx regno=%d\n",
|
|
(long) tid, regno);
|
|
|
|
/* General-purpose registers. */
|
|
if (regno == -1
|
|
|| (tdep->ppc_gp0_regnum <= regno
|
|
&& regno < tdep->ppc_gp0_regnum + ppc_num_fprs))
|
|
{
|
|
if (arch64)
|
|
{
|
|
/* Pre-fetch: some regs may not be in the cache. */
|
|
ptrace64aix (PTT_READ_GPRS, tid, (unsigned long) gprs64, 0, NULL);
|
|
fill_gprs64 (regcache, gprs64);
|
|
ptrace64aix (PTT_WRITE_GPRS, tid, (unsigned long) gprs64, 0, NULL);
|
|
}
|
|
else
|
|
{
|
|
/* Pre-fetch: some regs may not be in the cache. */
|
|
ptrace32 (PTT_READ_GPRS, tid, (uintptr_t) gprs32, 0, NULL);
|
|
fill_gprs32 (regcache, gprs32);
|
|
ptrace32 (PTT_WRITE_GPRS, tid, (uintptr_t) gprs32, 0, NULL);
|
|
}
|
|
}
|
|
|
|
/* Floating-point registers. */
|
|
|
|
if (ppc_floating_point_unit_p (gdbarch)
|
|
&& (regno == -1
|
|
|| (regno >= tdep->ppc_fp0_regnum
|
|
&& regno < tdep->ppc_fp0_regnum + ppc_num_fprs)))
|
|
{
|
|
/* Pre-fetch: some regs may not be in the cache. */
|
|
ptrace32 (PTT_READ_FPRS, tid, (uintptr_t) fprs, 0, NULL);
|
|
fill_fprs (regcache, fprs);
|
|
ptrace32 (PTT_WRITE_FPRS, tid, (uintptr_t) fprs, 0, NULL);
|
|
}
|
|
|
|
/* Special-purpose registers. */
|
|
|
|
if (regno == -1 || special_register_p (gdbarch, regno))
|
|
{
|
|
if (arch64)
|
|
{
|
|
/* Pre-fetch: some registers won't be in the cache. */
|
|
ptrace64aix (PTT_READ_SPRS, tid,
|
|
(unsigned long) &sprs64, 0, NULL);
|
|
fill_sprs64 (regcache, &sprs64.pt_iar, &sprs64.pt_msr,
|
|
&sprs64.pt_cr, &sprs64.pt_lr, &sprs64.pt_ctr,
|
|
&sprs64.pt_xer, &sprs64.pt_fpscr);
|
|
ptrace64aix (PTT_WRITE_SPRS, tid,
|
|
(unsigned long) &sprs64, 0, NULL);
|
|
}
|
|
else
|
|
{
|
|
/* The contents of "struct ptspr" were declared as "unsigned
|
|
long" up to AIX 5.2, but are "unsigned int" since 5.3.
|
|
Use temporaries to work around this problem. Also, add an
|
|
assert here to make sure we fail if the system header files
|
|
use "unsigned long", and the size of that type is not what
|
|
the headers expect. */
|
|
uint32_t tmp_iar, tmp_msr, tmp_cr, tmp_lr, tmp_ctr, tmp_xer,
|
|
tmp_fpscr;
|
|
|
|
gdb_assert (sizeof (sprs32.pt_iar) == 4);
|
|
|
|
/* Pre-fetch: some registers won't be in the cache. */
|
|
ptrace32 (PTT_READ_SPRS, tid, (uintptr_t) &sprs32, 0, NULL);
|
|
|
|
fill_sprs32 (regcache, &tmp_iar, &tmp_msr, &tmp_cr, &tmp_lr,
|
|
&tmp_ctr, &tmp_xer, &tmp_fpscr);
|
|
|
|
sprs32.pt_iar = tmp_iar;
|
|
sprs32.pt_msr = tmp_msr;
|
|
sprs32.pt_cr = tmp_cr;
|
|
sprs32.pt_lr = tmp_lr;
|
|
sprs32.pt_ctr = tmp_ctr;
|
|
sprs32.pt_xer = tmp_xer;
|
|
sprs32.pt_fpscr = tmp_fpscr;
|
|
|
|
if (tdep->ppc_mq_regnum >= 0)
|
|
if (REG_VALID == regcache_register_status (regcache,
|
|
tdep->ppc_mq_regnum))
|
|
regcache_raw_collect (regcache, tdep->ppc_mq_regnum,
|
|
&sprs32.pt_mq);
|
|
|
|
ptrace32 (PTT_WRITE_SPRS, tid, (uintptr_t) &sprs32, 0, NULL);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Store gdb's current view of the register set into the
|
|
thread/process connected to REGCACHE. */
|
|
|
|
void
|
|
aix_thread_target::store_registers (struct regcache *regcache, int regno)
|
|
{
|
|
struct thread_info *thread;
|
|
pthdb_tid_t tid;
|
|
struct target_ops *beneath = find_target_beneath (this);
|
|
|
|
if (!PD_TID (regcache_get_ptid (regcache)))
|
|
beneath->store_registers (regcache, regno);
|
|
else
|
|
{
|
|
thread = find_thread_ptid (regcache_get_ptid (regcache));
|
|
aix_thread_info *priv = get_aix_thread_info (thread);
|
|
tid = priv->tid;
|
|
|
|
if (tid == PTHDB_INVALID_TID)
|
|
store_regs_user_thread (regcache, priv->pdtid);
|
|
else
|
|
store_regs_kernel_thread (regcache, regno, tid);
|
|
}
|
|
}
|
|
|
|
/* Implement the to_xfer_partial target_ops method. */
|
|
|
|
enum target_xfer_status
|
|
aix_thread_target::xfer_partial (enum target_object object,
|
|
const char *annex, gdb_byte *readbuf,
|
|
const gdb_byte *writebuf,
|
|
ULONGEST offset, ULONGEST len,
|
|
ULONGEST *xfered_len)
|
|
{
|
|
scoped_restore save_inferior_ptid = make_scoped_restore (&inferior_ptid);
|
|
struct target_ops *beneath = find_target_beneath (this);
|
|
|
|
inferior_ptid = pid_to_ptid (ptid_get_pid (inferior_ptid));
|
|
return beneath->xfer_partial (object, annex, readbuf,
|
|
writebuf, offset, len, xfered_len);
|
|
}
|
|
|
|
/* Clean up after the inferior exits. */
|
|
|
|
void
|
|
aix_thread_target::mourn_inferior ()
|
|
{
|
|
struct target_ops *beneath = find_target_beneath (this);
|
|
|
|
pd_deactivate ();
|
|
beneath->mourn_inferior ();
|
|
}
|
|
|
|
/* Return whether thread PID is still valid. */
|
|
|
|
int
|
|
aix_thread_target::thread_alive (ptid_t ptid)
|
|
{
|
|
struct target_ops *beneath = find_target_beneath (this);
|
|
|
|
if (!PD_TID (ptid))
|
|
return beneath->thread_alive (ptid);
|
|
|
|
/* We update the thread list every time the child stops, so all
|
|
valid threads should be in the thread list. */
|
|
return in_thread_list (ptid);
|
|
}
|
|
|
|
/* Return a printable representation of composite PID for use in
|
|
"info threads" output. */
|
|
|
|
const char *
|
|
aix_thread_target::pid_to_str (ptid_t ptid)
|
|
{
|
|
static char *ret = NULL;
|
|
struct target_ops *beneath = find_target_beneath (this);
|
|
|
|
if (!PD_TID (ptid))
|
|
return beneath->pid_to_str (ptid);
|
|
|
|
/* Free previous return value; a new one will be allocated by
|
|
xstrprintf(). */
|
|
xfree (ret);
|
|
|
|
ret = xstrprintf (_("Thread %ld"), ptid_get_tid (ptid));
|
|
return ret;
|
|
}
|
|
|
|
/* Return a printable representation of extra information about
|
|
THREAD, for use in "info threads" output. */
|
|
|
|
const char *
|
|
aix_thread_target::extra_thread_info (struct thread_info *thread)
|
|
{
|
|
int status;
|
|
pthdb_pthread_t pdtid;
|
|
pthdb_tid_t tid;
|
|
pthdb_state_t state;
|
|
pthdb_suspendstate_t suspendstate;
|
|
pthdb_detachstate_t detachstate;
|
|
int cancelpend;
|
|
static char *ret = NULL;
|
|
|
|
if (!PD_TID (thread->ptid))
|
|
return NULL;
|
|
|
|
string_file buf;
|
|
aix_thread_info *priv = get_aix_thread_info (thread);
|
|
|
|
pdtid = priv->pdtid;
|
|
tid = priv->tid;
|
|
|
|
if (tid != PTHDB_INVALID_TID)
|
|
/* i18n: Like "thread-identifier %d, [state] running, suspended" */
|
|
buf.printf (_("tid %d"), (int)tid);
|
|
|
|
status = pthdb_pthread_state (pd_session, pdtid, &state);
|
|
if (status != PTHDB_SUCCESS)
|
|
state = PST_NOTSUP;
|
|
buf.printf (", %s", state2str (state));
|
|
|
|
status = pthdb_pthread_suspendstate (pd_session, pdtid,
|
|
&suspendstate);
|
|
if (status == PTHDB_SUCCESS && suspendstate == PSS_SUSPENDED)
|
|
/* i18n: Like "Thread-Id %d, [state] running, suspended" */
|
|
buf.printf (_(", suspended"));
|
|
|
|
status = pthdb_pthread_detachstate (pd_session, pdtid,
|
|
&detachstate);
|
|
if (status == PTHDB_SUCCESS && detachstate == PDS_DETACHED)
|
|
/* i18n: Like "Thread-Id %d, [state] running, detached" */
|
|
buf.printf (_(", detached"));
|
|
|
|
pthdb_pthread_cancelpend (pd_session, pdtid, &cancelpend);
|
|
if (status == PTHDB_SUCCESS && cancelpend)
|
|
/* i18n: Like "Thread-Id %d, [state] running, cancel pending" */
|
|
buf.printf (_(", cancel pending"));
|
|
|
|
buf.write ("", 1);
|
|
|
|
xfree (ret); /* Free old buffer. */
|
|
|
|
ret = xstrdup (buf.c_str ());
|
|
|
|
return ret;
|
|
}
|
|
|
|
ptid_t
|
|
aix_thread_target::get_ada_task_ptid (long lwp, long thread)
|
|
{
|
|
return ptid_build (ptid_get_pid (inferior_ptid), 0, thread);
|
|
}
|
|
|
|
|
|
/* Module startup initialization function, automagically called by
|
|
init.c. */
|
|
|
|
void
|
|
_initialize_aix_thread (void)
|
|
{
|
|
/* Notice when object files get loaded and unloaded. */
|
|
gdb::observers::new_objfile.attach (new_objfile);
|
|
|
|
/* Add ourselves to inferior_created event chain.
|
|
This is needed to enable the thread target on "attach". */
|
|
gdb::observers::inferior_created.attach (aix_thread_inferior_created);
|
|
|
|
add_setshow_boolean_cmd ("aix-thread", class_maintenance, &debug_aix_thread,
|
|
_("Set debugging of AIX thread module."),
|
|
_("Show debugging of AIX thread module."),
|
|
_("Enables debugging output (used to debug GDB)."),
|
|
NULL, NULL,
|
|
/* FIXME: i18n: Debugging of AIX thread
|
|
module is \"%d\". */
|
|
&setdebuglist, &showdebuglist);
|
|
}
|