forked from Imagelibrary/binutils-gdb
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.
1630 lines
41 KiB
C
1630 lines
41 KiB
C
/* Machine independent support for QNX Neutrino /proc (process file system)
|
|
for GDB. Written by Colin Burgess at QNX Software Systems Limited.
|
|
|
|
Copyright (C) 2003-2018 Free Software Foundation, Inc.
|
|
|
|
Contributed by QNX Software Systems Ltd.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
|
|
#include <fcntl.h>
|
|
#include <spawn.h>
|
|
#include <sys/debug.h>
|
|
#include <sys/procfs.h>
|
|
#include <sys/neutrino.h>
|
|
#include <sys/syspage.h>
|
|
#include <dirent.h>
|
|
#include <sys/netmgr.h>
|
|
#include <sys/auxv.h>
|
|
|
|
#include "gdbcore.h"
|
|
#include "inferior.h"
|
|
#include "target.h"
|
|
#include "objfiles.h"
|
|
#include "gdbthread.h"
|
|
#include "nto-tdep.h"
|
|
#include "command.h"
|
|
#include "regcache.h"
|
|
#include "solib.h"
|
|
#include "inf-child.h"
|
|
#include "common/filestuff.h"
|
|
#include "common/scoped_fd.h"
|
|
|
|
#define NULL_PID 0
|
|
#define _DEBUG_FLAG_TRACE (_DEBUG_FLAG_TRACE_EXEC|_DEBUG_FLAG_TRACE_RD|\
|
|
_DEBUG_FLAG_TRACE_WR|_DEBUG_FLAG_TRACE_MODIFY)
|
|
|
|
int ctl_fd;
|
|
|
|
static sighandler_t ofunc;
|
|
|
|
static procfs_run run;
|
|
|
|
/* Create the "native" and "procfs" targets. */
|
|
|
|
struct nto_procfs_target : public inf_child_target
|
|
{
|
|
void open (const char *arg, int from_tty) override;
|
|
|
|
void attach (const char *, int) override = 0;
|
|
|
|
void post_attach (int);
|
|
|
|
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 files_info () override;
|
|
|
|
int insert_breakpoint (struct gdbarch *, struct bp_target_info *) override;
|
|
|
|
int remove_breakpoint (struct gdbarch *, struct bp_target_info *,
|
|
enum remove_bp_reason) override;
|
|
|
|
int can_use_hw_breakpoint (enum bptype, int, int) override;
|
|
|
|
int insert_hw_breakpoint (struct gdbarch *, struct bp_target_info *) override;
|
|
|
|
int remove_hw_breakpoint (struct gdbarch *, struct bp_target_info *) override;
|
|
|
|
int insert_watchpoint (CORE_ADDR, int, enum target_hw_bp_type,
|
|
struct expression *) override;
|
|
|
|
int remove_watchpoint (CORE_ADDR, int, enum target_hw_bp_type,
|
|
struct expression *) override;
|
|
|
|
int stopped_by_watchpoint () override;
|
|
|
|
void kill () override;
|
|
|
|
void create_inferior (const char *, const std::string &,
|
|
char **, int) override;
|
|
|
|
void mourn_inferior () override;
|
|
|
|
void pass_signals (int, unsigned char *) override;
|
|
|
|
int thread_alive (ptid_t ptid) override;
|
|
|
|
void update_thread_list () override;
|
|
|
|
const char *pid_to_str (ptid_t) override;
|
|
|
|
void interrupt () override;
|
|
|
|
bool have_continuable_watchpoint ()
|
|
{ return true; }
|
|
|
|
const char *extra_thread_info (struct thread_info *) override;
|
|
|
|
char *pid_to_exec_file (int pid) override;
|
|
};
|
|
|
|
/* For "target native". */
|
|
struct nto_procfs_target_native final : public nto_procfs_target
|
|
{
|
|
/* Leave shortname as "native". */
|
|
|
|
const char *longname () override
|
|
{ return _("QNX Neutrino local process"); }
|
|
|
|
const char *doc () override
|
|
{ return _("QNX Neutrino local process (started by the \"run\" command)."); }
|
|
};
|
|
|
|
/* For "target procfs <node>". */
|
|
struct nto_procfs_target_procfs final : public nto_procfs_target
|
|
{
|
|
const char *shortname () override
|
|
{ return "procfs"; }
|
|
|
|
const char *longname () override
|
|
{ return _("QNX Neutrino local or remote process"); }
|
|
|
|
const char *doc () override
|
|
{ return _("QNX Neutrino process. target procfs <node>"); }
|
|
};
|
|
|
|
static ptid_t do_attach (ptid_t ptid);
|
|
|
|
/* These two globals are only ever set in procfs_open_1, but are
|
|
referenced elsewhere. 'nto_procfs_node' is a flag used to say
|
|
whether we are local, or we should get the current node descriptor
|
|
for the remote QNX node. */
|
|
static char *nodestr;
|
|
static unsigned nto_procfs_node = ND_LOCAL_NODE;
|
|
|
|
/* Return the current QNX Node, or error out. This is a simple
|
|
wrapper for the netmgr_strtond() function. The reason this
|
|
is required is because QNX node descriptors are transient so
|
|
we have to re-acquire them every time. */
|
|
static unsigned
|
|
nto_node (void)
|
|
{
|
|
unsigned node;
|
|
|
|
if (ND_NODE_CMP (nto_procfs_node, ND_LOCAL_NODE) == 0
|
|
|| nodestr == NULL)
|
|
return ND_LOCAL_NODE;
|
|
|
|
node = netmgr_strtond (nodestr, 0);
|
|
if (node == -1)
|
|
error (_("Lost the QNX node. Debug session probably over."));
|
|
|
|
return (node);
|
|
}
|
|
|
|
static enum gdb_osabi
|
|
procfs_is_nto_target (bfd *abfd)
|
|
{
|
|
return GDB_OSABI_QNXNTO;
|
|
}
|
|
|
|
/* This is called when we call 'target native' or 'target procfs
|
|
<arg>' from the (gdb) prompt. For QNX6 (nto), the only valid arg
|
|
will be a QNX node string, eg: "/net/some_node". If arg is not a
|
|
valid QNX node, we will default to local. */
|
|
void
|
|
nto_procfs_target::open (const char *arg, int from_tty)
|
|
{
|
|
char *endstr;
|
|
char buffer[50];
|
|
int total_size;
|
|
procfs_sysinfo *sysinfo;
|
|
char nto_procfs_path[PATH_MAX];
|
|
|
|
/* Offer to kill previous inferiors before opening this target. */
|
|
target_preopen (from_tty);
|
|
|
|
nto_is_nto_target = procfs_is_nto_target;
|
|
|
|
/* Set the default node used for spawning to this one,
|
|
and only override it if there is a valid arg. */
|
|
|
|
xfree (nodestr);
|
|
nodestr = NULL;
|
|
|
|
nto_procfs_node = ND_LOCAL_NODE;
|
|
nodestr = (arg != NULL) ? xstrdup (arg) : NULL;
|
|
|
|
init_thread_list ();
|
|
|
|
if (nodestr)
|
|
{
|
|
nto_procfs_node = netmgr_strtond (nodestr, &endstr);
|
|
if (nto_procfs_node == -1)
|
|
{
|
|
if (errno == ENOTSUP)
|
|
printf_filtered ("QNX Net Manager not found.\n");
|
|
printf_filtered ("Invalid QNX node %s: error %d (%s).\n", nodestr,
|
|
errno, safe_strerror (errno));
|
|
xfree (nodestr);
|
|
nodestr = NULL;
|
|
nto_procfs_node = ND_LOCAL_NODE;
|
|
}
|
|
else if (*endstr)
|
|
{
|
|
if (*(endstr - 1) == '/')
|
|
*(endstr - 1) = 0;
|
|
else
|
|
*endstr = 0;
|
|
}
|
|
}
|
|
snprintf (nto_procfs_path, PATH_MAX - 1, "%s%s",
|
|
(nodestr != NULL) ? nodestr : "", "/proc");
|
|
|
|
scoped_fd fd (open (nto_procfs_path, O_RDONLY));
|
|
if (fd.get () == -1)
|
|
{
|
|
printf_filtered ("Error opening %s : %d (%s)\n", nto_procfs_path, errno,
|
|
safe_strerror (errno));
|
|
error (_("Invalid procfs arg"));
|
|
}
|
|
|
|
sysinfo = (void *) buffer;
|
|
if (devctl (fd.get (), DCMD_PROC_SYSINFO, sysinfo, sizeof buffer, 0) != EOK)
|
|
{
|
|
printf_filtered ("Error getting size: %d (%s)\n", errno,
|
|
safe_strerror (errno));
|
|
error (_("Devctl failed."));
|
|
}
|
|
else
|
|
{
|
|
total_size = sysinfo->total_size;
|
|
sysinfo = alloca (total_size);
|
|
if (sysinfo == NULL)
|
|
{
|
|
printf_filtered ("Memory error: %d (%s)\n", errno,
|
|
safe_strerror (errno));
|
|
error (_("alloca failed."));
|
|
}
|
|
else
|
|
{
|
|
if (devctl (fd.get (), DCMD_PROC_SYSINFO, sysinfo, total_size, 0)
|
|
!= EOK)
|
|
{
|
|
printf_filtered ("Error getting sysinfo: %d (%s)\n", errno,
|
|
safe_strerror (errno));
|
|
error (_("Devctl failed."));
|
|
}
|
|
else
|
|
{
|
|
if (sysinfo->type !=
|
|
nto_map_arch_to_cputype (gdbarch_bfd_arch_info
|
|
(target_gdbarch ())->arch_name))
|
|
error (_("Invalid target CPU."));
|
|
}
|
|
}
|
|
}
|
|
|
|
inf_child_target::open (arg, from_tty);
|
|
printf_filtered ("Debugging using %s\n", nto_procfs_path);
|
|
}
|
|
|
|
static void
|
|
procfs_set_thread (ptid_t ptid)
|
|
{
|
|
pid_t tid;
|
|
|
|
tid = ptid_get_tid (ptid);
|
|
devctl (ctl_fd, DCMD_PROC_CURTHREAD, &tid, sizeof (tid), 0);
|
|
}
|
|
|
|
/* Return nonzero if the thread TH is still alive. */
|
|
int
|
|
nto_procfs_target::thread_alive (ptid_t ptid)
|
|
{
|
|
pid_t tid;
|
|
pid_t pid;
|
|
procfs_status status;
|
|
int err;
|
|
|
|
tid = ptid_get_tid (ptid);
|
|
pid = ptid_get_pid (ptid);
|
|
|
|
if (kill (pid, 0) == -1)
|
|
return 0;
|
|
|
|
status.tid = tid;
|
|
if ((err = devctl (ctl_fd, DCMD_PROC_TIDSTATUS,
|
|
&status, sizeof (status), 0)) != EOK)
|
|
return 0;
|
|
|
|
/* Thread is alive or dead but not yet joined,
|
|
or dead and there is an alive (or dead unjoined) thread with
|
|
higher tid.
|
|
|
|
If the tid is not the same as requested, requested tid is dead. */
|
|
return (status.tid == tid) && (status.state != STATE_DEAD);
|
|
}
|
|
|
|
static void
|
|
update_thread_private_data_name (struct thread_info *new_thread,
|
|
const char *newname)
|
|
{
|
|
nto_thread_info *pti = get_nto_thread_info (new_thread);
|
|
|
|
gdb_assert (newname != NULL);
|
|
gdb_assert (new_thread != NULL);
|
|
|
|
if (pti)
|
|
{
|
|
pti = new nto_thread_info;
|
|
new_thread->priv.reset (pti);
|
|
}
|
|
|
|
pti->name = newname;
|
|
}
|
|
|
|
static void
|
|
update_thread_private_data (struct thread_info *new_thread,
|
|
pthread_t tid, int state, int flags)
|
|
{
|
|
procfs_info pidinfo;
|
|
struct _thread_name *tn;
|
|
procfs_threadctl tctl;
|
|
|
|
#if _NTO_VERSION > 630
|
|
gdb_assert (new_thread != NULL);
|
|
|
|
if (devctl (ctl_fd, DCMD_PROC_INFO, &pidinfo,
|
|
sizeof(pidinfo), 0) != EOK)
|
|
return;
|
|
|
|
memset (&tctl, 0, sizeof (tctl));
|
|
tctl.cmd = _NTO_TCTL_NAME;
|
|
tn = (struct _thread_name *) (&tctl.data);
|
|
|
|
/* Fetch name for the given thread. */
|
|
tctl.tid = tid;
|
|
tn->name_buf_len = sizeof (tctl.data) - sizeof (*tn);
|
|
tn->new_name_len = -1; /* Getting, not setting. */
|
|
if (devctl (ctl_fd, DCMD_PROC_THREADCTL, &tctl, sizeof (tctl), NULL) != EOK)
|
|
tn->name_buf[0] = '\0';
|
|
|
|
tn->name_buf[_NTO_THREAD_NAME_MAX] = '\0';
|
|
|
|
update_thread_private_data_name (new_thread, tn->name_buf);
|
|
|
|
nto_thread_info *pti = get_nto_thread_info (new_thread);
|
|
pti->tid = tid;
|
|
pti->state = state;
|
|
pti->flags = flags;
|
|
#endif /* _NTO_VERSION */
|
|
}
|
|
|
|
void
|
|
nto_procfs_target::update_thread_list ()
|
|
{
|
|
procfs_status status;
|
|
pid_t pid;
|
|
ptid_t ptid;
|
|
pthread_t tid;
|
|
struct thread_info *new_thread;
|
|
|
|
if (ctl_fd == -1)
|
|
return;
|
|
|
|
prune_threads ();
|
|
|
|
pid = ptid_get_pid (inferior_ptid);
|
|
|
|
status.tid = 1;
|
|
|
|
for (tid = 1;; ++tid)
|
|
{
|
|
if (status.tid == tid
|
|
&& (devctl (ctl_fd, DCMD_PROC_TIDSTATUS, &status, sizeof (status), 0)
|
|
!= EOK))
|
|
break;
|
|
if (status.tid != tid)
|
|
/* The reason why this would not be equal is that devctl might have
|
|
returned different tid, meaning the requested tid no longer exists
|
|
(e.g. thread exited). */
|
|
continue;
|
|
ptid = ptid_build (pid, 0, tid);
|
|
new_thread = find_thread_ptid (ptid);
|
|
if (!new_thread)
|
|
new_thread = add_thread (ptid);
|
|
update_thread_private_data (new_thread, tid, status.state, 0);
|
|
status.tid++;
|
|
}
|
|
return;
|
|
}
|
|
|
|
static void
|
|
do_closedir_cleanup (void *dir)
|
|
{
|
|
closedir (dir);
|
|
}
|
|
|
|
static void
|
|
procfs_pidlist (const char *args, int from_tty)
|
|
{
|
|
DIR *dp = NULL;
|
|
struct dirent *dirp = NULL;
|
|
char buf[PATH_MAX];
|
|
procfs_info *pidinfo = NULL;
|
|
procfs_debuginfo *info = NULL;
|
|
procfs_status *status = NULL;
|
|
pid_t num_threads = 0;
|
|
pid_t pid;
|
|
char name[512];
|
|
struct cleanup *cleanups;
|
|
char procfs_dir[PATH_MAX];
|
|
|
|
snprintf (procfs_dir, sizeof (procfs_dir), "%s%s",
|
|
(nodestr != NULL) ? nodestr : "", "/proc");
|
|
|
|
dp = opendir (procfs_dir);
|
|
if (dp == NULL)
|
|
{
|
|
fprintf_unfiltered (gdb_stderr, "failed to opendir \"%s\" - %d (%s)",
|
|
procfs_dir, errno, safe_strerror (errno));
|
|
return;
|
|
}
|
|
|
|
cleanups = make_cleanup (do_closedir_cleanup, dp);
|
|
|
|
/* Start scan at first pid. */
|
|
rewinddir (dp);
|
|
|
|
do
|
|
{
|
|
/* Get the right pid and procfs path for the pid. */
|
|
do
|
|
{
|
|
dirp = readdir (dp);
|
|
if (dirp == NULL)
|
|
{
|
|
do_cleanups (cleanups);
|
|
return;
|
|
}
|
|
snprintf (buf, sizeof (buf), "%s%s/%s/as",
|
|
(nodestr != NULL) ? nodestr : "",
|
|
"/proc", dirp->d_name);
|
|
pid = atoi (dirp->d_name);
|
|
}
|
|
while (pid == 0);
|
|
|
|
/* Open the procfs path. */
|
|
scoped_fd fd (open (buf, O_RDONLY));
|
|
if (fd.get () == -1)
|
|
{
|
|
fprintf_unfiltered (gdb_stderr, "failed to open %s - %d (%s)\n",
|
|
buf, errno, safe_strerror (errno));
|
|
continue;
|
|
}
|
|
|
|
pidinfo = (procfs_info *) buf;
|
|
if (devctl (fd.get (), DCMD_PROC_INFO, pidinfo, sizeof (buf), 0) != EOK)
|
|
{
|
|
fprintf_unfiltered (gdb_stderr,
|
|
"devctl DCMD_PROC_INFO failed - %d (%s)\n",
|
|
errno, safe_strerror (errno));
|
|
break;
|
|
}
|
|
num_threads = pidinfo->num_threads;
|
|
|
|
info = (procfs_debuginfo *) buf;
|
|
if (devctl (fd.get (), DCMD_PROC_MAPDEBUG_BASE, info, sizeof (buf), 0)
|
|
!= EOK)
|
|
strcpy (name, "unavailable");
|
|
else
|
|
strcpy (name, info->path);
|
|
|
|
/* Collect state info on all the threads. */
|
|
status = (procfs_status *) buf;
|
|
for (status->tid = 1; status->tid <= num_threads; status->tid++)
|
|
{
|
|
const int err
|
|
= devctl (fd.get (), DCMD_PROC_TIDSTATUS, status, sizeof (buf), 0);
|
|
printf_filtered ("%s - %d", name, pid);
|
|
if (err == EOK && status->tid != 0)
|
|
printf_filtered ("/%d\n", status->tid);
|
|
else
|
|
{
|
|
printf_filtered ("\n");
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
while (dirp != NULL);
|
|
|
|
do_cleanups (cleanups);
|
|
return;
|
|
}
|
|
|
|
static void
|
|
procfs_meminfo (const char *args, int from_tty)
|
|
{
|
|
procfs_mapinfo *mapinfos = NULL;
|
|
static int num_mapinfos = 0;
|
|
procfs_mapinfo *mapinfo_p, *mapinfo_p2;
|
|
int flags = ~0, err, num, i, j;
|
|
|
|
struct
|
|
{
|
|
procfs_debuginfo info;
|
|
char buff[_POSIX_PATH_MAX];
|
|
} map;
|
|
|
|
struct info
|
|
{
|
|
unsigned addr;
|
|
unsigned size;
|
|
unsigned flags;
|
|
unsigned debug_vaddr;
|
|
unsigned long long offset;
|
|
};
|
|
|
|
struct printinfo
|
|
{
|
|
unsigned long long ino;
|
|
unsigned dev;
|
|
struct info text;
|
|
struct info data;
|
|
char name[256];
|
|
} printme;
|
|
|
|
/* Get the number of map entrys. */
|
|
err = devctl (ctl_fd, DCMD_PROC_MAPINFO, NULL, 0, &num);
|
|
if (err != EOK)
|
|
{
|
|
printf ("failed devctl num mapinfos - %d (%s)\n", err,
|
|
safe_strerror (err));
|
|
return;
|
|
}
|
|
|
|
mapinfos = XNEWVEC (procfs_mapinfo, num);
|
|
|
|
num_mapinfos = num;
|
|
mapinfo_p = mapinfos;
|
|
|
|
/* Fill the map entrys. */
|
|
err = devctl (ctl_fd, DCMD_PROC_MAPINFO, mapinfo_p, num
|
|
* sizeof (procfs_mapinfo), &num);
|
|
if (err != EOK)
|
|
{
|
|
printf ("failed devctl mapinfos - %d (%s)\n", err, safe_strerror (err));
|
|
xfree (mapinfos);
|
|
return;
|
|
}
|
|
|
|
num = std::min (num, num_mapinfos);
|
|
|
|
/* Run through the list of mapinfos, and store the data and text info
|
|
so we can print it at the bottom of the loop. */
|
|
for (mapinfo_p = mapinfos, i = 0; i < num; i++, mapinfo_p++)
|
|
{
|
|
if (!(mapinfo_p->flags & flags))
|
|
mapinfo_p->ino = 0;
|
|
|
|
if (mapinfo_p->ino == 0) /* Already visited. */
|
|
continue;
|
|
|
|
map.info.vaddr = mapinfo_p->vaddr;
|
|
|
|
err = devctl (ctl_fd, DCMD_PROC_MAPDEBUG, &map, sizeof (map), 0);
|
|
if (err != EOK)
|
|
continue;
|
|
|
|
memset (&printme, 0, sizeof printme);
|
|
printme.dev = mapinfo_p->dev;
|
|
printme.ino = mapinfo_p->ino;
|
|
printme.text.addr = mapinfo_p->vaddr;
|
|
printme.text.size = mapinfo_p->size;
|
|
printme.text.flags = mapinfo_p->flags;
|
|
printme.text.offset = mapinfo_p->offset;
|
|
printme.text.debug_vaddr = map.info.vaddr;
|
|
strcpy (printme.name, map.info.path);
|
|
|
|
/* Check for matching data. */
|
|
for (mapinfo_p2 = mapinfos, j = 0; j < num; j++, mapinfo_p2++)
|
|
{
|
|
if (mapinfo_p2->vaddr != mapinfo_p->vaddr
|
|
&& mapinfo_p2->ino == mapinfo_p->ino
|
|
&& mapinfo_p2->dev == mapinfo_p->dev)
|
|
{
|
|
map.info.vaddr = mapinfo_p2->vaddr;
|
|
err =
|
|
devctl (ctl_fd, DCMD_PROC_MAPDEBUG, &map, sizeof (map), 0);
|
|
if (err != EOK)
|
|
continue;
|
|
|
|
if (strcmp (map.info.path, printme.name))
|
|
continue;
|
|
|
|
/* Lower debug_vaddr is always text, if nessessary, swap. */
|
|
if ((int) map.info.vaddr < (int) printme.text.debug_vaddr)
|
|
{
|
|
memcpy (&(printme.data), &(printme.text),
|
|
sizeof (printme.data));
|
|
printme.text.addr = mapinfo_p2->vaddr;
|
|
printme.text.size = mapinfo_p2->size;
|
|
printme.text.flags = mapinfo_p2->flags;
|
|
printme.text.offset = mapinfo_p2->offset;
|
|
printme.text.debug_vaddr = map.info.vaddr;
|
|
}
|
|
else
|
|
{
|
|
printme.data.addr = mapinfo_p2->vaddr;
|
|
printme.data.size = mapinfo_p2->size;
|
|
printme.data.flags = mapinfo_p2->flags;
|
|
printme.data.offset = mapinfo_p2->offset;
|
|
printme.data.debug_vaddr = map.info.vaddr;
|
|
}
|
|
mapinfo_p2->ino = 0;
|
|
}
|
|
}
|
|
mapinfo_p->ino = 0;
|
|
|
|
printf_filtered ("%s\n", printme.name);
|
|
printf_filtered ("\ttext=%08x bytes @ 0x%08x\n", printme.text.size,
|
|
printme.text.addr);
|
|
printf_filtered ("\t\tflags=%08x\n", printme.text.flags);
|
|
printf_filtered ("\t\tdebug=%08x\n", printme.text.debug_vaddr);
|
|
printf_filtered ("\t\toffset=%s\n", phex (printme.text.offset, 8));
|
|
if (printme.data.size)
|
|
{
|
|
printf_filtered ("\tdata=%08x bytes @ 0x%08x\n", printme.data.size,
|
|
printme.data.addr);
|
|
printf_filtered ("\t\tflags=%08x\n", printme.data.flags);
|
|
printf_filtered ("\t\tdebug=%08x\n", printme.data.debug_vaddr);
|
|
printf_filtered ("\t\toffset=%s\n", phex (printme.data.offset, 8));
|
|
}
|
|
printf_filtered ("\tdev=0x%x\n", printme.dev);
|
|
printf_filtered ("\tino=0x%x\n", (unsigned int) printme.ino);
|
|
}
|
|
xfree (mapinfos);
|
|
return;
|
|
}
|
|
|
|
/* Print status information about what we're accessing. */
|
|
void
|
|
nto_procfs_target::files_info ()
|
|
{
|
|
struct inferior *inf = current_inferior ();
|
|
|
|
printf_unfiltered ("\tUsing the running image of %s %s via %s.\n",
|
|
inf->attach_flag ? "attached" : "child",
|
|
target_pid_to_str (inferior_ptid),
|
|
(nodestr != NULL) ? nodestr : "local node");
|
|
}
|
|
|
|
/* Target to_pid_to_exec_file implementation. */
|
|
|
|
char *
|
|
nto_procfs_target::pid_to_exec_file (const int pid)
|
|
{
|
|
int proc_fd;
|
|
static char proc_path[PATH_MAX];
|
|
ssize_t rd;
|
|
|
|
/* Read exe file name. */
|
|
snprintf (proc_path, sizeof (proc_path), "%s/proc/%d/exefile",
|
|
(nodestr != NULL) ? nodestr : "", pid);
|
|
proc_fd = open (proc_path, O_RDONLY);
|
|
if (proc_fd == -1)
|
|
return NULL;
|
|
|
|
rd = read (proc_fd, proc_path, sizeof (proc_path) - 1);
|
|
close (proc_fd);
|
|
if (rd <= 0)
|
|
{
|
|
proc_path[0] = '\0';
|
|
return NULL;
|
|
}
|
|
proc_path[rd] = '\0';
|
|
return proc_path;
|
|
}
|
|
|
|
/* Attach to process PID, then initialize for debugging it. */
|
|
void
|
|
nto_procfs_target::attach (const char *args, int from_tty)
|
|
{
|
|
char *exec_file;
|
|
int pid;
|
|
struct inferior *inf;
|
|
|
|
pid = parse_pid_to_attach (args);
|
|
|
|
if (pid == getpid ())
|
|
error (_("Attaching GDB to itself is not a good idea..."));
|
|
|
|
if (from_tty)
|
|
{
|
|
exec_file = (char *) get_exec_file (0);
|
|
|
|
if (exec_file)
|
|
printf_unfiltered ("Attaching to program `%s', %s\n", exec_file,
|
|
target_pid_to_str (pid_to_ptid (pid)));
|
|
else
|
|
printf_unfiltered ("Attaching to %s\n",
|
|
target_pid_to_str (pid_to_ptid (pid)));
|
|
|
|
gdb_flush (gdb_stdout);
|
|
}
|
|
inferior_ptid = do_attach (pid_to_ptid (pid));
|
|
inf = current_inferior ();
|
|
inferior_appeared (inf, pid);
|
|
inf->attach_flag = 1;
|
|
|
|
if (!target_is_pushed (ops))
|
|
push_target (ops);
|
|
|
|
procfs_update_thread_list (ops);
|
|
}
|
|
|
|
void
|
|
nto_procfs_target::post_attach (pid_t pid)
|
|
{
|
|
if (exec_bfd)
|
|
solib_create_inferior_hook (0);
|
|
}
|
|
|
|
static ptid_t
|
|
do_attach (ptid_t ptid)
|
|
{
|
|
procfs_status status;
|
|
struct sigevent event;
|
|
char path[PATH_MAX];
|
|
|
|
snprintf (path, PATH_MAX - 1, "%s%s/%d/as",
|
|
(nodestr != NULL) ? nodestr : "", "/proc", ptid_get_pid (ptid));
|
|
ctl_fd = open (path, O_RDWR);
|
|
if (ctl_fd == -1)
|
|
error (_("Couldn't open proc file %s, error %d (%s)"), path, errno,
|
|
safe_strerror (errno));
|
|
if (devctl (ctl_fd, DCMD_PROC_STOP, &status, sizeof (status), 0) != EOK)
|
|
error (_("Couldn't stop process"));
|
|
|
|
/* Define a sigevent for process stopped notification. */
|
|
event.sigev_notify = SIGEV_SIGNAL_THREAD;
|
|
event.sigev_signo = SIGUSR1;
|
|
event.sigev_code = 0;
|
|
event.sigev_value.sival_ptr = NULL;
|
|
event.sigev_priority = -1;
|
|
devctl (ctl_fd, DCMD_PROC_EVENT, &event, sizeof (event), 0);
|
|
|
|
if (devctl (ctl_fd, DCMD_PROC_STATUS, &status, sizeof (status), 0) == EOK
|
|
&& status.flags & _DEBUG_FLAG_STOPPED)
|
|
SignalKill (nto_node (), ptid_get_pid (ptid), 0, SIGCONT, 0, 0);
|
|
nto_init_solib_absolute_prefix ();
|
|
return ptid_build (ptid_get_pid (ptid), 0, status.tid);
|
|
}
|
|
|
|
/* Ask the user what to do when an interrupt is received. */
|
|
static void
|
|
interrupt_query (void)
|
|
{
|
|
if (query (_("Interrupted while waiting for the program.\n\
|
|
Give up (and stop debugging it)? ")))
|
|
{
|
|
target_mourn_inferior (inferior_ptid);
|
|
quit ();
|
|
}
|
|
}
|
|
|
|
/* The user typed ^C twice. */
|
|
static void
|
|
nto_handle_sigint_twice (int signo)
|
|
{
|
|
signal (signo, ofunc);
|
|
interrupt_query ();
|
|
signal (signo, nto_handle_sigint_twice);
|
|
}
|
|
|
|
static void
|
|
nto_handle_sigint (int signo)
|
|
{
|
|
/* If this doesn't work, try more severe steps. */
|
|
signal (signo, nto_handle_sigint_twice);
|
|
|
|
target_interrupt ();
|
|
}
|
|
|
|
sptid_t
|
|
nto_procfs_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
|
|
int options)
|
|
{
|
|
sigset_t set;
|
|
siginfo_t info;
|
|
procfs_status status;
|
|
static int exit_signo = 0; /* To track signals that cause termination. */
|
|
|
|
ourstatus->kind = TARGET_WAITKIND_SPURIOUS;
|
|
|
|
if (ptid_equal (inferior_ptid, null_ptid))
|
|
{
|
|
ourstatus->kind = TARGET_WAITKIND_STOPPED;
|
|
ourstatus->value.sig = GDB_SIGNAL_0;
|
|
exit_signo = 0;
|
|
return null_ptid;
|
|
}
|
|
|
|
sigemptyset (&set);
|
|
sigaddset (&set, SIGUSR1);
|
|
|
|
devctl (ctl_fd, DCMD_PROC_STATUS, &status, sizeof (status), 0);
|
|
while (!(status.flags & _DEBUG_FLAG_ISTOP))
|
|
{
|
|
ofunc = signal (SIGINT, nto_handle_sigint);
|
|
sigwaitinfo (&set, &info);
|
|
signal (SIGINT, ofunc);
|
|
devctl (ctl_fd, DCMD_PROC_STATUS, &status, sizeof (status), 0);
|
|
}
|
|
|
|
nto_inferior_data (NULL)->stopped_flags = status.flags;
|
|
nto_inferior_data (NULL)->stopped_pc = status.ip;
|
|
|
|
if (status.flags & _DEBUG_FLAG_SSTEP)
|
|
{
|
|
ourstatus->kind = TARGET_WAITKIND_STOPPED;
|
|
ourstatus->value.sig = GDB_SIGNAL_TRAP;
|
|
}
|
|
/* Was it a breakpoint? */
|
|
else if (status.flags & _DEBUG_FLAG_TRACE)
|
|
{
|
|
ourstatus->kind = TARGET_WAITKIND_STOPPED;
|
|
ourstatus->value.sig = GDB_SIGNAL_TRAP;
|
|
}
|
|
else if (status.flags & _DEBUG_FLAG_ISTOP)
|
|
{
|
|
switch (status.why)
|
|
{
|
|
case _DEBUG_WHY_SIGNALLED:
|
|
ourstatus->kind = TARGET_WAITKIND_STOPPED;
|
|
ourstatus->value.sig =
|
|
gdb_signal_from_host (status.info.si_signo);
|
|
exit_signo = 0;
|
|
break;
|
|
case _DEBUG_WHY_FAULTED:
|
|
ourstatus->kind = TARGET_WAITKIND_STOPPED;
|
|
if (status.info.si_signo == SIGTRAP)
|
|
{
|
|
ourstatus->value.sig = 0;
|
|
exit_signo = 0;
|
|
}
|
|
else
|
|
{
|
|
ourstatus->value.sig =
|
|
gdb_signal_from_host (status.info.si_signo);
|
|
exit_signo = ourstatus->value.sig;
|
|
}
|
|
break;
|
|
|
|
case _DEBUG_WHY_TERMINATED:
|
|
{
|
|
int waitval = 0;
|
|
|
|
waitpid (ptid_get_pid (inferior_ptid), &waitval, WNOHANG);
|
|
if (exit_signo)
|
|
{
|
|
/* Abnormal death. */
|
|
ourstatus->kind = TARGET_WAITKIND_SIGNALLED;
|
|
ourstatus->value.sig = exit_signo;
|
|
}
|
|
else
|
|
{
|
|
/* Normal death. */
|
|
ourstatus->kind = TARGET_WAITKIND_EXITED;
|
|
ourstatus->value.integer = WEXITSTATUS (waitval);
|
|
}
|
|
exit_signo = 0;
|
|
break;
|
|
}
|
|
|
|
case _DEBUG_WHY_REQUESTED:
|
|
/* We are assuming a requested stop is due to a SIGINT. */
|
|
ourstatus->kind = TARGET_WAITKIND_STOPPED;
|
|
ourstatus->value.sig = GDB_SIGNAL_INT;
|
|
exit_signo = 0;
|
|
break;
|
|
}
|
|
}
|
|
|
|
return ptid_build (status.pid, 0, status.tid);
|
|
}
|
|
|
|
/* Read the current values of the inferior's registers, both the
|
|
general register set and floating point registers (if supported)
|
|
and update gdb's idea of their current values. */
|
|
void
|
|
nto_procfs_target::fetch_registers (struct regcache *regcache, int regno)
|
|
{
|
|
union
|
|
{
|
|
procfs_greg greg;
|
|
procfs_fpreg fpreg;
|
|
procfs_altreg altreg;
|
|
}
|
|
reg;
|
|
int regsize;
|
|
|
|
procfs_set_thread (regcache_get_ptid (regcache));
|
|
if (devctl (ctl_fd, DCMD_PROC_GETGREG, ®, sizeof (reg), ®size) == EOK)
|
|
nto_supply_gregset (regcache, (char *) ®.greg);
|
|
if (devctl (ctl_fd, DCMD_PROC_GETFPREG, ®, sizeof (reg), ®size)
|
|
== EOK)
|
|
nto_supply_fpregset (regcache, (char *) ®.fpreg);
|
|
if (devctl (ctl_fd, DCMD_PROC_GETALTREG, ®, sizeof (reg), ®size)
|
|
== EOK)
|
|
nto_supply_altregset (regcache, (char *) ®.altreg);
|
|
}
|
|
|
|
/* Helper for procfs_xfer_partial that handles memory transfers.
|
|
Arguments are like target_xfer_partial. */
|
|
|
|
static enum target_xfer_status
|
|
procfs_xfer_memory (gdb_byte *readbuf, const gdb_byte *writebuf,
|
|
ULONGEST memaddr, ULONGEST len, ULONGEST *xfered_len)
|
|
{
|
|
int nbytes;
|
|
|
|
if (lseek (ctl_fd, (off_t) memaddr, SEEK_SET) != (off_t) memaddr)
|
|
return TARGET_XFER_E_IO;
|
|
|
|
if (writebuf != NULL)
|
|
nbytes = write (ctl_fd, writebuf, len);
|
|
else
|
|
nbytes = read (ctl_fd, readbuf, len);
|
|
if (nbytes <= 0)
|
|
return TARGET_XFER_E_IO;
|
|
*xfered_len = nbytes;
|
|
return TARGET_XFER_OK;
|
|
}
|
|
|
|
/* Target to_xfer_partial implementation. */
|
|
|
|
enum target_xfer_status
|
|
nto_procfs_target::xfer_partial (enum target_object object,
|
|
const char *annex, gdb_byte *readbuf,
|
|
const gdb_byte *writebuf, ULONGEST offset,
|
|
ULONGEST len, ULONGEST *xfered_len)
|
|
{
|
|
switch (object)
|
|
{
|
|
case TARGET_OBJECT_MEMORY:
|
|
return procfs_xfer_memory (readbuf, writebuf, offset, len, xfered_len);
|
|
case TARGET_OBJECT_AUXV:
|
|
if (readbuf != NULL)
|
|
{
|
|
int err;
|
|
CORE_ADDR initial_stack;
|
|
debug_process_t procinfo;
|
|
/* For 32-bit architecture, size of auxv_t is 8 bytes. */
|
|
const unsigned int sizeof_auxv_t = sizeof (auxv_t);
|
|
const unsigned int sizeof_tempbuf = 20 * sizeof_auxv_t;
|
|
int tempread;
|
|
gdb_byte *const tempbuf = alloca (sizeof_tempbuf);
|
|
|
|
if (tempbuf == NULL)
|
|
return TARGET_XFER_E_IO;
|
|
|
|
err = devctl (ctl_fd, DCMD_PROC_INFO, &procinfo,
|
|
sizeof procinfo, 0);
|
|
if (err != EOK)
|
|
return TARGET_XFER_E_IO;
|
|
|
|
initial_stack = procinfo.initial_stack;
|
|
|
|
/* procfs is always 'self-hosted', no byte-order manipulation. */
|
|
tempread = nto_read_auxv_from_initial_stack (initial_stack, tempbuf,
|
|
sizeof_tempbuf,
|
|
sizeof (auxv_t));
|
|
tempread = std::min (tempread, len) - offset;
|
|
memcpy (readbuf, tempbuf + offset, tempread);
|
|
*xfered_len = tempread;
|
|
return tempread ? TARGET_XFER_OK : TARGET_XFER_EOF;
|
|
}
|
|
/* Fallthru */
|
|
default:
|
|
return this->beneath->xfer_partial (object, annex,
|
|
readbuf, writebuf, offset, len,
|
|
xfered_len);
|
|
}
|
|
}
|
|
|
|
/* Take a program previously attached to and detaches it.
|
|
The program resumes execution and will no longer stop
|
|
on signals, etc. We'd better not have left any breakpoints
|
|
in the program or it'll die when it hits one. */
|
|
void
|
|
nto_procfs_target::detach (inferior *inf, int from_tty)
|
|
{
|
|
int pid;
|
|
|
|
target_announce_detach ();
|
|
|
|
if (siggnal)
|
|
SignalKill (nto_node (), ptid_get_pid (inferior_ptid), 0, 0, 0, 0);
|
|
|
|
close (ctl_fd);
|
|
ctl_fd = -1;
|
|
|
|
pid = ptid_get_pid (inferior_ptid);
|
|
inferior_ptid = null_ptid;
|
|
detach_inferior (pid);
|
|
init_thread_list ();
|
|
inf_child_maybe_unpush_target (ops);
|
|
}
|
|
|
|
static int
|
|
procfs_breakpoint (CORE_ADDR addr, int type, int size)
|
|
{
|
|
procfs_break brk;
|
|
|
|
brk.type = type;
|
|
brk.addr = addr;
|
|
brk.size = size;
|
|
errno = devctl (ctl_fd, DCMD_PROC_BREAK, &brk, sizeof (brk), 0);
|
|
if (errno != EOK)
|
|
return 1;
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
nto_procfs_target::insert_breakpoint (struct gdbarch *gdbarch,
|
|
struct bp_target_info *bp_tgt)
|
|
{
|
|
bp_tgt->placed_address = bp_tgt->reqstd_address;
|
|
return procfs_breakpoint (bp_tgt->placed_address, _DEBUG_BREAK_EXEC, 0);
|
|
}
|
|
|
|
int
|
|
nto_procfs_target::remove_breakpoint (struct gdbarch *gdbarch,
|
|
struct bp_target_info *bp_tgt,
|
|
enum remove_bp_reason reason)
|
|
{
|
|
return procfs_breakpoint (bp_tgt->placed_address, _DEBUG_BREAK_EXEC, -1);
|
|
}
|
|
|
|
int
|
|
nto_procfs_target::insert_hw_breakpoint (struct gdbarch *gdbarch,
|
|
struct bp_target_info *bp_tgt)
|
|
{
|
|
bp_tgt->placed_address = bp_tgt->reqstd_address;
|
|
return procfs_breakpoint (bp_tgt->placed_address,
|
|
_DEBUG_BREAK_EXEC | _DEBUG_BREAK_HW, 0);
|
|
}
|
|
|
|
int
|
|
nto_procfs_target::remove_hw_breakpoint (struct gdbarch *gdbarch,
|
|
struct bp_target_info *bp_tgt)
|
|
{
|
|
return procfs_breakpoint (bp_tgt->placed_address,
|
|
_DEBUG_BREAK_EXEC | _DEBUG_BREAK_HW, -1);
|
|
}
|
|
|
|
void
|
|
nto_procfs_target::resume (ptid_t ptid, int step, enum gdb_signal signo)
|
|
{
|
|
int signal_to_pass;
|
|
procfs_status status;
|
|
sigset_t *run_fault = (sigset_t *) (void *) &run.fault;
|
|
|
|
if (ptid_equal (inferior_ptid, null_ptid))
|
|
return;
|
|
|
|
procfs_set_thread (ptid_equal (ptid, minus_one_ptid) ? inferior_ptid :
|
|
ptid);
|
|
|
|
run.flags = _DEBUG_RUN_FAULT | _DEBUG_RUN_TRACE;
|
|
if (step)
|
|
run.flags |= _DEBUG_RUN_STEP;
|
|
|
|
sigemptyset (run_fault);
|
|
sigaddset (run_fault, FLTBPT);
|
|
sigaddset (run_fault, FLTTRACE);
|
|
sigaddset (run_fault, FLTILL);
|
|
sigaddset (run_fault, FLTPRIV);
|
|
sigaddset (run_fault, FLTBOUNDS);
|
|
sigaddset (run_fault, FLTIOVF);
|
|
sigaddset (run_fault, FLTIZDIV);
|
|
sigaddset (run_fault, FLTFPE);
|
|
/* Peter V will be changing this at some point. */
|
|
sigaddset (run_fault, FLTPAGE);
|
|
|
|
run.flags |= _DEBUG_RUN_ARM;
|
|
|
|
signal_to_pass = gdb_signal_to_host (signo);
|
|
|
|
if (signal_to_pass)
|
|
{
|
|
devctl (ctl_fd, DCMD_PROC_STATUS, &status, sizeof (status), 0);
|
|
signal_to_pass = gdb_signal_to_host (signo);
|
|
if (status.why & (_DEBUG_WHY_SIGNALLED | _DEBUG_WHY_FAULTED))
|
|
{
|
|
if (signal_to_pass != status.info.si_signo)
|
|
{
|
|
SignalKill (nto_node (), ptid_get_pid (inferior_ptid), 0,
|
|
signal_to_pass, 0, 0);
|
|
run.flags |= _DEBUG_RUN_CLRFLT | _DEBUG_RUN_CLRSIG;
|
|
}
|
|
else /* Let it kill the program without telling us. */
|
|
sigdelset (&run.trace, signal_to_pass);
|
|
}
|
|
}
|
|
else
|
|
run.flags |= _DEBUG_RUN_CLRSIG | _DEBUG_RUN_CLRFLT;
|
|
|
|
errno = devctl (ctl_fd, DCMD_PROC_RUN, &run, sizeof (run), 0);
|
|
if (errno != EOK)
|
|
{
|
|
perror (_("run error!\n"));
|
|
return;
|
|
}
|
|
}
|
|
|
|
void
|
|
nto_procfs_target::mourn_inferior ()
|
|
{
|
|
if (!ptid_equal (inferior_ptid, null_ptid))
|
|
{
|
|
SignalKill (nto_node (), ptid_get_pid (inferior_ptid), 0, SIGKILL, 0, 0);
|
|
close (ctl_fd);
|
|
}
|
|
inferior_ptid = null_ptid;
|
|
init_thread_list ();
|
|
inf_child_mourn_inferior (ops);
|
|
}
|
|
|
|
/* This function breaks up an argument string into an argument
|
|
vector suitable for passing to execvp().
|
|
E.g., on "run a b c d" this routine would get as input
|
|
the string "a b c d", and as output it would fill in argv with
|
|
the four arguments "a", "b", "c", "d". The only additional
|
|
functionality is simple quoting. The gdb command:
|
|
run a "b c d" f
|
|
will fill in argv with the three args "a", "b c d", "e". */
|
|
static void
|
|
breakup_args (char *scratch, char **argv)
|
|
{
|
|
char *pp, *cp = scratch;
|
|
char quoting = 0;
|
|
|
|
for (;;)
|
|
{
|
|
/* Scan past leading separators. */
|
|
quoting = 0;
|
|
while (*cp == ' ' || *cp == '\t' || *cp == '\n')
|
|
cp++;
|
|
|
|
/* Break if at end of string. */
|
|
if (*cp == '\0')
|
|
break;
|
|
|
|
/* Take an arg. */
|
|
if (*cp == '"')
|
|
{
|
|
cp++;
|
|
quoting = strchr (cp, '"') ? 1 : 0;
|
|
}
|
|
|
|
*argv++ = cp;
|
|
|
|
/* Scan for next arg separator. */
|
|
pp = cp;
|
|
if (quoting)
|
|
cp = strchr (pp, '"');
|
|
if ((cp == NULL) || (!quoting))
|
|
cp = strchr (pp, ' ');
|
|
if (cp == NULL)
|
|
cp = strchr (pp, '\t');
|
|
if (cp == NULL)
|
|
cp = strchr (pp, '\n');
|
|
|
|
/* No separators => end of string => break. */
|
|
if (cp == NULL)
|
|
{
|
|
pp = cp;
|
|
break;
|
|
}
|
|
|
|
/* Replace the separator with a terminator. */
|
|
*cp++ = '\0';
|
|
}
|
|
|
|
/* Execv requires a null-terminated arg vector. */
|
|
*argv = NULL;
|
|
}
|
|
|
|
void
|
|
nto_procfs_target::create_inferior (const char *exec_file,
|
|
const std::string &allargs,
|
|
char **env, int from_tty)
|
|
{
|
|
struct inheritance inherit;
|
|
pid_t pid;
|
|
int flags, errn;
|
|
char **argv, *args;
|
|
const char *in = "", *out = "", *err = "";
|
|
int fd, fds[3];
|
|
sigset_t set;
|
|
const char *inferior_io_terminal = get_inferior_io_terminal ();
|
|
struct inferior *inf;
|
|
|
|
argv = xmalloc ((allargs.size () / (unsigned) 2 + 2) *
|
|
sizeof (*argv));
|
|
argv[0] = get_exec_file (1);
|
|
if (!argv[0])
|
|
{
|
|
if (exec_file)
|
|
argv[0] = exec_file;
|
|
else
|
|
return;
|
|
}
|
|
|
|
args = xstrdup (allargs.c_str ());
|
|
breakup_args (args, (exec_file != NULL) ? &argv[1] : &argv[0]);
|
|
|
|
argv = nto_parse_redirection (argv, &in, &out, &err);
|
|
|
|
fds[0] = STDIN_FILENO;
|
|
fds[1] = STDOUT_FILENO;
|
|
fds[2] = STDERR_FILENO;
|
|
|
|
/* If the user specified I/O via gdb's --tty= arg, use it, but only
|
|
if the i/o is not also being specified via redirection. */
|
|
if (inferior_io_terminal)
|
|
{
|
|
if (!in[0])
|
|
in = inferior_io_terminal;
|
|
if (!out[0])
|
|
out = inferior_io_terminal;
|
|
if (!err[0])
|
|
err = inferior_io_terminal;
|
|
}
|
|
|
|
if (in[0])
|
|
{
|
|
fd = open (in, O_RDONLY);
|
|
if (fd == -1)
|
|
perror (in);
|
|
else
|
|
fds[0] = fd;
|
|
}
|
|
if (out[0])
|
|
{
|
|
fd = open (out, O_WRONLY);
|
|
if (fd == -1)
|
|
perror (out);
|
|
else
|
|
fds[1] = fd;
|
|
}
|
|
if (err[0])
|
|
{
|
|
fd = open (err, O_WRONLY);
|
|
if (fd == -1)
|
|
perror (err);
|
|
else
|
|
fds[2] = fd;
|
|
}
|
|
|
|
/* Clear any pending SIGUSR1's but keep the behavior the same. */
|
|
signal (SIGUSR1, signal (SIGUSR1, SIG_IGN));
|
|
|
|
sigemptyset (&set);
|
|
sigaddset (&set, SIGUSR1);
|
|
sigprocmask (SIG_UNBLOCK, &set, NULL);
|
|
|
|
memset (&inherit, 0, sizeof (inherit));
|
|
|
|
if (ND_NODE_CMP (nto_procfs_node, ND_LOCAL_NODE) != 0)
|
|
{
|
|
inherit.nd = nto_node ();
|
|
inherit.flags |= SPAWN_SETND;
|
|
inherit.flags &= ~SPAWN_EXEC;
|
|
}
|
|
inherit.flags |= SPAWN_SETGROUP | SPAWN_HOLD;
|
|
inherit.pgroup = SPAWN_NEWPGROUP;
|
|
pid = spawnp (argv[0], 3, fds, &inherit, argv,
|
|
ND_NODE_CMP (nto_procfs_node, ND_LOCAL_NODE) == 0 ? env : 0);
|
|
xfree (args);
|
|
|
|
sigprocmask (SIG_BLOCK, &set, NULL);
|
|
|
|
if (pid == -1)
|
|
error (_("Error spawning %s: %d (%s)"), argv[0], errno,
|
|
safe_strerror (errno));
|
|
|
|
if (fds[0] != STDIN_FILENO)
|
|
close (fds[0]);
|
|
if (fds[1] != STDOUT_FILENO)
|
|
close (fds[1]);
|
|
if (fds[2] != STDERR_FILENO)
|
|
close (fds[2]);
|
|
|
|
inferior_ptid = do_attach (pid_to_ptid (pid));
|
|
procfs_update_thread_list (ops);
|
|
|
|
inf = current_inferior ();
|
|
inferior_appeared (inf, pid);
|
|
inf->attach_flag = 0;
|
|
|
|
flags = _DEBUG_FLAG_KLC; /* Kill-on-Last-Close flag. */
|
|
errn = devctl (ctl_fd, DCMD_PROC_SET_FLAG, &flags, sizeof (flags), 0);
|
|
if (errn != EOK)
|
|
{
|
|
/* FIXME: expected warning? */
|
|
/* warning( "Failed to set Kill-on-Last-Close flag: errno = %d(%s)\n",
|
|
errn, strerror(errn) ); */
|
|
}
|
|
if (!target_is_pushed (ops))
|
|
push_target (ops);
|
|
target_terminal::init ();
|
|
|
|
if (exec_bfd != NULL
|
|
|| (symfile_objfile != NULL && symfile_objfile->obfd != NULL))
|
|
solib_create_inferior_hook (0);
|
|
}
|
|
|
|
void
|
|
nto_procfs_target::interrupt ()
|
|
{
|
|
devctl (ctl_fd, DCMD_PROC_STOP, NULL, 0, 0);
|
|
}
|
|
|
|
void
|
|
nto_procfs_target::kill ()
|
|
{
|
|
target_mourn_inferior (inferior_ptid);
|
|
}
|
|
|
|
/* Fill buf with regset and return devctl cmd to do the setting. Return
|
|
-1 if we fail to get the regset. Store size of regset in regsize. */
|
|
static int
|
|
get_regset (int regset, char *buf, int bufsize, int *regsize)
|
|
{
|
|
int dev_get, dev_set;
|
|
switch (regset)
|
|
{
|
|
case NTO_REG_GENERAL:
|
|
dev_get = DCMD_PROC_GETGREG;
|
|
dev_set = DCMD_PROC_SETGREG;
|
|
break;
|
|
|
|
case NTO_REG_FLOAT:
|
|
dev_get = DCMD_PROC_GETFPREG;
|
|
dev_set = DCMD_PROC_SETFPREG;
|
|
break;
|
|
|
|
case NTO_REG_ALT:
|
|
dev_get = DCMD_PROC_GETALTREG;
|
|
dev_set = DCMD_PROC_SETALTREG;
|
|
break;
|
|
|
|
case NTO_REG_SYSTEM:
|
|
default:
|
|
return -1;
|
|
}
|
|
if (devctl (ctl_fd, dev_get, buf, bufsize, regsize) != EOK)
|
|
return -1;
|
|
|
|
return dev_set;
|
|
}
|
|
|
|
void
|
|
nto_procfs_target::store_registers (struct regcache *regcache, int regno)
|
|
{
|
|
union
|
|
{
|
|
procfs_greg greg;
|
|
procfs_fpreg fpreg;
|
|
procfs_altreg altreg;
|
|
}
|
|
reg;
|
|
unsigned off;
|
|
int len, regset, regsize, dev_set, err;
|
|
char *data;
|
|
ptid_t ptid = regcache_get_ptid (regcache);
|
|
|
|
if (ptid_equal (ptid, null_ptid))
|
|
return;
|
|
procfs_set_thread (ptid);
|
|
|
|
if (regno == -1)
|
|
{
|
|
for (regset = NTO_REG_GENERAL; regset < NTO_REG_END; regset++)
|
|
{
|
|
dev_set = get_regset (regset, (char *) ®,
|
|
sizeof (reg), ®size);
|
|
if (dev_set == -1)
|
|
continue;
|
|
|
|
if (nto_regset_fill (regcache, regset, (char *) ®) == -1)
|
|
continue;
|
|
|
|
err = devctl (ctl_fd, dev_set, ®, regsize, 0);
|
|
if (err != EOK)
|
|
fprintf_unfiltered (gdb_stderr,
|
|
"Warning unable to write regset %d: %s\n",
|
|
regno, safe_strerror (err));
|
|
}
|
|
}
|
|
else
|
|
{
|
|
regset = nto_regset_id (regno);
|
|
if (regset == -1)
|
|
return;
|
|
|
|
dev_set = get_regset (regset, (char *) ®, sizeof (reg), ®size);
|
|
if (dev_set == -1)
|
|
return;
|
|
|
|
len = nto_register_area (regcache->arch (),
|
|
regno, regset, &off);
|
|
|
|
if (len < 1)
|
|
return;
|
|
|
|
regcache_raw_collect (regcache, regno, (char *) ® + off);
|
|
|
|
err = devctl (ctl_fd, dev_set, ®, regsize, 0);
|
|
if (err != EOK)
|
|
fprintf_unfiltered (gdb_stderr,
|
|
"Warning unable to write regset %d: %s\n", regno,
|
|
safe_strerror (err));
|
|
}
|
|
}
|
|
|
|
/* Set list of signals to be handled in the target. */
|
|
|
|
void
|
|
nto_procfs_target::pass_signals (int numsigs, unsigned char *pass_signals)
|
|
{
|
|
int signo;
|
|
|
|
sigfillset (&run.trace);
|
|
|
|
for (signo = 1; signo < NSIG; signo++)
|
|
{
|
|
int target_signo = gdb_signal_from_host (signo);
|
|
if (target_signo < numsigs && pass_signals[target_signo])
|
|
sigdelset (&run.trace, signo);
|
|
}
|
|
}
|
|
|
|
char *
|
|
nto_procfs_target::pid_to_str (ptid_t ptid)
|
|
{
|
|
static char buf[1024];
|
|
int pid, tid, n;
|
|
struct tidinfo *tip;
|
|
|
|
pid = ptid_get_pid (ptid);
|
|
tid = ptid_get_tid (ptid);
|
|
|
|
n = snprintf (buf, 1023, "process %d", pid);
|
|
|
|
#if 0 /* NYI */
|
|
tip = procfs_thread_info (pid, tid);
|
|
if (tip != NULL)
|
|
snprintf (&buf[n], 1023, " (state = 0x%02x)", tip->state);
|
|
#endif
|
|
|
|
return buf;
|
|
}
|
|
|
|
/* to_can_run implementation for "target procfs". Note this really
|
|
means "can this target be the default run target", which there can
|
|
be only one, and we make it be "target native" like other ports.
|
|
"target procfs <node>" wouldn't make sense as default run target, as
|
|
it needs <node>. */
|
|
|
|
int
|
|
nto_procfs_target::can_run ()
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
/* "target procfs". */
|
|
static nto_procfs_target_procfs nto_procfs_ops;
|
|
|
|
/* "target native". */
|
|
static nto_procfs_target_native nto_native_ops;
|
|
|
|
/* Create the "native" and "procfs" targets. */
|
|
|
|
static void
|
|
init_procfs_targets (void)
|
|
{
|
|
/* Register "target native". This is the default run target. */
|
|
add_target (&nto_native_ops);
|
|
|
|
/* Register "target procfs <node>". */
|
|
add_target (&nto_procfs_ops);
|
|
}
|
|
|
|
#define OSTYPE_NTO 1
|
|
|
|
void
|
|
_initialize_procfs (void)
|
|
{
|
|
sigset_t set;
|
|
|
|
init_procfs_targets ();
|
|
|
|
/* We use SIGUSR1 to gain control after we block waiting for a process.
|
|
We use sigwaitevent to wait. */
|
|
sigemptyset (&set);
|
|
sigaddset (&set, SIGUSR1);
|
|
sigprocmask (SIG_BLOCK, &set, NULL);
|
|
|
|
/* Initially, make sure all signals are reported. */
|
|
sigfillset (&run.trace);
|
|
|
|
/* Stuff some information. */
|
|
nto_cpuinfo_flags = SYSPAGE_ENTRY (cpuinfo)->flags;
|
|
nto_cpuinfo_valid = 1;
|
|
|
|
add_info ("pidlist", procfs_pidlist, _("pidlist"));
|
|
add_info ("meminfo", procfs_meminfo, _("memory information"));
|
|
|
|
nto_is_nto_target = procfs_is_nto_target;
|
|
}
|
|
|
|
|
|
static int
|
|
procfs_hw_watchpoint (int addr, int len, enum target_hw_bp_type type)
|
|
{
|
|
procfs_break brk;
|
|
|
|
switch (type)
|
|
{
|
|
case hw_read:
|
|
brk.type = _DEBUG_BREAK_RD;
|
|
break;
|
|
case hw_access:
|
|
brk.type = _DEBUG_BREAK_RW;
|
|
break;
|
|
default: /* Modify. */
|
|
/* FIXME: brk.type = _DEBUG_BREAK_RWM gives EINVAL for some reason. */
|
|
brk.type = _DEBUG_BREAK_RW;
|
|
}
|
|
brk.type |= _DEBUG_BREAK_HW; /* Always ask for HW. */
|
|
brk.addr = addr;
|
|
brk.size = len;
|
|
|
|
errno = devctl (ctl_fd, DCMD_PROC_BREAK, &brk, sizeof (brk), 0);
|
|
if (errno != EOK)
|
|
{
|
|
perror (_("Failed to set hardware watchpoint"));
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
nto_procfs_target::can_use_hw_breakpoint (enum bptype type,
|
|
int cnt, int othertype)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
int
|
|
nto_procfs_target::remove_hw_watchpoint (CORE_ADDR addr, int len,
|
|
enum target_hw_bp_type type,
|
|
struct expression *cond)
|
|
{
|
|
return procfs_hw_watchpoint (addr, -1, type);
|
|
}
|
|
|
|
int
|
|
nto_procfs_target::insert_hw_watchpoint (CORE_ADDR addr, int len,
|
|
enum target_hw_bp_type type,
|
|
struct expression *cond)
|
|
{
|
|
return procfs_hw_watchpoint (addr, len, type);
|
|
}
|
|
|
|
int
|
|
nto_procfs_target::stopped_by_watchpoint ()
|
|
{
|
|
/* NOTE: nto_stopped_by_watchpoint will be called ONLY while we are
|
|
stopped due to a SIGTRAP. This assumes gdb works in 'all-stop' mode;
|
|
future gdb versions will likely run in 'non-stop' mode in which case
|
|
we will have to store/examine statuses per thread in question.
|
|
Until then, this will work fine. */
|
|
|
|
struct inferior *inf = current_inferior ();
|
|
struct nto_inferior_data *inf_data;
|
|
|
|
gdb_assert (inf != NULL);
|
|
|
|
inf_data = nto_inferior_data (inf);
|
|
|
|
return inf_data->stopped_flags
|
|
& (_DEBUG_FLAG_TRACE_RD
|
|
| _DEBUG_FLAG_TRACE_WR
|
|
| _DEBUG_FLAG_TRACE_MODIFY);
|
|
}
|