f6ac5f3d63
I.e., use C++ virtual methods and inheritance instead of tables of
function pointers.
Unfortunately, there's no way to do a smooth transition. ALL native
targets in the tree must be converted at the same time. I've tested
all I could with cross compilers and with help from GCC compile farm,
but naturally I haven't been able to test many of the ports. Still, I
made a best effort to port everything over, and while I expect some
build problems due to typos and such, which should be trivial to fix,
I don't expect any design problems.
* Implementation notes:
- The flattened current_target is gone. References to current_target
or current_target.beneath are replaced with references to
target_stack (the top of the stack) directly.
- To keep "set debug target" working, this adds a new debug_stratum
layer that sits on top of the stack, prints the debug, and delegates
to the target beneath.
In addition, this makes the shortname and longname properties of
target_ops be virtual methods instead of data fields, and makes the
debug target defer those to the target beneath. This is so that
debug code sprinkled around that does "if (debugtarget) ..." can
transparently print the name of the target beneath.
A patch later in the series actually splits out the
shortname/longname methods to a separate structure, but I preferred
to keep that chance separate as it is associated with changing a bit
the design of how targets are registered and open.
- Since you can't check whether a C++ virtual method is overridden,
the old method of checking whether a target_ops implements a method
by comparing the function pointer must be replaced with something
else.
Some cases are fixed by adding a parallel "can_do_foo" target_ops
methods. E.g.,:
+ for (t = target_stack; t != NULL; t = t->beneath)
{
- if (t->to_create_inferior != NULL)
+ if (t->can_create_inferior ())
break;
}
Others are fixed by changing void return type to bool or int return
type, and have the default implementation return false or -1, to
indicate lack of support.
- make-target-delegates was adjusted to generate C++ classes and
methods.
It needed tweaks to grok "virtual" in front of the target method
name, and for the fact that methods are no longer function pointers.
(In particular, the current code parsing the return type was simple
because it could simply parse up until the '(' in '(*to_foo)'.
It now generates a couple C++ classes that inherit target_ops:
dummy_target and debug_target.
Since we need to generate the class declarations as well, i.e., we
need to emit methods twice, we now generate the code in two passes.
- The core_target global is renamed to avoid conflict with the
"core_target" class.
- ctf/tfile targets
init_tracefile_ops is replaced by a base class that is inherited by
both ctf and tfile.
- bsd-uthread
The bsd_uthread_ops_hack hack is gone. It's not needed because
nothing was extending a target created by bsd_uthread_target.
- remote/extended-remote targets
This is a first pass, just enough to C++ify target_ops.
A later pass will convert more free functions to methods, and make
remote_state be truly per remote instance, allowing multiple
simultaneous instances of remote targets.
- inf-child/"native" is converted to an actual base class
(inf_child_target), that is inherited by all native targets.
- GNU/Linux
The old weird double-target linux_ops mechanism in linux-nat.c, is
gone, replaced by adding a few virtual methods to linux-nat.h's
target_ops, called low_XXX, that the concrete linux-nat
implementations override. Sort of like gdbserver's
linux_target_ops, but simpler, for requiring only one
target_ops-like hierarchy, which spares implementing the same method
twice when we need to forward the method to a low implementation.
The low target simply reimplements the target_ops method directly in
that case.
There are a few remaining linux-nat.c hooks that would be better
converted to low_ methods like above too. E.g.:
linux_nat_set_new_thread (t, x86_linux_new_thread);
linux_nat_set_new_fork (t, x86_linux_new_fork);
linux_nat_set_forget_process
That'll be done in a follow up patch.
- We can no longer use functions like x86_use_watchpoints to install
custom methods on an arbitrary base target.
The patch replaces instances of such a pattern with template mixins.
For example memory_breakpoint_target defined in target.h, or
x86_nat_target in x86-nat.h.
- linux_trad_target, MIPS and Alpha GNU/Linux
The code in the new linux-nat-trad.h/c files which was split off of
inf-ptrace.h/c recently, is converted to a C++ base class, and used
by the MIPS and Alpha GNU/Linux ports.
- BSD targets
The
$architecture x NetBSD/OpenBSD/FreeBSD
support matrix complicates things a bit. There's common BSD target
code, and there's common architecture-specific code shared between
the different BSDs. Currently, all that is stiched together to form
a final target, via the i386bsd_target, x86bsd_target,
fbsd_nat_add_target functions etc.
This introduces new fbsd_nat_target, obsd_nat_target and
nbsd_nat_target classes that serve as base/prototype target for the
corresponding BSD variant.
And introduces generic i386/AMD64 BSD targets, to be used as
template mixin to build a final target. Similarly, a generic SPARC
target is added, used by both BSD and Linux ports.
- bsd_kvm_add_target, BSD libkvm target
I considered making bsd_kvm_supply_pcb a virtual method, and then
have each port inherit bsd_kvm_target and override that method, but
that was resulting in lots of unjustified churn, so I left the
function pointer mechanism alone.
gdb/ChangeLog:
2018-05-02 Pedro Alves <palves@redhat.com>
John Baldwin <jhb@freebsd.org>
* target.h (enum strata) <debug_stratum>: New.
(struct target_ops) <all delegation methods>: Replace by C++
virtual methods, and drop "to_" prefix. All references updated
throughout.
<to_shortname, to_longname, to_doc, to_data,
to_have_steppable_watchpoint, to_have_continuable_watchpoint,
to_has_thread_control, to_attach_no_wait>: Delete, replaced by
virtual methods. All references updated throughout.
<can_attach, supports_terminal_ours, can_create_inferior,
get_thread_control_capabilities, attach_no_wait>: New
virtual methods.
<insert_breakpoint, remove_breakpoint>: Now
TARGET_DEFAULT_NORETURN methods.
<info_proc>: Now returns bool.
<to_magic>: Delete.
(OPS_MAGIC): Delete.
(current_target): Delete. All references replaced by references
to ...
(target_stack): ... this. New.
(target_shortname, target_longname): Adjust.
(target_can_run): Now a function declaration.
(default_child_has_all_memory, default_child_has_memory)
(default_child_has_stack, default_child_has_registers)
(default_child_has_execution): Remove target_ops parameter.
(complete_target_initialization): Delete.
(memory_breakpoint_target): New template class.
(test_target_ops): Refactor as a C++ class with virtual methods.
* make-target-delegates (NAME_PART): Tighten.
(POINTER_PART, CP_SYMBOL): New.
(SIMPLE_RETURN_PART): Reimplement.
(VEC_RETURN_PART): Expect less.
(RETURN_PART, VIRTUAL_PART): New.
(METHOD): Adjust to C++ virtual methods.
(scan_target_h): Remove reference to C99.
(dname): Output "target_ops::" prefix.
(write_function_header): Adjust to output a C++ class method.
(write_declaration): New.
(write_delegator): Adjust to output a C++ class method.
(tdname): Output "dummy_target::" prefix.
(write_tdefault, write_debugmethod): Adjust to output a C++ class
method.
(tdefault_names, debug_names): Delete.
(return_types, tdefaults, styles, argtypes_array): New.
(top level): All methods are delegators.
(print_class): New.
(top level): Print dummy_target and debug_target classes.
* target-delegates.c: Regenerate.
* target-debug.h (target_debug_print_enum_info_proc_what)
(target_debug_print_thread_control_capabilities)
(target_debug_print_thread_info_p): New.
* target.c (dummy_target): Delete.
(the_dummy_target, the_debug_target): New.
(target_stack): Now extern.
(set_targetdebug): Push/unpush debug target.
(default_child_has_all_memory, default_child_has_memory)
(default_child_has_stack, default_child_has_registers)
(default_child_has_execution): Remove target_ops parameter.
(complete_target_initialization): Delete.
(add_target_with_completer): No longer call
complete_target_initialization.
(target_supports_terminal_ours): Use regular delegation.
(update_current_target): Delete.
(push_target): No longer check magic number. Don't call
update_current_target.
(unpush_target): Don't call update_current_target.
(target_is_pushed): No longer check magic number.
(target_require_runnable): Skip for all stratums over
process_stratum.
(target_ops::info_proc): New.
(target_info_proc): Use find_target_at and
find_default_run_target.
(target_supports_disable_randomization): Use regular delegation.
(target_get_osdata): Use find_target_at.
(target_ops::open, target_ops::close, target_ops::can_attach)
(target_ops::attach, target_ops::can_create_inferior)
(target_ops::create_inferior, target_ops::can_run)
(target_can_run): New.
(default_fileio_target): Use regular delegation.
(target_ops::fileio_open, target_ops::fileio_pwrite)
(target_ops::fileio_pread, target_ops::fileio_fstat)
(target_ops::fileio_close, target_ops::fileio_unlink)
(target_ops::fileio_readlink): New.
(target_fileio_open_1, target_fileio_unlink)
(target_fileio_readlink): Always call the target method. Handle
FILEIO_ENOSYS.
(return_zero, return_zero_has_execution): Delete.
(init_dummy_target): Delete.
(dummy_target::dummy_target, dummy_target::shortname)
(dummy_target::longname, dummy_target::doc)
(debug_target::debug_target, debug_target::shortname)
(debug_target::longname, debug_target::doc): New.
(target_supports_delete_record): Use regular delegation.
(setup_target_debug): Delete.
(maintenance_print_target_stack): Skip debug_stratum.
(initialize_targets): Instantiate the_dummy_target and
the_debug_target.
* auxv.c (target_auxv_parse): Remove 'ops' parameter. Adjust to
use target_stack.
(target_auxv_search, fprint_target_auxv): Adjust.
(info_auxv_command): Adjust to use target_stack.
* auxv.h (target_auxv_parse): Remove 'ops' parameter.
* exceptions.c (print_flush): Handle a NULL target_stack.
* regcache.c (target_ops_no_register): Refactor as class with
virtual methods.
* exec.c (exec_target): New class.
(exec_ops): Now an exec_target.
(exec_open, exec_close_1, exec_get_section_table)
(exec_xfer_partial, exec_files_info, exec_has_memory)
(exec_make_note_section): Refactor as exec_target methods.
(exec_file_clear, ignore, exec_remove_breakpoint, init_exec_ops):
Delete.
(exec_target::find_memory_regions): New.
(_initialize_exec): Don't call init_exec_ops.
* gdbcore.h (exec_file_clear): Delete.
* corefile.c (core_target): Delete.
(core_file_command): Adjust.
* corelow.c (core_target): New class.
(the_core_target): New.
(core_close): Remove target_ops parameter.
(core_close_cleanup): Adjust.
(core_target::close): New.
(core_open, core_detach, get_core_registers, core_files_info)
(core_xfer_partial, core_thread_alive, core_read_description)
(core_pid_to_str, core_thread_name, core_has_memory)
(core_has_stack, core_has_registers, core_info_proc): Rework as
core_target methods.
(ignore, core_remove_breakpoint, init_core_ops): Delete.
(_initialize_corelow): Initialize the_core_target.
* gdbcore.h (core_target): Delete.
(the_core_target): New.
* ctf.c: (ctf_target): New class.
(ctf_ops): Now a ctf_target.
(ctf_open, ctf_close, ctf_files_info, ctf_fetch_registers)
(ctf_xfer_partial, ctf_get_trace_state_variable_value)
(ctf_trace_find, ctf_traceframe_info): Refactor as ctf_target
methods.
(init_ctf_ops): Delete.
(_initialize_ctf): Don't call it.
* tracefile-tfile.c (tfile_target): New class.
(tfile_ops): Now a tfile_target.
(tfile_open, tfile_close, tfile_files_info)
(tfile_get_tracepoint_status, tfile_trace_find)
(tfile_fetch_registers, tfile_xfer_partial)
(tfile_get_trace_state_variable_value, tfile_traceframe_info):
Refactor as tfile_target methods.
(tfile_xfer_partial_features): Remove target_ops parameter.
(init_tfile_ops): Delete.
(_initialize_tracefile_tfile): Don't call it.
* tracefile.c (tracefile_has_all_memory, tracefile_has_memory)
(tracefile_has_stack, tracefile_has_registers)
(tracefile_thread_alive, tracefile_get_trace_status): Refactor as
tracefile_target methods.
(init_tracefile_ops): Delete.
(tracefile_target::tracefile_target): New.
* tracefile.h: Include "target.h".
(tracefile_target): New class.
(init_tracefile_ops): Delete.
* spu-multiarch.c (spu_multiarch_target): New class.
(spu_ops): Now a spu_multiarch_target.
(spu_thread_architecture, spu_region_ok_for_hw_watchpoint)
(spu_fetch_registers, spu_store_registers, spu_xfer_partial)
(spu_search_memory, spu_mourn_inferior): Refactor as
spu_multiarch_target methods.
(init_spu_ops): Delete.
(_initialize_spu_multiarch): Remove references to init_spu_ops,
complete_target_initialization.
* ravenscar-thread.c (ravenscar_thread_target): New class.
(ravenscar_ops): Now a ravenscar_thread_target.
(ravenscar_resume, ravenscar_wait, ravenscar_update_thread_list)
(ravenscar_thread_alive, ravenscar_pid_to_str)
(ravenscar_fetch_registers, ravenscar_store_registers)
(ravenscar_prepare_to_store, ravenscar_stopped_by_sw_breakpoint)
(ravenscar_stopped_by_hw_breakpoint)
(ravenscar_stopped_by_watchpoint, ravenscar_stopped_data_address)
(ravenscar_mourn_inferior, ravenscar_core_of_thread)
(ravenscar_get_ada_task_ptid): Refactor as ravenscar_thread_target
methods.
(init_ravenscar_thread_ops): Delete.
(_initialize_ravenscar): Remove references to
init_ravenscar_thread_ops and complete_target_initialization.
* bsd-uthread.c (bsd_uthread_ops_hack): Delete.
(bsd_uthread_target): New class.
(bsd_uthread_ops): Now a bsd_uthread_target.
(bsd_uthread_activate): Adjust to refer to bsd_uthread_ops.
(bsd_uthread_close, bsd_uthread_mourn_inferior)
(bsd_uthread_fetch_registers, bsd_uthread_store_registers)
(bsd_uthread_wait, bsd_uthread_resume, bsd_uthread_thread_alive)
(bsd_uthread_update_thread_list, bsd_uthread_extra_thread_info)
(bsd_uthread_pid_to_str): Refactor as bsd_uthread_target methods.
(bsd_uthread_target): Delete function.
(_initialize_bsd_uthread): Remove reference to
complete_target_initialization.
* bfd-target.c (target_bfd_data): Delete. Fields folded into ...
(target_bfd): ... this new class.
(target_bfd_xfer_partial, target_bfd_get_section_table)
(target_bfd_close): Refactor as target_bfd methods.
(target_bfd::~target_bfd): New.
(target_bfd_reopen): Adjust.
(target_bfd::close): New.
* record-btrace.c (record_btrace_target): New class.
(record_btrace_ops): Now a record_btrace_target.
(record_btrace_open, record_btrace_stop_recording)
(record_btrace_disconnect, record_btrace_close)
(record_btrace_async, record_btrace_info)
(record_btrace_insn_history, record_btrace_insn_history_range)
(record_btrace_insn_history_from, record_btrace_call_history)
(record_btrace_call_history_range)
(record_btrace_call_history_from, record_btrace_record_method)
(record_btrace_is_replaying, record_btrace_will_replay)
(record_btrace_xfer_partial, record_btrace_insert_breakpoint)
(record_btrace_remove_breakpoint, record_btrace_fetch_registers)
(record_btrace_store_registers, record_btrace_prepare_to_store)
(record_btrace_to_get_unwinder)
(record_btrace_to_get_tailcall_unwinder, record_btrace_resume)
(record_btrace_commit_resume, record_btrace_wait)
(record_btrace_stop, record_btrace_can_execute_reverse)
(record_btrace_stopped_by_sw_breakpoint)
(record_btrace_supports_stopped_by_sw_breakpoint)
(record_btrace_stopped_by_hw_breakpoint)
(record_btrace_supports_stopped_by_hw_breakpoint)
(record_btrace_update_thread_list, record_btrace_thread_alive)
(record_btrace_goto_begin, record_btrace_goto_end)
(record_btrace_goto, record_btrace_stop_replaying_all)
(record_btrace_execution_direction)
(record_btrace_prepare_to_generate_core)
(record_btrace_done_generating_core): Refactor as
record_btrace_target methods.
(init_record_btrace_ops): Delete.
(_initialize_record_btrace): Remove reference to
init_record_btrace_ops.
* record-full.c (RECORD_FULL_IS_REPLAY): Adjust to always refer to
the execution_direction global.
(record_full_base_target, record_full_target)
(record_full_core_target): New classes.
(record_full_ops): Now a record_full_target.
(record_full_core_ops): Now a record_full_core_target.
(record_full_target::detach, record_full_target::disconnect)
(record_full_core_target::disconnect)
(record_full_target::mourn_inferior, record_full_target::kill):
New.
(record_full_open, record_full_close, record_full_async): Refactor
as methods of the record_full_base_target class.
(record_full_resume, record_full_commit_resume): Refactor
as methods of the record_full_target class.
(record_full_wait, record_full_stopped_by_watchpoint)
(record_full_stopped_data_address)
(record_full_stopped_by_sw_breakpoint)
(record_full_supports_stopped_by_sw_breakpoint)
(record_full_stopped_by_hw_breakpoint)
(record_full_supports_stopped_by_hw_breakpoint): Refactor as
methods of the record_full_base_target class.
(record_full_store_registers, record_full_xfer_partial)
(record_full_insert_breakpoint, record_full_remove_breakpoint):
Refactor as methods of the record_full_target class.
(record_full_can_execute_reverse, record_full_get_bookmark)
(record_full_goto_bookmark, record_full_execution_direction)
(record_full_record_method, record_full_info, record_full_delete)
(record_full_is_replaying, record_full_will_replay)
(record_full_goto_begin, record_full_goto_end, record_full_goto)
(record_full_stop_replaying): Refactor as methods of the
record_full_base_target class.
(record_full_core_resume, record_full_core_kill)
(record_full_core_fetch_registers)
(record_full_core_prepare_to_store)
(record_full_core_store_registers, record_full_core_xfer_partial)
(record_full_core_insert_breakpoint)
(record_full_core_remove_breakpoint)
(record_full_core_has_execution): Refactor
as methods of the record_full_core_target class.
(record_full_base_target::supports_delete_record): New.
(init_record_full_ops): Delete.
(init_record_full_core_ops): Delete.
(record_full_save): Refactor as method of the
record_full_base_target class.
(_initialize_record_full): Remove references to
init_record_full_ops and init_record_full_core_ops.
* remote.c (remote_target, extended_remote_target): New classes.
(remote_ops): Now a remote_target.
(extended_remote_ops): Now an extended_remote_target.
(remote_insert_fork_catchpoint, remote_remove_fork_catchpoint)
(remote_insert_vfork_catchpoint, remote_remove_vfork_catchpoint)
(remote_insert_exec_catchpoint, remote_remove_exec_catchpoint)
(remote_pass_signals, remote_set_syscall_catchpoint)
(remote_program_signals, )
(remote_thread_always_alive): Remove target_ops parameter.
(remote_thread_alive, remote_thread_name)
(remote_update_thread_list, remote_threads_extra_info)
(remote_static_tracepoint_marker_at)
(remote_static_tracepoint_markers_by_strid)
(remote_get_ada_task_ptid, remote_close, remote_start_remote)
(remote_open): Refactor as methods of remote_target.
(extended_remote_open, extended_remote_detach)
(extended_remote_attach, extended_remote_post_attach):
(extended_remote_supports_disable_randomization)
(extended_remote_create_inferior): : Refactor as method of
extended_remote_target.
(remote_set_permissions, remote_open_1, remote_detach)
(remote_follow_fork, remote_follow_exec, remote_disconnect)
(remote_resume, remote_commit_resume, remote_stop)
(remote_interrupt, remote_pass_ctrlc, remote_terminal_inferior)
(remote_terminal_ours, remote_wait, remote_fetch_registers)
(remote_prepare_to_store, remote_store_registers)
(remote_flash_erase, remote_flash_done, remote_files_info)
(remote_kill, remote_mourn, remote_insert_breakpoint)
(remote_remove_breakpoint, remote_insert_watchpoint)
(remote_watchpoint_addr_within_range)
(remote_remove_watchpoint, remote_region_ok_for_hw_watchpoint)
(remote_check_watch_resources, remote_stopped_by_sw_breakpoint)
(remote_supports_stopped_by_sw_breakpoint)
(remote_stopped_by_hw_breakpoint)
(remote_supports_stopped_by_hw_breakpoint)
(remote_stopped_by_watchpoint, remote_stopped_data_address)
(remote_insert_hw_breakpoint, remote_remove_hw_breakpoint)
(remote_verify_memory): Refactor as methods of remote_target.
(remote_write_qxfer, remote_read_qxfer): Remove target_ops
parameter.
(remote_xfer_partial, remote_get_memory_xfer_limit)
(remote_search_memory, remote_rcmd, remote_memory_map)
(remote_pid_to_str, remote_get_thread_local_address)
(remote_get_tib_address, remote_read_description): Refactor as
methods of remote_target.
(remote_target::fileio_open, remote_target::fileio_pwrite)
(remote_target::fileio_pread, remote_target::fileio_close): New.
(remote_hostio_readlink, remote_hostio_fstat)
(remote_filesystem_is_local, remote_can_execute_reverse)
(remote_supports_non_stop, remote_supports_disable_randomization)
(remote_supports_multi_process, remote_supports_cond_breakpoints)
(remote_supports_enable_disable_tracepoint)
(remote_supports_string_tracing)
(remote_can_run_breakpoint_commands, remote_trace_init)
(remote_download_tracepoint, remote_can_download_tracepoint)
(remote_download_trace_state_variable, remote_enable_tracepoint)
(remote_disable_tracepoint, remote_trace_set_readonly_regions)
(remote_trace_start, remote_get_trace_status)
(remote_get_tracepoint_status, remote_trace_stop)
(remote_trace_find, remote_get_trace_state_variable_value)
(remote_save_trace_data, remote_get_raw_trace_data)
(remote_set_disconnected_tracing, remote_core_of_thread)
(remote_set_circular_trace_buffer, remote_traceframe_info)
(remote_get_min_fast_tracepoint_insn_len)
(remote_set_trace_buffer_size, remote_set_trace_notes)
(remote_use_agent, remote_can_use_agent, remote_enable_btrace)
(remote_disable_btrace, remote_teardown_btrace)
(remote_read_btrace, remote_btrace_conf)
(remote_augmented_libraries_svr4_read, remote_load)
(remote_pid_to_exec_file, remote_can_do_single_step)
(remote_execution_direction, remote_thread_handle_to_thread_info):
Refactor as methods of remote_target.
(init_remote_ops, init_extended_remote_ops): Delete.
(remote_can_async_p, remote_is_async_p, remote_async)
(remote_thread_events, remote_upload_tracepoints)
(remote_upload_trace_state_variables): Refactor as methods of
remote_target.
(_initialize_remote): Remove references to init_remote_ops and
init_extended_remote_ops.
* remote-sim.c (gdbsim_target): New class.
(gdbsim_fetch_register, gdbsim_store_register, gdbsim_kill)
(gdbsim_load, gdbsim_create_inferior, gdbsim_open, gdbsim_close)
(gdbsim_detach, gdbsim_resume, gdbsim_interrupt)
(gdbsim_wait, gdbsim_prepare_to_store, gdbsim_xfer_partial)
(gdbsim_files_info, gdbsim_mourn_inferior, gdbsim_thread_alive)
(gdbsim_pid_to_str, gdbsim_has_all_memory, gdbsim_has_memory):
Refactor as methods of gdbsim_target.
(gdbsim_ops): Now a gdbsim_target.
(init_gdbsim_ops): Delete.
(gdbsim_cntrl_c): Adjust.
(_initialize_remote_sim): Remove reference to init_gdbsim_ops.
* amd64-linux-nat.c (amd64_linux_nat_target): New class.
(the_amd64_linux_nat_target): New.
(amd64_linux_fetch_inferior_registers)
(amd64_linux_store_inferior_registers): Refactor as methods of
amd64_linux_nat_target.
(_initialize_amd64_linux_nat): Adjust. Set linux_target.
* i386-linux-nat.c: Don't include "linux-nat.h".
(i386_linux_nat_target): New class.
(the_i386_linux_nat_target): New.
(i386_linux_fetch_inferior_registers)
(i386_linux_store_inferior_registers, i386_linux_resume): Refactor
as methods of i386_linux_nat_target.
(_initialize_i386_linux_nat): Adjust. Set linux_target.
* inf-child.c (inf_child_ops): Delete.
(inf_child_fetch_inferior_registers)
(inf_child_store_inferior_registers): Delete.
(inf_child_post_attach, inf_child_prepare_to_store): Refactor as
methods of inf_child_target.
(inf_child_target::supports_terminal_ours)
(inf_child_target::terminal_init)
(inf_child_target::terminal_inferior)
(inf_child_target::terminal_ours_for_output)
(inf_child_target::terminal_ours, inf_child_target::interrupt)
(inf_child_target::pass_ctrlc, inf_child_target::terminal_info):
New.
(inf_child_open, inf_child_disconnect, inf_child_close)
(inf_child_mourn_inferior, inf_child_maybe_unpush_target)
(inf_child_post_startup_inferior, inf_child_can_run)
(inf_child_pid_to_exec_file): Refactor as methods of
inf_child_target.
(inf_child_follow_fork): Delete.
(inf_child_target::can_create_inferior)
(inf_child_target::can_attach): New.
(inf_child_target::has_all_memory, inf_child_target::has_memory)
(inf_child_target::has_stack, inf_child_target::has_registers)
(inf_child_target::has_execution): New.
(inf_child_fileio_open, inf_child_fileio_pwrite)
(inf_child_fileio_pread, inf_child_fileio_fstat)
(inf_child_fileio_close, inf_child_fileio_unlink)
(inf_child_fileio_readlink, inf_child_use_agent)
(inf_child_can_use_agent): Refactor as methods of
inf_child_target.
(return_zero, inf_child_target): Delete.
(inf_child_target::inf_child_target): New.
* inf-child.h: Include "target.h".
(inf_child_target): Delete function prototype.
(inf_child_target): New class.
(inf_child_open_target, inf_child_mourn_inferior)
(inf_child_maybe_unpush_target): Delete.
* inf-ptrace.c (inf_ptrace_target::~inf_ptrace_target): New.
(inf_ptrace_follow_fork, inf_ptrace_insert_fork_catchpoint)
(inf_ptrace_remove_fork_catchpoint, inf_ptrace_create_inferior)
(inf_ptrace_post_startup_inferior, inf_ptrace_mourn_inferior)
(inf_ptrace_attach, inf_ptrace_post_attach, inf_ptrace_detach)
(inf_ptrace_detach_success, inf_ptrace_kill, inf_ptrace_resume)
(inf_ptrace_wait, inf_ptrace_xfer_partial)
(inf_ptrace_thread_alive, inf_ptrace_files_info)
(inf_ptrace_pid_to_str, inf_ptrace_auxv_parse): Refactor as
methods of inf_ptrace_target.
(inf_ptrace_target): Delete function.
* inf-ptrace.h: Include "inf-child.h".
(inf_ptrace_target): Delete function declaration.
(inf_ptrace_target): New class.
(inf_ptrace_trad_target, inf_ptrace_detach_success): Delete.
* linux-nat.c (linux_target): New.
(linux_ops, linux_ops_saved, super_xfer_partial): Delete.
(linux_nat_target::~linux_nat_target): New.
(linux_child_post_attach, linux_child_post_startup_inferior)
(linux_child_follow_fork, linux_child_insert_fork_catchpoint)
(linux_child_remove_fork_catchpoint)
(linux_child_insert_vfork_catchpoint)
(linux_child_remove_vfork_catchpoint)
(linux_child_insert_exec_catchpoint)
(linux_child_remove_exec_catchpoint)
(linux_child_set_syscall_catchpoint, linux_nat_pass_signals)
(linux_nat_create_inferior, linux_nat_attach, linux_nat_detach)
(linux_nat_resume, linux_nat_stopped_by_watchpoint)
(linux_nat_stopped_data_address)
(linux_nat_stopped_by_sw_breakpoint)
(linux_nat_supports_stopped_by_sw_breakpoint)
(linux_nat_stopped_by_hw_breakpoint)
(linux_nat_supports_stopped_by_hw_breakpoint, linux_nat_wait)
(linux_nat_kill, linux_nat_mourn_inferior)
(linux_nat_xfer_partial, linux_nat_thread_alive)
(linux_nat_update_thread_list, linux_nat_pid_to_str)
(linux_nat_thread_name, linux_child_pid_to_exec_file)
(linux_child_static_tracepoint_markers_by_strid)
(linux_nat_is_async_p, linux_nat_can_async_p)
(linux_nat_supports_non_stop, linux_nat_always_non_stop_p)
(linux_nat_supports_multi_process)
(linux_nat_supports_disable_randomization, linux_nat_async)
(linux_nat_stop, linux_nat_close, linux_nat_thread_address_space)
(linux_nat_core_of_thread, linux_nat_filesystem_is_local)
(linux_nat_fileio_open, linux_nat_fileio_readlink)
(linux_nat_fileio_unlink, linux_nat_thread_events): Refactor as
methods of linux_nat_target.
(linux_nat_wait_1, linux_xfer_siginfo, linux_proc_xfer_partial)
(linux_proc_xfer_spu, linux_nat_xfer_osdata): Remove target_ops
parameter.
(check_stopped_by_watchpoint): Adjust.
(linux_xfer_partial): Delete.
(linux_target_install_ops, linux_target, linux_nat_add_target):
Delete.
(linux_nat_target::linux_nat_target): New.
* linux-nat.h: Include "inf-ptrace.h".
(linux_nat_target): New.
(linux_target, linux_target_install_ops, linux_nat_add_target):
Delete function declarations.
(linux_target): Declare global.
* linux-thread-db.c (thread_db_target): New.
(thread_db_target::thread_db_target): New.
(thread_db_ops): Delete.
(the_thread_db_target): New.
(thread_db_detach, thread_db_wait, thread_db_mourn_inferior)
(thread_db_update_thread_list, thread_db_pid_to_str)
(thread_db_extra_thread_info)
(thread_db_thread_handle_to_thread_info)
(thread_db_get_thread_local_address, thread_db_get_ada_task_ptid)
(thread_db_resume): Refactor as methods of thread_db_target.
(init_thread_db_ops): Delete.
(_initialize_thread_db): Remove reference to init_thread_db_ops.
* x86-linux-nat.c: Don't include "linux-nat.h".
(super_post_startup_inferior): Delete.
(x86_linux_nat_target::~x86_linux_nat_target): New.
(x86_linux_child_post_startup_inferior)
(x86_linux_read_description, x86_linux_enable_btrace)
(x86_linux_disable_btrace, x86_linux_teardown_btrace)
(x86_linux_read_btrace, x86_linux_btrace_conf): Refactor as
methods of x86_linux_nat_target.
(x86_linux_create_target): Delete. Bits folded ...
(x86_linux_add_target): ... here. Now takes a linux_nat_target
pointer.
* x86-linux-nat.h: Include "linux-nat.h" and "x86-nat.h".
(x86_linux_nat_target): New class.
(x86_linux_create_target): Delete.
(x86_linux_add_target): Now takes a linux_nat_target pointer.
* x86-nat.c (x86_insert_watchpoint, x86_remove_watchpoint)
(x86_region_ok_for_watchpoint, x86_stopped_data_address)
(x86_stopped_by_watchpoint, x86_insert_hw_breakpoint)
(x86_remove_hw_breakpoint, x86_can_use_hw_breakpoint)
(x86_stopped_by_hw_breakpoint): Remove target_ops parameter and
make extern.
(x86_use_watchpoints): Delete.
* x86-nat.h: Include "breakpoint.h" and "target.h".
(x86_use_watchpoints): Delete.
(x86_can_use_hw_breakpoint, x86_region_ok_for_hw_watchpoint)
(x86_stopped_by_watchpoint, x86_stopped_data_address)
(x86_insert_watchpoint, x86_remove_watchpoint)
(x86_insert_hw_breakpoint, x86_remove_hw_breakpoint)
(x86_stopped_by_hw_breakpoint): New declarations.
(x86_nat_target): New template class.
* ppc-linux-nat.c (ppc_linux_nat_target): New class.
(the_ppc_linux_nat_target): New.
(ppc_linux_fetch_inferior_registers)
(ppc_linux_can_use_hw_breakpoint)
(ppc_linux_region_ok_for_hw_watchpoint)
(ppc_linux_ranged_break_num_registers)
(ppc_linux_insert_hw_breakpoint, ppc_linux_remove_hw_breakpoint)
(ppc_linux_insert_mask_watchpoint)
(ppc_linux_remove_mask_watchpoint)
(ppc_linux_can_accel_watchpoint_condition)
(ppc_linux_insert_watchpoint, ppc_linux_remove_watchpoint)
(ppc_linux_stopped_data_address, ppc_linux_stopped_by_watchpoint)
(ppc_linux_watchpoint_addr_within_range)
(ppc_linux_masked_watch_num_registers)
(ppc_linux_store_inferior_registers, ppc_linux_auxv_parse)
(ppc_linux_read_description): Refactor as methods of
ppc_linux_nat_target.
(_initialize_ppc_linux_nat): Adjust. Set linux_target.
* procfs.c (procfs_xfer_partial): Delete forward declaration.
(procfs_target): New class.
(the_procfs_target): New.
(procfs_target): Delete function.
(procfs_auxv_parse, procfs_attach, procfs_detach)
(procfs_fetch_registers, procfs_store_registers, procfs_wait)
(procfs_xfer_partial, procfs_resume, procfs_pass_signals)
(procfs_files_info, procfs_kill_inferior, procfs_mourn_inferior)
(procfs_create_inferior, procfs_update_thread_list)
(procfs_thread_alive, procfs_pid_to_str)
(procfs_can_use_hw_breakpoint, procfs_stopped_by_watchpoint)
(procfs_stopped_data_address, procfs_insert_watchpoint)
(procfs_remove_watchpoint, procfs_region_ok_for_hw_watchpoint)
(proc_find_memory_regions, procfs_info_proc)
(procfs_make_note_section): Refactor as methods of procfs_target.
(_initialize_procfs): Adjust.
* sol-thread.c (sol_thread_target): New class.
(sol_thread_ops): Now a sol_thread_target.
(sol_thread_detach, sol_thread_resume, sol_thread_wait)
(sol_thread_fetch_registers, sol_thread_store_registers)
(sol_thread_xfer_partial, sol_thread_mourn_inferior)
(sol_thread_alive, solaris_pid_to_str, sol_update_thread_list)
(sol_get_ada_task_ptid): Refactor as methods of sol_thread_target.
(init_sol_thread_ops): Delete.
(_initialize_sol_thread): Adjust. Remove references to
init_sol_thread_ops and complete_target_initialization.
* windows-nat.c (windows_nat_target): New class.
(windows_fetch_inferior_registers)
(windows_store_inferior_registers, windows_resume, windows_wait)
(windows_attach, windows_detach, windows_pid_to_exec_file)
(windows_files_info, windows_create_inferior)
(windows_mourn_inferior, windows_interrupt, windows_kill_inferior)
(windows_close, windows_pid_to_str, windows_xfer_partial)
(windows_get_tib_address, windows_get_ada_task_ptid)
(windows_thread_name, windows_thread_alive): Refactor as
windows_nat_target methods.
(do_initial_windows_stuff): Adjust.
(windows_target): Delete function.
(_initialize_windows_nat): Adjust.
* darwin-nat.c (darwin_resume, darwin_wait_to, darwin_interrupt)
(darwin_mourn_inferior, darwin_kill_inferior)
(darwin_create_inferior, darwin_attach, darwin_detach)
(darwin_pid_to_str, darwin_thread_alive, darwin_xfer_partial)
(darwin_pid_to_exec_file, darwin_get_ada_task_ptid)
(darwin_supports_multi_process): Refactor as darwin_nat_target
methods.
(darwin_resume_to, darwin_files_info): Delete.
(_initialize_darwin_inferior): Rename to ...
(_initialize_darwin_nat): ... this. Adjust to C++ification.
* darwin-nat.h: Include "inf-child.h".
(darwin_nat_target): New class.
(darwin_complete_target): Delete.
* i386-darwin-nat.c (i386_darwin_nat_target): New class.
(darwin_target): New.
(i386_darwin_fetch_inferior_registers)
(i386_darwin_store_inferior_registers): Refactor as methods of
darwin_nat_target.
(darwin_complete_target): Delete, with ...
(_initialize_i386_darwin_nat): ... bits factored out here.
* alpha-linux-nat.c (alpha_linux_nat_target): New class.
(the_alpha_linux_nat_target): New.
(alpha_linux_register_u_offset): Refactor as
alpha_linux_nat_target method.
(_initialize_alpha_linux_nat): Adjust.
* linux-nat-trad.c (inf_ptrace_register_u_offset): Delete.
(inf_ptrace_fetch_register, inf_ptrace_fetch_registers)
(inf_ptrace_store_register, inf_ptrace_store_registers): Refact as
methods of linux_nat_trad_target.
(linux_trad_target): Delete.
* linux-nat-trad.h (linux_trad_target): Delete function.
(linux_nat_trad_target): New class.
* mips-linux-nat.c (mips_linux_nat_target): New class.
(super_fetch_registers, super_store_registers, super_close):
Delete.
(the_mips_linux_nat_target): New.
(mips64_linux_regsets_fetch_registers)
(mips64_linux_regsets_store_registers)
(mips64_linux_fetch_registers, mips64_linux_store_registers)
(mips_linux_register_u_offset, mips_linux_read_description)
(mips_linux_can_use_hw_breakpoint)
(mips_linux_stopped_by_watchpoint)
(mips_linux_stopped_data_address)
(mips_linux_region_ok_for_hw_watchpoint)
(mips_linux_insert_watchpoint, mips_linux_remove_watchpoint)
(mips_linux_close): Refactor as methods of mips_linux_nat.
(_initialize_mips_linux_nat): Adjust to C++ification.
* aix-thread.c (aix_thread_target): New class.
(aix_thread_ops): Now an aix_thread_target.
(aix_thread_detach, aix_thread_resume, aix_thread_wait)
(aix_thread_fetch_registers, aix_thread_store_registers)
(aix_thread_xfer_partial, aix_thread_mourn_inferior)
(aix_thread_thread_alive, aix_thread_pid_to_str)
(aix_thread_extra_thread_info, aix_thread_get_ada_task_ptid):
Refactor as methods of aix_thread_target.
(init_aix_thread_ops): Delete.
(_initialize_aix_thread): Remove references to init_aix_thread_ops
and complete_target_initialization.
* rs6000-nat.c (rs6000_xfer_shared_libraries): Delete.
(rs6000_nat_target): New class.
(the_rs6000_nat_target): New.
(rs6000_fetch_inferior_registers, rs6000_store_inferior_registers)
(rs6000_xfer_partial, rs6000_wait, rs6000_create_inferior)
(rs6000_xfer_shared_libraries): Refactor as rs6000_nat_target methods.
(super_create_inferior): Delete.
(_initialize_rs6000_nat): Adjust to C++ification.
* arm-linux-nat.c (arm_linux_nat_target): New class.
(the_arm_linux_nat_target): New.
(arm_linux_fetch_inferior_registers)
(arm_linux_store_inferior_registers, arm_linux_read_description)
(arm_linux_can_use_hw_breakpoint, arm_linux_insert_hw_breakpoint)
(arm_linux_remove_hw_breakpoint)
(arm_linux_region_ok_for_hw_watchpoint)
(arm_linux_insert_watchpoint, arm_linux_remove_watchpoint)
(arm_linux_stopped_data_address, arm_linux_stopped_by_watchpoint)
(arm_linux_watchpoint_addr_within_range): Refactor as methods of
arm_linux_nat_target.
(_initialize_arm_linux_nat): Adjust to C++ification.
* aarch64-linux-nat.c (aarch64_linux_nat_target): New class.
(the_aarch64_linux_nat_target): New.
(aarch64_linux_fetch_inferior_registers)
(aarch64_linux_store_inferior_registers)
(aarch64_linux_child_post_startup_inferior)
(aarch64_linux_read_description)
(aarch64_linux_can_use_hw_breakpoint)
(aarch64_linux_insert_hw_breakpoint)
(aarch64_linux_remove_hw_breakpoint)
(aarch64_linux_insert_watchpoint, aarch64_linux_remove_watchpoint)
(aarch64_linux_region_ok_for_hw_watchpoint)
(aarch64_linux_stopped_data_address)
(aarch64_linux_stopped_by_watchpoint)
(aarch64_linux_watchpoint_addr_within_range)
(aarch64_linux_can_do_single_step): Refactor as methods of
aarch64_linux_nat_target.
(super_post_startup_inferior): Delete.
(_initialize_aarch64_linux_nat): Adjust to C++ification.
* hppa-linux-nat.c (hppa_linux_nat_target): New class.
(the_hppa_linux_nat_target): New.
(hppa_linux_fetch_inferior_registers)
(hppa_linux_store_inferior_registers): Refactor as methods of
hppa_linux_nat_target.
(_initialize_hppa_linux_nat): Adjust to C++ification.
* ia64-linux-nat.c (ia64_linux_nat_target): New class.
(the_ia64_linux_nat_target): New.
(ia64_linux_insert_watchpoint, ia64_linux_remove_watchpoint)
(ia64_linux_stopped_data_address)
(ia64_linux_stopped_by_watchpoint, ia64_linux_fetch_registers)
(ia64_linux_store_registers, ia64_linux_xfer_partial): Refactor as
ia64_linux_nat_target methods.
(super_xfer_partial): Delete.
(_initialize_ia64_linux_nat): Adjust to C++ification.
* m32r-linux-nat.c (m32r_linux_nat_target): New class.
(the_m32r_linux_nat_target): New.
(m32r_linux_fetch_inferior_registers)
(m32r_linux_store_inferior_registers): Refactor as
m32r_linux_nat_target methods.
(_initialize_m32r_linux_nat): Adjust to C++ification.
* m68k-linux-nat.c (m68k_linux_nat_target): New class.
(the_m68k_linux_nat_target): New.
(m68k_linux_fetch_inferior_registers)
(m68k_linux_store_inferior_registers): Refactor as
m68k_linux_nat_target methods.
(_initialize_m68k_linux_nat): Adjust to C++ification.
* s390-linux-nat.c (s390_linux_nat_target): New class.
(the_s390_linux_nat_target): New.
(s390_linux_fetch_inferior_registers)
(s390_linux_store_inferior_registers, s390_stopped_by_watchpoint)
(s390_insert_watchpoint, s390_remove_watchpoint)
(s390_can_use_hw_breakpoint, s390_insert_hw_breakpoint)
(s390_remove_hw_breakpoint, s390_region_ok_for_hw_watchpoint)
(s390_auxv_parse, s390_read_description): Refactor as methods of
s390_linux_nat_target.
(_initialize_s390_nat): Adjust to C++ification.
* sparc-linux-nat.c (sparc_linux_nat_target): New class.
(the_sparc_linux_nat_target): New.
(_initialize_sparc_linux_nat): Adjust to C++ification.
* sparc-nat.c (sparc_fetch_inferior_registers)
(sparc_store_inferior_registers): Remove target_ops parameter.
* sparc-nat.h (sparc_fetch_inferior_registers)
(sparc_store_inferior_registers): Remove target_ops parameter.
* sparc64-linux-nat.c (sparc64_linux_nat_target): New class.
(the_sparc64_linux_nat_target): New.
(_initialize_sparc64_linux_nat): Adjust to C++ification.
* spu-linux-nat.c (spu_linux_nat_target): New class.
(the_spu_linux_nat_target): New.
(spu_child_post_startup_inferior, spu_child_post_attach)
(spu_child_wait, spu_fetch_inferior_registers)
(spu_store_inferior_registers, spu_xfer_partial)
(spu_can_use_hw_breakpoint): Refactor as spu_linux_nat_target
methods.
(_initialize_spu_nat): Adjust to C++ification.
* tilegx-linux-nat.c (tilegx_linux_nat_target): New class.
(the_tilegx_linux_nat_target): New.
(fetch_inferior_registers, store_inferior_registers):
Refactor as methods.
(_initialize_tile_linux_nat): Adjust to C++ification.
* xtensa-linux-nat.c (xtensa_linux_nat_target): New class.
(the_xtensa_linux_nat_target): New.
(xtensa_linux_fetch_inferior_registers)
(xtensa_linux_store_inferior_registers): Refactor as
xtensa_linux_nat_target methods.
(_initialize_xtensa_linux_nat): Adjust to C++ification.
* fbsd-nat.c (USE_SIGTRAP_SIGINFO): Delete.
(fbsd_pid_to_exec_file, fbsd_find_memory_regions)
(fbsd_find_memory_regions, fbsd_info_proc, fbsd_xfer_partial)
(fbsd_thread_alive, fbsd_pid_to_str, fbsd_thread_name)
(fbsd_update_thread_list, fbsd_resume, fbsd_wait)
(fbsd_stopped_by_sw_breakpoint)
(fbsd_supports_stopped_by_sw_breakpoint, fbsd_follow_fork)
(fbsd_insert_fork_catchpoint, fbsd_remove_fork_catchpoint)
(fbsd_insert_vfork_catchpoint, fbsd_remove_vfork_catchpoint)
(fbsd_post_startup_inferior, fbsd_post_attach)
(fbsd_insert_exec_catchpoint, fbsd_remove_exec_catchpoint)
(fbsd_set_syscall_catchpoint)
(super_xfer_partial, super_resume, super_wait)
(fbsd_supports_stopped_by_hw_breakpoint): Delete.
(fbsd_handle_debug_trap): Remove target_ops parameter.
(fbsd_nat_add_target): Delete.
* fbsd-nat.h: Include "inf-ptrace.h".
(fbsd_nat_add_target): Delete.
(USE_SIGTRAP_SIGINFO): Define.
(fbsd_nat_target): New class.
* amd64-bsd-nat.c (amd64bsd_fetch_inferior_registers)
(amd64bsd_store_inferior_registers): Remove target_ops parameter.
(amd64bsd_target): Delete.
* amd64-bsd-nat.h: New file.
* amd64-fbsd-nat.c: Include "amd64-bsd-nat.h" instead of
"x86-bsd-nat.h".
(amd64_fbsd_nat_target): New class.
(the_amd64_fbsd_nat_target): New.
(amd64fbsd_read_description): Refactor as method of
amd64_fbsd_nat_target.
(amd64_fbsd_nat_target::supports_stopped_by_hw_breakpoint): New.
(_initialize_amd64fbsd_nat): Adjust to C++ification.
* amd64-nat.h (amd64bsd_target): Delete function declaration.
* i386-bsd-nat.c (i386bsd_fetch_inferior_registers)
(i386bsd_store_inferior_registers): Remove target_ops parameter.
(i386bsd_target): Delete.
* i386-bsd-nat.h (i386bsd_target): Delete function declaration.
(i386bsd_fetch_inferior_registers)
(i386bsd_store_inferior_registers): Declare.
(i386_bsd_nat_target): New class.
* i386-fbsd-nat.c (i386_fbsd_nat_target): New class.
(the_i386_fbsd_nat_target): New.
(i386fbsd_resume, i386fbsd_read_description): Refactor as
i386_fbsd_nat_target methods.
(i386_fbsd_nat_target::supports_stopped_by_hw_breakpoint): New.
(_initialize_i386fbsd_nat): Adjust to C++ification.
* x86-bsd-nat.c (super_mourn_inferior): Delete.
(x86bsd_mourn_inferior, x86bsd_target): Delete.
(_initialize_x86_bsd_nat): Adjust to C++ification.
* x86-bsd-nat.h: Include "x86-nat.h".
(x86bsd_target): Delete declaration.
(x86bsd_nat_target): New class.
* aarch64-fbsd-nat.c (aarch64_fbsd_nat_target): New class.
(the_aarch64_fbsd_nat_target): New.
(aarch64_fbsd_fetch_inferior_registers)
(aarch64_fbsd_store_inferior_registers): Refactor as methods of
aarch64_fbsd_nat_target.
(_initialize_aarch64_fbsd_nat): Adjust to C++ification.
* alpha-bsd-nat.c (alpha_bsd_nat_target): New class.
(the_alpha_bsd_nat_target): New.
(alphabsd_fetch_inferior_registers)
(alphabsd_store_inferior_registers): Refactor as
alpha_bsd_nat_target methods.
(_initialize_alphabsd_nat): Refactor as methods of
alpha_bsd_nat_target.
* amd64-nbsd-nat.c: Include "amd64-bsd-nat.h".
(the_amd64_nbsd_nat_target): New.
(_initialize_amd64nbsd_nat): Adjust to C++ification.
* amd64-obsd-nat.c: Include "amd64-bsd-nat.h".
(the_amd64_obsd_nat_target): New.
(_initialize_amd64obsd_nat): Adjust to C++ification.
* arm-fbsd-nat.c (arm_fbsd_nat_target): New.
(the_arm_fbsd_nat_target): New.
(arm_fbsd_fetch_inferior_registers)
(arm_fbsd_store_inferior_registers, arm_fbsd_read_description):
(_initialize_arm_fbsd_nat): Refactor as methods of
arm_fbsd_nat_target.
(_initialize_arm_fbsd_nat): Adjust to C++ification.
* arm-nbsd-nat.c (arm_netbsd_nat_target): New class.
(the_arm_netbsd_nat_target): New.
(armnbsd_fetch_registers, armnbsd_store_registers): Refactor as
arm_netbsd_nat_target.
(_initialize_arm_netbsd_nat): Adjust to C++ification.
* hppa-nbsd-nat.c (hppa_nbsd_nat_target): New class.
(the_hppa_nbsd_nat_target): New.
(hppanbsd_fetch_registers, hppanbsd_store_registers): Refactor as
hppa_nbsd_nat_target methods.
(_initialize_hppanbsd_nat): Adjust to C++ification.
* hppa-obsd-nat.c (hppa_obsd_nat_target): New class.
(the_hppa_obsd_nat_target): New.
(hppaobsd_fetch_registers, hppaobsd_store_registers): Refactor as
methods of hppa_obsd_nat_target.
(_initialize_hppaobsd_nat): Adjust to C++ification. Use
add_target.
* i386-nbsd-nat.c (the_i386_nbsd_nat_target): New.
(_initialize_i386nbsd_nat): Adjust to C++ification. Use
add_target.
* i386-obsd-nat.c (the_i386_obsd_nat_target): New.
(_initialize_i386obsd_nat): Use add_target.
* m68k-bsd-nat.c (m68k_bsd_nat_target): New class.
(the_m68k_bsd_nat_target): New.
(m68kbsd_fetch_inferior_registers)
(m68kbsd_store_inferior_registers): Refactor as methods of
m68k_bsd_nat_target.
(_initialize_m68kbsd_nat): Adjust to C++ification.
* mips-fbsd-nat.c (mips_fbsd_nat_target): New class.
(the_mips_fbsd_nat_target): New.
(mips_fbsd_fetch_inferior_registers)
(mips_fbsd_store_inferior_registers): Refactor as methods of
mips_fbsd_nat_target.
(_initialize_mips_fbsd_nat): Adjust to C++ification. Use
add_target.
* mips-nbsd-nat.c (mips_nbsd_nat_target): New class.
(the_mips_nbsd_nat_target): New.
(mipsnbsd_fetch_inferior_registers)
(mipsnbsd_store_inferior_registers): Refactor as methods of
mips_nbsd_nat_target.
(_initialize_mipsnbsd_nat): Adjust to C++ification.
* mips64-obsd-nat.c (mips64_obsd_nat_target): New class.
(the_mips64_obsd_nat_target): New.
(mips64obsd_fetch_inferior_registers)
(mips64obsd_store_inferior_registers): Refactor as methods of
mips64_obsd_nat_target.
(_initialize_mips64obsd_nat): Adjust to C++ification. Use
add_target.
* nbsd-nat.c (nbsd_pid_to_exec_file): Refactor as method of
nbsd_nat_target.
* nbsd-nat.h: Include "inf-ptrace.h".
(nbsd_nat_target): New class.
* obsd-nat.c (obsd_pid_to_str, obsd_update_thread_list)
(obsd_wait): Refactor as methods of obsd_nat_target.
(obsd_add_target): Delete.
* obsd-nat.h: Include "inf-ptrace.h".
(obsd_nat_target): New class.
* ppc-fbsd-nat.c (ppc_fbsd_nat_target): New class.
(the_ppc_fbsd_nat_target): New.
(ppcfbsd_fetch_inferior_registers)
(ppcfbsd_store_inferior_registers): Refactor as methods of
ppc_fbsd_nat_target.
(_initialize_ppcfbsd_nat): Adjust to C++ification. Use
add_target.
* ppc-nbsd-nat.c (ppc_nbsd_nat_target): New class.
(the_ppc_nbsd_nat_target): New.
(ppcnbsd_fetch_inferior_registers)
(ppcnbsd_store_inferior_registers): Refactor as methods of
ppc_nbsd_nat_target.
(_initialize_ppcnbsd_nat): Adjust to C++ification.
* ppc-obsd-nat.c (ppc_obsd_nat_target): New class.
(the_ppc_obsd_nat_target): New.
(ppcobsd_fetch_registers, ppcobsd_store_registers): Refactor as
methods of ppc_obsd_nat_target.
(_initialize_ppcobsd_nat): Adjust to C++ification. Use
add_target.
* sh-nbsd-nat.c (sh_nbsd_nat_target): New class.
(the_sh_nbsd_nat_target): New.
(shnbsd_fetch_inferior_registers)
(shnbsd_store_inferior_registers): Refactor as methods of
sh_nbsd_nat_target.
(_initialize_shnbsd_nat): Adjust to C++ification.
* sparc-nat.c (sparc_xfer_wcookie): Make extern.
(inf_ptrace_xfer_partial): Delete.
(sparc_xfer_partial, sparc_target): Delete.
* sparc-nat.h (sparc_fetch_inferior_registers)
(sparc_store_inferior_registers, sparc_xfer_wcookie): Declare.
(sparc_target): Delete function declaration.
(sparc_target): New template class.
* sparc-nbsd-nat.c (the_sparc_nbsd_nat_target): New.
(_initialize_sparcnbsd_nat): Adjust to C++ification.
* sparc64-fbsd-nat.c (the_sparc64_fbsd_nat_target): New.
(_initialize_sparc64fbsd_nat): Adjust to C++ification. Use
add_target.
* sparc64-nbsd-nat.c (the_sparc64_nbsd_nat_target): New.
(_initialize_sparc64nbsd_nat): Adjust to C++ification.
* sparc64-obsd-nat.c (the_sparc64_obsd_nat_target): New.
(_initialize_sparc64obsd_nat): Adjust to C++ification. Use
add_target.
* vax-bsd-nat.c (vax_bsd_nat_target): New class.
(the_vax_bsd_nat_target): New.
(vaxbsd_fetch_inferior_registers)
(vaxbsd_store_inferior_registers): Refactor as vax_bsd_nat_target
methods.
(_initialize_vaxbsd_nat): Adjust to C++ification.
* bsd-kvm.c (bsd_kvm_target): New class.
(bsd_kvm_ops): Now a bsd_kvm_target.
(bsd_kvm_open, bsd_kvm_close, bsd_kvm_xfer_partial)
(bsd_kvm_files_info, bsd_kvm_fetch_registers)
(bsd_kvm_thread_alive, bsd_kvm_pid_to_str): Refactor as methods of
bsd_kvm_target.
(bsd_kvm_return_one): Delete.
(bsd_kvm_add_target): Adjust to C++ification.
* nto-procfs.c (nto_procfs_target, nto_procfs_target_native)
(nto_procfs_target_procfs): New classes.
(procfs_open_1, procfs_thread_alive, procfs_update_thread_list)
(procfs_files_info, procfs_pid_to_exec_file, procfs_attach)
(procfs_post_attach, procfs_wait, procfs_fetch_registers)
(procfs_xfer_partial, procfs_detach, procfs_insert_breakpoint)
(procfs_remove_breakpoint, procfs_insert_hw_breakpoint)
(procfs_remove_hw_breakpoint, procfs_resume)
(procfs_mourn_inferior, procfs_create_inferior, procfs_interrupt)
(procfs_kill_inferior, procfs_store_registers)
(procfs_pass_signals, procfs_pid_to_str, procfs_can_run): Refactor
as methods of nto_procfs_target.
(nto_procfs_ops): Now an nto_procfs_target_procfs.
(nto_native_ops): Delete.
(procfs_open, procfs_native_open): Delete.
(nto_native_ops): Now an nto_procfs_target_native.
(init_procfs_targets): Adjust to C++ification.
(procfs_can_use_hw_breakpoint, procfs_remove_hw_watchpoint)
(procfs_insert_hw_watchpoint, procfs_stopped_by_watchpoint):
Refactor as methods of nto_procfs_target.
* go32-nat.c (go32_nat_target): New class.
(the_go32_nat_target): New.
(go32_attach, go32_resume, go32_wait, go32_fetch_registers)
(go32_store_registers, go32_xfer_partial, go32_files_info)
(go32_kill_inferior, go32_create_inferior, go32_mourn_inferior)
(go32_terminal_init, go32_terminal_info, go32_terminal_inferior)
(go32_terminal_ours, go32_pass_ctrlc, go32_thread_alive)
(go32_pid_to_str): Refactor as methods of go32_nat_target.
(go32_target): Delete.
(_initialize_go32_nat): Adjust to C++ification.
* gnu-nat.c (gnu_wait, gnu_resume, gnu_kill_inferior)
(gnu_mourn_inferior, gnu_create_inferior, gnu_attach, gnu_detach)
(gnu_stop, gnu_thread_alive, gnu_xfer_partial)
(gnu_find_memory_regions, gnu_pid_to_str): Refactor as methods of
gnu_nat_target.
(gnu_target): Delete.
* gnu-nat.h (gnu_target): Delete.
(gnu_nat_target): New class.
* i386-gnu-nat.c (gnu_base_target): New.
(i386_gnu_nat_target): New class.
(the_i386_gnu_nat_target): New.
(_initialize_i386gnu_nat): Adjust to C++ification.
gdb/testsuite/ChangeLog:
2018-05-02 Pedro Alves <palves@redhat.com>
* gdb.base/breakpoint-in-ro-region.exp: Adjust to to_resume and
to_log_command renames.
* gdb.base/sss-bp-on-user-bp-2.exp: Likewise.
1356 lines
38 KiB
C
1356 lines
38 KiB
C
/* Generic remote debugging interface for simulators.
|
|
|
|
Copyright (C) 1993-2018 Free Software Foundation, Inc.
|
|
|
|
Contributed by Cygnus Support.
|
|
Steve Chamberlain (sac@cygnus.com).
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "gdb_bfd.h"
|
|
#include "inferior.h"
|
|
#include "infrun.h"
|
|
#include "value.h"
|
|
#include <ctype.h>
|
|
#include <fcntl.h>
|
|
#include <signal.h>
|
|
#include <setjmp.h>
|
|
#include "terminal.h"
|
|
#include "target.h"
|
|
#include "gdbcore.h"
|
|
#include "gdb/callback.h"
|
|
#include "gdb/remote-sim.h"
|
|
#include "command.h"
|
|
#include "regcache.h"
|
|
#include "sim-regno.h"
|
|
#include "arch-utils.h"
|
|
#include "readline/readline.h"
|
|
#include "gdbthread.h"
|
|
#include "common/byte-vector.h"
|
|
|
|
/* Prototypes */
|
|
|
|
static void init_callbacks (void);
|
|
|
|
static void end_callbacks (void);
|
|
|
|
static int gdb_os_write_stdout (host_callback *, const char *, int);
|
|
|
|
static void gdb_os_flush_stdout (host_callback *);
|
|
|
|
static int gdb_os_write_stderr (host_callback *, const char *, int);
|
|
|
|
static void gdb_os_flush_stderr (host_callback *);
|
|
|
|
static int gdb_os_poll_quit (host_callback *);
|
|
|
|
/* printf_filtered is depreciated. */
|
|
static void gdb_os_printf_filtered (host_callback *, const char *, ...);
|
|
|
|
static void gdb_os_vprintf_filtered (host_callback *, const char *, va_list);
|
|
|
|
static void gdb_os_evprintf_filtered (host_callback *, const char *, va_list);
|
|
|
|
static void gdb_os_error (host_callback *, const char *, ...)
|
|
ATTRIBUTE_NORETURN;
|
|
|
|
void simulator_command (char *args, int from_tty);
|
|
|
|
/* Naming convention:
|
|
|
|
sim_* are the interface to the simulator (see remote-sim.h).
|
|
gdbsim_* are stuff which is internal to gdb. */
|
|
|
|
struct gdbsim_target final
|
|
: public memory_breakpoint_target<target_ops>
|
|
{
|
|
gdbsim_target ()
|
|
{ to_stratum = process_stratum; }
|
|
|
|
const char *shortname () override
|
|
{ return "sim"; }
|
|
|
|
const char *longname () override
|
|
{ return _("simulator"); }
|
|
|
|
const char *doc () override
|
|
{ return _("Use the compiled-in simulator."); }
|
|
|
|
void open (const char *, int) override;
|
|
void close () override;
|
|
|
|
void detach (inferior *inf, 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;
|
|
void prepare_to_store (struct regcache *) 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;
|
|
|
|
void kill () override;
|
|
|
|
void load (const char *, int) override;
|
|
|
|
bool can_create_inferior () override { return true; }
|
|
void create_inferior (const char *, const std::string &,
|
|
char **, int) override;
|
|
|
|
void mourn_inferior () override;
|
|
|
|
void interrupt () override;
|
|
|
|
int thread_alive (ptid_t ptid) override;
|
|
|
|
const char *pid_to_str (ptid_t) override;
|
|
|
|
int has_all_memory () override;
|
|
int has_memory () override;
|
|
|
|
int has_stack () override
|
|
{ return default_child_has_stack (); }
|
|
|
|
int has_registers () override
|
|
{ return default_child_has_registers (); }
|
|
|
|
int has_execution (ptid_t ptid) override
|
|
{ return default_child_has_execution (ptid); }
|
|
};
|
|
|
|
static struct gdbsim_target gdbsim_ops;
|
|
|
|
static const struct inferior_data *sim_inferior_data_key;
|
|
|
|
/* Simulator-specific, per-inferior state. */
|
|
struct sim_inferior_data {
|
|
/* Flag which indicates whether or not the program has been loaded. */
|
|
int program_loaded;
|
|
|
|
/* Simulator descriptor for this inferior. */
|
|
SIM_DESC gdbsim_desc;
|
|
|
|
/* This is the ptid we use for this particular simulator instance. Its
|
|
value is somewhat arbitrary, as the simulator target don't have a
|
|
notion of tasks or threads, but we need something non-null to place
|
|
in inferior_ptid. For simulators which permit multiple instances,
|
|
we also need a unique identifier to use for each inferior. */
|
|
ptid_t remote_sim_ptid;
|
|
|
|
/* Signal with which to resume. */
|
|
enum gdb_signal resume_siggnal;
|
|
|
|
/* Flag which indicates whether resume should step or not. */
|
|
int resume_step;
|
|
};
|
|
|
|
/* Flag indicating the "open" status of this module. It's set to 1
|
|
in gdbsim_open() and 0 in gdbsim_close(). */
|
|
static int gdbsim_is_open = 0;
|
|
|
|
/* Value of the next pid to allocate for an inferior. As indicated
|
|
elsewhere, its initial value is somewhat arbitrary; it's critical
|
|
though that it's not zero or negative. */
|
|
static int next_pid;
|
|
#define INITIAL_PID 42000
|
|
|
|
/* Argument list to pass to sim_open(). It is allocated in gdbsim_open()
|
|
and deallocated in gdbsim_close(). The lifetime needs to extend beyond
|
|
the call to gdbsim_open() due to the fact that other sim instances other
|
|
than the first will be allocated after the gdbsim_open() call. */
|
|
static char **sim_argv = NULL;
|
|
|
|
/* OS-level callback functions for write, flush, etc. */
|
|
static host_callback gdb_callback;
|
|
static int callbacks_initialized = 0;
|
|
|
|
/* Callback for iterate_over_inferiors. It checks to see if the sim
|
|
descriptor passed via ARG is the same as that for the inferior
|
|
designated by INF. Return true if so; false otherwise. */
|
|
|
|
static int
|
|
check_for_duplicate_sim_descriptor (struct inferior *inf, void *arg)
|
|
{
|
|
struct sim_inferior_data *sim_data;
|
|
SIM_DESC new_sim_desc = (SIM_DESC) arg;
|
|
|
|
sim_data = ((struct sim_inferior_data *)
|
|
inferior_data (inf, sim_inferior_data_key));
|
|
|
|
return (sim_data != NULL && sim_data->gdbsim_desc == new_sim_desc);
|
|
}
|
|
|
|
/* Flags indicating whether or not a sim instance is needed. One of these
|
|
flags should be passed to get_sim_inferior_data(). */
|
|
|
|
enum {SIM_INSTANCE_NOT_NEEDED = 0, SIM_INSTANCE_NEEDED = 1};
|
|
|
|
/* Obtain pointer to per-inferior simulator data, allocating it if necessary.
|
|
Attempt to open the sim if SIM_INSTANCE_NEEDED is true. */
|
|
|
|
static struct sim_inferior_data *
|
|
get_sim_inferior_data (struct inferior *inf, int sim_instance_needed)
|
|
{
|
|
SIM_DESC sim_desc = NULL;
|
|
struct sim_inferior_data *sim_data
|
|
= (struct sim_inferior_data *) inferior_data (inf, sim_inferior_data_key);
|
|
|
|
/* Try to allocate a new sim instance, if needed. We do this ahead of
|
|
a potential allocation of a sim_inferior_data struct in order to
|
|
avoid needlessly allocating that struct in the event that the sim
|
|
instance allocation fails. */
|
|
if (sim_instance_needed == SIM_INSTANCE_NEEDED
|
|
&& (sim_data == NULL || sim_data->gdbsim_desc == NULL))
|
|
{
|
|
struct inferior *idup;
|
|
sim_desc = sim_open (SIM_OPEN_DEBUG, &gdb_callback, exec_bfd, sim_argv);
|
|
if (sim_desc == NULL)
|
|
error (_("Unable to create simulator instance for inferior %d."),
|
|
inf->num);
|
|
|
|
idup = iterate_over_inferiors (check_for_duplicate_sim_descriptor,
|
|
sim_desc);
|
|
if (idup != NULL)
|
|
{
|
|
/* We don't close the descriptor due to the fact that it's
|
|
shared with some other inferior. If we were to close it,
|
|
that might needlessly muck up the other inferior. Of
|
|
course, it's possible that the damage has already been
|
|
done... Note that it *will* ultimately be closed during
|
|
cleanup of the other inferior. */
|
|
sim_desc = NULL;
|
|
error (
|
|
_("Inferior %d and inferior %d would have identical simulator state.\n"
|
|
"(This simulator does not support the running of more than one inferior.)"),
|
|
inf->num, idup->num);
|
|
}
|
|
}
|
|
|
|
if (sim_data == NULL)
|
|
{
|
|
sim_data = XCNEW(struct sim_inferior_data);
|
|
set_inferior_data (inf, sim_inferior_data_key, sim_data);
|
|
|
|
/* Allocate a ptid for this inferior. */
|
|
sim_data->remote_sim_ptid = ptid_build (next_pid, 0, next_pid);
|
|
next_pid++;
|
|
|
|
/* Initialize the other instance variables. */
|
|
sim_data->program_loaded = 0;
|
|
sim_data->gdbsim_desc = sim_desc;
|
|
sim_data->resume_siggnal = GDB_SIGNAL_0;
|
|
sim_data->resume_step = 0;
|
|
}
|
|
else if (sim_desc)
|
|
{
|
|
/* This handles the case where sim_data was allocated prior to
|
|
needing a sim instance. */
|
|
sim_data->gdbsim_desc = sim_desc;
|
|
}
|
|
|
|
|
|
return sim_data;
|
|
}
|
|
|
|
/* Return pointer to per-inferior simulator data using PTID to find the
|
|
inferior in question. Return NULL when no inferior is found or
|
|
when ptid has a zero or negative pid component. */
|
|
|
|
static struct sim_inferior_data *
|
|
get_sim_inferior_data_by_ptid (ptid_t ptid, int sim_instance_needed)
|
|
{
|
|
struct inferior *inf;
|
|
int pid = ptid_get_pid (ptid);
|
|
|
|
if (pid <= 0)
|
|
return NULL;
|
|
|
|
inf = find_inferior_pid (pid);
|
|
|
|
if (inf)
|
|
return get_sim_inferior_data (inf, sim_instance_needed);
|
|
else
|
|
return NULL;
|
|
}
|
|
|
|
/* Free the per-inferior simulator data. */
|
|
|
|
static void
|
|
sim_inferior_data_cleanup (struct inferior *inf, void *data)
|
|
{
|
|
struct sim_inferior_data *sim_data = (struct sim_inferior_data *) data;
|
|
|
|
if (sim_data != NULL)
|
|
{
|
|
if (sim_data->gdbsim_desc)
|
|
{
|
|
sim_close (sim_data->gdbsim_desc, 0);
|
|
sim_data->gdbsim_desc = NULL;
|
|
}
|
|
xfree (sim_data);
|
|
}
|
|
}
|
|
|
|
static void
|
|
dump_mem (const gdb_byte *buf, int len)
|
|
{
|
|
fputs_unfiltered ("\t", gdb_stdlog);
|
|
|
|
if (len == 8 || len == 4)
|
|
{
|
|
uint32_t l[2];
|
|
|
|
memcpy (l, buf, len);
|
|
fprintf_unfiltered (gdb_stdlog, "0x%08x", l[0]);
|
|
if (len == 8)
|
|
fprintf_unfiltered (gdb_stdlog, " 0x%08x", l[1]);
|
|
}
|
|
else
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < len; i++)
|
|
fprintf_unfiltered (gdb_stdlog, "0x%02x ", buf[i]);
|
|
}
|
|
|
|
fputs_unfiltered ("\n", gdb_stdlog);
|
|
}
|
|
|
|
/* Initialize gdb_callback. */
|
|
|
|
static void
|
|
init_callbacks (void)
|
|
{
|
|
if (!callbacks_initialized)
|
|
{
|
|
gdb_callback = default_callback;
|
|
gdb_callback.init (&gdb_callback);
|
|
gdb_callback.write_stdout = gdb_os_write_stdout;
|
|
gdb_callback.flush_stdout = gdb_os_flush_stdout;
|
|
gdb_callback.write_stderr = gdb_os_write_stderr;
|
|
gdb_callback.flush_stderr = gdb_os_flush_stderr;
|
|
gdb_callback.printf_filtered = gdb_os_printf_filtered;
|
|
gdb_callback.vprintf_filtered = gdb_os_vprintf_filtered;
|
|
gdb_callback.evprintf_filtered = gdb_os_evprintf_filtered;
|
|
gdb_callback.error = gdb_os_error;
|
|
gdb_callback.poll_quit = gdb_os_poll_quit;
|
|
gdb_callback.magic = HOST_CALLBACK_MAGIC;
|
|
callbacks_initialized = 1;
|
|
}
|
|
}
|
|
|
|
/* Release callbacks (free resources used by them). */
|
|
|
|
static void
|
|
end_callbacks (void)
|
|
{
|
|
if (callbacks_initialized)
|
|
{
|
|
gdb_callback.shutdown (&gdb_callback);
|
|
callbacks_initialized = 0;
|
|
}
|
|
}
|
|
|
|
/* GDB version of os_write_stdout callback. */
|
|
|
|
static int
|
|
gdb_os_write_stdout (host_callback *p, const char *buf, int len)
|
|
{
|
|
int i;
|
|
char b[2];
|
|
|
|
ui_file_write (gdb_stdtarg, buf, len);
|
|
return len;
|
|
}
|
|
|
|
/* GDB version of os_flush_stdout callback. */
|
|
|
|
static void
|
|
gdb_os_flush_stdout (host_callback *p)
|
|
{
|
|
gdb_flush (gdb_stdtarg);
|
|
}
|
|
|
|
/* GDB version of os_write_stderr callback. */
|
|
|
|
static int
|
|
gdb_os_write_stderr (host_callback *p, const char *buf, int len)
|
|
{
|
|
int i;
|
|
char b[2];
|
|
|
|
for (i = 0; i < len; i++)
|
|
{
|
|
b[0] = buf[i];
|
|
b[1] = 0;
|
|
fputs_unfiltered (b, gdb_stdtargerr);
|
|
}
|
|
return len;
|
|
}
|
|
|
|
/* GDB version of os_flush_stderr callback. */
|
|
|
|
static void
|
|
gdb_os_flush_stderr (host_callback *p)
|
|
{
|
|
gdb_flush (gdb_stdtargerr);
|
|
}
|
|
|
|
/* GDB version of printf_filtered callback. */
|
|
|
|
static void ATTRIBUTE_PRINTF (2, 3)
|
|
gdb_os_printf_filtered (host_callback * p, const char *format, ...)
|
|
{
|
|
va_list args;
|
|
|
|
va_start (args, format);
|
|
vfprintf_filtered (gdb_stdout, format, args);
|
|
va_end (args);
|
|
}
|
|
|
|
/* GDB version of error vprintf_filtered. */
|
|
|
|
static void ATTRIBUTE_PRINTF (2, 0)
|
|
gdb_os_vprintf_filtered (host_callback * p, const char *format, va_list ap)
|
|
{
|
|
vfprintf_filtered (gdb_stdout, format, ap);
|
|
}
|
|
|
|
/* GDB version of error evprintf_filtered. */
|
|
|
|
static void ATTRIBUTE_PRINTF (2, 0)
|
|
gdb_os_evprintf_filtered (host_callback * p, const char *format, va_list ap)
|
|
{
|
|
vfprintf_filtered (gdb_stderr, format, ap);
|
|
}
|
|
|
|
/* GDB version of error callback. */
|
|
|
|
static void ATTRIBUTE_PRINTF (2, 3)
|
|
gdb_os_error (host_callback * p, const char *format, ...)
|
|
{
|
|
va_list args;
|
|
|
|
va_start (args, format);
|
|
verror (format, args);
|
|
va_end (args);
|
|
}
|
|
|
|
int
|
|
one2one_register_sim_regno (struct gdbarch *gdbarch, int regnum)
|
|
{
|
|
/* Only makes sense to supply raw registers. */
|
|
gdb_assert (regnum >= 0 && regnum < gdbarch_num_regs (gdbarch));
|
|
return regnum;
|
|
}
|
|
|
|
void
|
|
gdbsim_target::fetch_registers (struct regcache *regcache, int regno)
|
|
{
|
|
struct gdbarch *gdbarch = regcache->arch ();
|
|
struct inferior *inf = find_inferior_ptid (regcache_get_ptid (regcache));
|
|
struct sim_inferior_data *sim_data
|
|
= get_sim_inferior_data (inf, SIM_INSTANCE_NEEDED);
|
|
|
|
if (regno == -1)
|
|
{
|
|
for (regno = 0; regno < gdbarch_num_regs (gdbarch); regno++)
|
|
fetch_registers (regcache, regno);
|
|
return;
|
|
}
|
|
|
|
switch (gdbarch_register_sim_regno (gdbarch, regno))
|
|
{
|
|
case LEGACY_SIM_REGNO_IGNORE:
|
|
break;
|
|
case SIM_REGNO_DOES_NOT_EXIST:
|
|
{
|
|
/* For moment treat a `does not exist' register the same way
|
|
as an ``unavailable'' register. */
|
|
regcache->raw_supply_zeroed (regno);
|
|
break;
|
|
}
|
|
|
|
default:
|
|
{
|
|
static int warn_user = 1;
|
|
int regsize = register_size (gdbarch, regno);
|
|
gdb::byte_vector buf (regsize, 0);
|
|
int nr_bytes;
|
|
|
|
gdb_assert (regno >= 0 && regno < gdbarch_num_regs (gdbarch));
|
|
nr_bytes = sim_fetch_register (sim_data->gdbsim_desc,
|
|
gdbarch_register_sim_regno
|
|
(gdbarch, regno),
|
|
buf.data (), regsize);
|
|
if (nr_bytes > 0 && nr_bytes != regsize && warn_user)
|
|
{
|
|
fprintf_unfiltered (gdb_stderr,
|
|
"Size of register %s (%d/%d) "
|
|
"incorrect (%d instead of %d))",
|
|
gdbarch_register_name (gdbarch, regno),
|
|
regno,
|
|
gdbarch_register_sim_regno (gdbarch, regno),
|
|
nr_bytes, regsize);
|
|
warn_user = 0;
|
|
}
|
|
/* FIXME: cagney/2002-05-27: Should check `nr_bytes == 0'
|
|
indicating that GDB and the SIM have different ideas about
|
|
which registers are fetchable. */
|
|
/* Else if (nr_bytes < 0): an old simulator, that doesn't
|
|
think to return the register size. Just assume all is ok. */
|
|
regcache->raw_supply (regno, buf.data ());
|
|
if (remote_debug)
|
|
{
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"gdbsim_fetch_register: %d", regno);
|
|
/* FIXME: We could print something more intelligible. */
|
|
dump_mem (buf.data (), regsize);
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
void
|
|
gdbsim_target::store_registers (struct regcache *regcache, int regno)
|
|
{
|
|
struct gdbarch *gdbarch = regcache->arch ();
|
|
struct inferior *inf = find_inferior_ptid (regcache_get_ptid (regcache));
|
|
struct sim_inferior_data *sim_data
|
|
= get_sim_inferior_data (inf, SIM_INSTANCE_NEEDED);
|
|
|
|
if (regno == -1)
|
|
{
|
|
for (regno = 0; regno < gdbarch_num_regs (gdbarch); regno++)
|
|
store_registers (regcache, regno);
|
|
return;
|
|
}
|
|
else if (gdbarch_register_sim_regno (gdbarch, regno) >= 0)
|
|
{
|
|
int regsize = register_size (gdbarch, regno);
|
|
gdb::byte_vector tmp (regsize);
|
|
int nr_bytes;
|
|
|
|
regcache->cooked_read (regno, tmp.data ());
|
|
nr_bytes = sim_store_register (sim_data->gdbsim_desc,
|
|
gdbarch_register_sim_regno
|
|
(gdbarch, regno),
|
|
tmp.data (), regsize);
|
|
|
|
if (nr_bytes > 0 && nr_bytes != regsize)
|
|
internal_error (__FILE__, __LINE__,
|
|
_("Register size different to expected"));
|
|
if (nr_bytes < 0)
|
|
internal_error (__FILE__, __LINE__,
|
|
_("Register %d not updated"), regno);
|
|
if (nr_bytes == 0)
|
|
warning (_("Register %s not updated"),
|
|
gdbarch_register_name (gdbarch, regno));
|
|
|
|
if (remote_debug)
|
|
{
|
|
fprintf_unfiltered (gdb_stdlog, "gdbsim_store_register: %d", regno);
|
|
/* FIXME: We could print something more intelligible. */
|
|
dump_mem (tmp.data (), regsize);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Kill the running program. This may involve closing any open files
|
|
and releasing other resources acquired by the simulated program. */
|
|
|
|
void
|
|
gdbsim_target::kill ()
|
|
{
|
|
if (remote_debug)
|
|
fprintf_unfiltered (gdb_stdlog, "gdbsim_kill\n");
|
|
|
|
/* There is no need to `kill' running simulator - the simulator is
|
|
not running. Mourning it is enough. */
|
|
target_mourn_inferior (inferior_ptid);
|
|
}
|
|
|
|
/* Load an executable file into the target process. This is expected to
|
|
not only bring new code into the target process, but also to update
|
|
GDB's symbol tables to match. */
|
|
|
|
void
|
|
gdbsim_target::load (const char *args, int fromtty)
|
|
{
|
|
const char *prog;
|
|
struct sim_inferior_data *sim_data
|
|
= get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NEEDED);
|
|
|
|
if (args == NULL)
|
|
error_no_arg (_("program to load"));
|
|
|
|
gdb_argv argv (args);
|
|
|
|
prog = tilde_expand (argv[0]);
|
|
|
|
if (argv[1] != NULL)
|
|
error (_("GDB sim does not yet support a load offset."));
|
|
|
|
if (remote_debug)
|
|
fprintf_unfiltered (gdb_stdlog, "gdbsim_load: prog \"%s\"\n", prog);
|
|
|
|
/* FIXME: We will print two messages on error.
|
|
Need error to either not print anything if passed NULL or need
|
|
another routine that doesn't take any arguments. */
|
|
if (sim_load (sim_data->gdbsim_desc, prog, NULL, fromtty) == SIM_RC_FAIL)
|
|
error (_("unable to load program"));
|
|
|
|
/* FIXME: If a load command should reset the targets registers then
|
|
a call to sim_create_inferior() should go here. */
|
|
|
|
sim_data->program_loaded = 1;
|
|
}
|
|
|
|
|
|
/* Start an inferior process and set inferior_ptid to its pid.
|
|
EXEC_FILE is the file to run.
|
|
ARGS is a string containing the arguments to the program.
|
|
ENV is the environment vector to pass. Errors reported with error().
|
|
On VxWorks and various standalone systems, we ignore exec_file. */
|
|
/* This is called not only when we first attach, but also when the
|
|
user types "run" after having attached. */
|
|
|
|
void
|
|
gdbsim_target::create_inferior (const char *exec_file,
|
|
const std::string &allargs,
|
|
char **env, int from_tty)
|
|
{
|
|
struct sim_inferior_data *sim_data
|
|
= get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NEEDED);
|
|
int len;
|
|
char *arg_buf;
|
|
const char *args = allargs.c_str ();
|
|
|
|
if (exec_file == 0 || exec_bfd == 0)
|
|
warning (_("No executable file specified."));
|
|
if (!sim_data->program_loaded)
|
|
warning (_("No program loaded."));
|
|
|
|
if (remote_debug)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"gdbsim_create_inferior: exec_file \"%s\", args \"%s\"\n",
|
|
(exec_file ? exec_file : "(NULL)"),
|
|
args);
|
|
|
|
if (ptid_equal (inferior_ptid, sim_data->remote_sim_ptid))
|
|
kill ();
|
|
remove_breakpoints ();
|
|
init_wait_for_inferior ();
|
|
|
|
gdb_argv built_argv;
|
|
if (exec_file != NULL)
|
|
{
|
|
len = strlen (exec_file) + 1 + allargs.size () + 1 + /*slop */ 10;
|
|
arg_buf = (char *) alloca (len);
|
|
arg_buf[0] = '\0';
|
|
strcat (arg_buf, exec_file);
|
|
strcat (arg_buf, " ");
|
|
strcat (arg_buf, args);
|
|
built_argv.reset (arg_buf);
|
|
}
|
|
|
|
if (!have_inferiors ())
|
|
init_thread_list ();
|
|
|
|
if (sim_create_inferior (sim_data->gdbsim_desc, exec_bfd,
|
|
built_argv.get (), env)
|
|
!= SIM_RC_OK)
|
|
error (_("Unable to create sim inferior."));
|
|
|
|
inferior_ptid = sim_data->remote_sim_ptid;
|
|
inferior_appeared (current_inferior (), ptid_get_pid (inferior_ptid));
|
|
add_thread_silent (inferior_ptid);
|
|
|
|
insert_breakpoints (); /* Needed to get correct instruction
|
|
in cache. */
|
|
|
|
clear_proceed_status (0);
|
|
}
|
|
|
|
/* The open routine takes the rest of the parameters from the command,
|
|
and (if successful) pushes a new target onto the stack.
|
|
Targets should supply this routine, if only to provide an error message. */
|
|
/* Called when selecting the simulator. E.g. (gdb) target sim name. */
|
|
|
|
void
|
|
gdbsim_target::open (const char *args, int from_tty)
|
|
{
|
|
int len;
|
|
char *arg_buf;
|
|
struct sim_inferior_data *sim_data;
|
|
const char *sysroot;
|
|
SIM_DESC gdbsim_desc;
|
|
|
|
sysroot = gdb_sysroot;
|
|
if (is_target_filename (sysroot))
|
|
sysroot += strlen (TARGET_SYSROOT_PREFIX);
|
|
|
|
if (remote_debug)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"gdbsim_open: args \"%s\"\n", args ? args : "(null)");
|
|
|
|
/* Ensure that the sim target is not on the target stack. This is
|
|
necessary, because if it is on the target stack, the call to
|
|
push_target below will invoke sim_close(), thus freeing various
|
|
state (including a sim instance) that we allocate prior to
|
|
invoking push_target(). We want to delay the push_target()
|
|
operation until after we complete those operations which could
|
|
error out. */
|
|
if (gdbsim_is_open)
|
|
unpush_target (&gdbsim_ops);
|
|
|
|
len = (7 + 1 /* gdbsim */
|
|
+ strlen (" -E little")
|
|
+ strlen (" --architecture=xxxxxxxxxx")
|
|
+ strlen (" --sysroot=") + strlen (sysroot) +
|
|
+ (args ? strlen (args) : 0)
|
|
+ 50) /* slack */ ;
|
|
arg_buf = (char *) alloca (len);
|
|
strcpy (arg_buf, "gdbsim"); /* 7 */
|
|
/* Specify the byte order for the target when it is explicitly
|
|
specified by the user (not auto detected). */
|
|
switch (selected_byte_order ())
|
|
{
|
|
case BFD_ENDIAN_BIG:
|
|
strcat (arg_buf, " -E big");
|
|
break;
|
|
case BFD_ENDIAN_LITTLE:
|
|
strcat (arg_buf, " -E little");
|
|
break;
|
|
case BFD_ENDIAN_UNKNOWN:
|
|
break;
|
|
}
|
|
/* Specify the architecture of the target when it has been
|
|
explicitly specified */
|
|
if (selected_architecture_name () != NULL)
|
|
{
|
|
strcat (arg_buf, " --architecture=");
|
|
strcat (arg_buf, selected_architecture_name ());
|
|
}
|
|
/* Pass along gdb's concept of the sysroot. */
|
|
strcat (arg_buf, " --sysroot=");
|
|
strcat (arg_buf, sysroot);
|
|
/* finally, any explicit args */
|
|
if (args)
|
|
{
|
|
strcat (arg_buf, " "); /* 1 */
|
|
strcat (arg_buf, args);
|
|
}
|
|
|
|
gdb_argv argv (arg_buf);
|
|
sim_argv = argv.get ();
|
|
|
|
init_callbacks ();
|
|
gdbsim_desc = sim_open (SIM_OPEN_DEBUG, &gdb_callback, exec_bfd, sim_argv);
|
|
|
|
if (gdbsim_desc == 0)
|
|
{
|
|
sim_argv = NULL;
|
|
error (_("unable to create simulator instance"));
|
|
}
|
|
|
|
argv.release ();
|
|
|
|
/* Reset the pid numberings for this batch of sim instances. */
|
|
next_pid = INITIAL_PID;
|
|
|
|
/* Allocate the inferior data, but do not allocate a sim instance
|
|
since we've already just done that. */
|
|
sim_data = get_sim_inferior_data (current_inferior (),
|
|
SIM_INSTANCE_NOT_NEEDED);
|
|
|
|
sim_data->gdbsim_desc = gdbsim_desc;
|
|
|
|
push_target (&gdbsim_ops);
|
|
printf_filtered ("Connected to the simulator.\n");
|
|
|
|
/* There's nothing running after "target sim" or "load"; not until
|
|
"run". */
|
|
inferior_ptid = null_ptid;
|
|
|
|
gdbsim_is_open = 1;
|
|
}
|
|
|
|
/* Callback for iterate_over_inferiors. Called (indirectly) by
|
|
gdbsim_close(). */
|
|
|
|
static int
|
|
gdbsim_close_inferior (struct inferior *inf, void *arg)
|
|
{
|
|
struct sim_inferior_data *sim_data
|
|
= (struct sim_inferior_data *) inferior_data (inf, sim_inferior_data_key);
|
|
if (sim_data != NULL)
|
|
{
|
|
ptid_t ptid = sim_data->remote_sim_ptid;
|
|
|
|
sim_inferior_data_cleanup (inf, sim_data);
|
|
set_inferior_data (inf, sim_inferior_data_key, NULL);
|
|
|
|
/* Having a ptid allocated and stored in remote_sim_ptid does
|
|
not mean that a corresponding inferior was ever created.
|
|
Thus we need to verify the existence of an inferior using the
|
|
pid in question before setting inferior_ptid via
|
|
switch_to_thread() or mourning the inferior. */
|
|
if (find_inferior_ptid (ptid) != NULL)
|
|
{
|
|
switch_to_thread (ptid);
|
|
generic_mourn_inferior ();
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Close out all files and local state before this target loses control. */
|
|
|
|
void
|
|
gdbsim_target::close ()
|
|
{
|
|
struct sim_inferior_data *sim_data
|
|
= get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NOT_NEEDED);
|
|
|
|
if (remote_debug)
|
|
fprintf_unfiltered (gdb_stdlog, "gdbsim_close\n");
|
|
|
|
iterate_over_inferiors (gdbsim_close_inferior, NULL);
|
|
|
|
if (sim_argv != NULL)
|
|
{
|
|
freeargv (sim_argv);
|
|
sim_argv = NULL;
|
|
}
|
|
|
|
end_callbacks ();
|
|
|
|
gdbsim_is_open = 0;
|
|
}
|
|
|
|
/* Takes a program previously attached to and detaches it.
|
|
The program may resume execution (some targets do, some don't) and will
|
|
no longer stop on signals, etc. We better not have left any breakpoints
|
|
in the program or it'll die when it hits one. FROM_TTY says whether to be
|
|
verbose or not. */
|
|
/* Terminate the open connection to the remote debugger.
|
|
Use this when you want to detach and do something else with your gdb. */
|
|
|
|
void
|
|
gdbsim_target::detach (inferior *inf, int from_tty)
|
|
{
|
|
if (remote_debug)
|
|
fprintf_unfiltered (gdb_stdlog, "gdbsim_detach\n");
|
|
|
|
unpush_target (this); /* calls gdbsim_close to do the real work */
|
|
if (from_tty)
|
|
printf_filtered ("Ending simulator %s debugging\n", target_shortname);
|
|
}
|
|
|
|
/* Resume execution of the target process. STEP says whether to single-step
|
|
or to run free; SIGGNAL is the signal value (e.g. SIGINT) to be given
|
|
to the target, or zero for no signal. */
|
|
|
|
struct resume_data
|
|
{
|
|
enum gdb_signal siggnal;
|
|
int step;
|
|
};
|
|
|
|
static int
|
|
gdbsim_resume_inferior (struct inferior *inf, void *arg)
|
|
{
|
|
struct sim_inferior_data *sim_data
|
|
= get_sim_inferior_data (inf, SIM_INSTANCE_NOT_NEEDED);
|
|
struct resume_data *rd = (struct resume_data *) arg;
|
|
|
|
if (sim_data)
|
|
{
|
|
sim_data->resume_siggnal = rd->siggnal;
|
|
sim_data->resume_step = rd->step;
|
|
|
|
if (remote_debug)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
_("gdbsim_resume: pid %d, step %d, signal %d\n"),
|
|
inf->pid, rd->step, rd->siggnal);
|
|
}
|
|
|
|
/* When called from iterate_over_inferiors, a zero return causes the
|
|
iteration process to proceed until there are no more inferiors to
|
|
consider. */
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
gdbsim_target::resume (ptid_t ptid, int step, enum gdb_signal siggnal)
|
|
{
|
|
struct resume_data rd;
|
|
struct sim_inferior_data *sim_data
|
|
= get_sim_inferior_data_by_ptid (ptid, SIM_INSTANCE_NOT_NEEDED);
|
|
|
|
rd.siggnal = siggnal;
|
|
rd.step = step;
|
|
|
|
/* We don't access any sim_data members within this function.
|
|
What's of interest is whether or not the call to
|
|
get_sim_inferior_data_by_ptid(), above, is able to obtain a
|
|
non-NULL pointer. If it managed to obtain a non-NULL pointer, we
|
|
know we have a single inferior to consider. If it's NULL, we
|
|
either have multiple inferiors to resume or an error condition. */
|
|
|
|
if (sim_data)
|
|
gdbsim_resume_inferior (find_inferior_ptid (ptid), &rd);
|
|
else if (ptid_equal (ptid, minus_one_ptid))
|
|
iterate_over_inferiors (gdbsim_resume_inferior, &rd);
|
|
else
|
|
error (_("The program is not being run."));
|
|
}
|
|
|
|
/* Notify the simulator of an asynchronous request to interrupt.
|
|
|
|
The simulator shall ensure that the interrupt request is eventually
|
|
delivered to the simulator. If the call is made while the
|
|
simulator is not running then the interrupt request is processed when
|
|
the simulator is next resumed.
|
|
|
|
For simulators that do not support this operation, just abort. */
|
|
|
|
static int
|
|
gdbsim_interrupt_inferior (struct inferior *inf, void *arg)
|
|
{
|
|
struct sim_inferior_data *sim_data
|
|
= get_sim_inferior_data (inf, SIM_INSTANCE_NEEDED);
|
|
|
|
if (sim_data)
|
|
{
|
|
if (!sim_stop (sim_data->gdbsim_desc))
|
|
{
|
|
quit ();
|
|
}
|
|
}
|
|
|
|
/* When called from iterate_over_inferiors, a zero return causes the
|
|
iteration process to proceed until there are no more inferiors to
|
|
consider. */
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
gdbsim_target::interrupt ()
|
|
{
|
|
iterate_over_inferiors (gdbsim_interrupt_inferior, NULL);
|
|
}
|
|
|
|
/* GDB version of os_poll_quit callback.
|
|
Taken from gdb/util.c - should be in a library. */
|
|
|
|
static int
|
|
gdb_os_poll_quit (host_callback *p)
|
|
{
|
|
if (deprecated_ui_loop_hook != NULL)
|
|
deprecated_ui_loop_hook (0);
|
|
|
|
if (check_quit_flag ()) /* gdb's idea of quit */
|
|
return 1;
|
|
return 0;
|
|
}
|
|
|
|
/* Wait for inferior process to do something. Return pid of child,
|
|
or -1 in case of error; store status through argument pointer STATUS,
|
|
just as `wait' would. */
|
|
|
|
static void
|
|
gdbsim_cntrl_c (int signo)
|
|
{
|
|
gdbsim_ops.interrupt ();
|
|
}
|
|
|
|
ptid_t
|
|
gdbsim_target::wait (ptid_t ptid, struct target_waitstatus *status, int options)
|
|
{
|
|
struct sim_inferior_data *sim_data;
|
|
static sighandler_t prev_sigint;
|
|
int sigrc = 0;
|
|
enum sim_stop reason = sim_running;
|
|
|
|
/* This target isn't able to (yet) resume more than one inferior at a time.
|
|
When ptid is minus_one_ptid, just use the current inferior. If we're
|
|
given an explicit pid, we'll try to find it and use that instead. */
|
|
if (ptid_equal (ptid, minus_one_ptid))
|
|
sim_data = get_sim_inferior_data (current_inferior (),
|
|
SIM_INSTANCE_NEEDED);
|
|
else
|
|
{
|
|
sim_data = get_sim_inferior_data_by_ptid (ptid, SIM_INSTANCE_NEEDED);
|
|
if (sim_data == NULL)
|
|
error (_("Unable to wait for pid %d. Inferior not found."),
|
|
ptid_get_pid (ptid));
|
|
inferior_ptid = ptid;
|
|
}
|
|
|
|
if (remote_debug)
|
|
fprintf_unfiltered (gdb_stdlog, "gdbsim_wait\n");
|
|
|
|
#if defined (HAVE_SIGACTION) && defined (SA_RESTART)
|
|
{
|
|
struct sigaction sa, osa;
|
|
sa.sa_handler = gdbsim_cntrl_c;
|
|
sigemptyset (&sa.sa_mask);
|
|
sa.sa_flags = 0;
|
|
sigaction (SIGINT, &sa, &osa);
|
|
prev_sigint = osa.sa_handler;
|
|
}
|
|
#else
|
|
prev_sigint = signal (SIGINT, gdbsim_cntrl_c);
|
|
#endif
|
|
sim_resume (sim_data->gdbsim_desc, sim_data->resume_step,
|
|
sim_data->resume_siggnal);
|
|
|
|
signal (SIGINT, prev_sigint);
|
|
sim_data->resume_step = 0;
|
|
|
|
sim_stop_reason (sim_data->gdbsim_desc, &reason, &sigrc);
|
|
|
|
switch (reason)
|
|
{
|
|
case sim_exited:
|
|
status->kind = TARGET_WAITKIND_EXITED;
|
|
status->value.integer = sigrc;
|
|
break;
|
|
case sim_stopped:
|
|
switch (sigrc)
|
|
{
|
|
case GDB_SIGNAL_ABRT:
|
|
quit ();
|
|
break;
|
|
case GDB_SIGNAL_INT:
|
|
case GDB_SIGNAL_TRAP:
|
|
default:
|
|
status->kind = TARGET_WAITKIND_STOPPED;
|
|
status->value.sig = (enum gdb_signal) sigrc;
|
|
break;
|
|
}
|
|
break;
|
|
case sim_signalled:
|
|
status->kind = TARGET_WAITKIND_SIGNALLED;
|
|
status->value.sig = (enum gdb_signal) sigrc;
|
|
break;
|
|
case sim_running:
|
|
case sim_polling:
|
|
/* FIXME: Is this correct? */
|
|
break;
|
|
}
|
|
|
|
return inferior_ptid;
|
|
}
|
|
|
|
/* Get ready to modify the registers array. On machines which store
|
|
individual registers, this doesn't need to do anything. On machines
|
|
which store all the registers in one fell swoop, this makes sure
|
|
that registers contains all the registers from the program being
|
|
debugged. */
|
|
|
|
void
|
|
gdbsim_target::prepare_to_store (struct regcache *regcache)
|
|
{
|
|
/* Do nothing, since we can store individual regs. */
|
|
}
|
|
|
|
/* Helper for gdbsim_xfer_partial that handles memory transfers.
|
|
Arguments are like target_xfer_partial. */
|
|
|
|
static enum target_xfer_status
|
|
gdbsim_xfer_memory (struct target_ops *target,
|
|
gdb_byte *readbuf, const gdb_byte *writebuf,
|
|
ULONGEST memaddr, ULONGEST len, ULONGEST *xfered_len)
|
|
{
|
|
struct sim_inferior_data *sim_data
|
|
= get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NOT_NEEDED);
|
|
int l;
|
|
|
|
/* If this target doesn't have memory yet, return 0 causing the
|
|
request to be passed to a lower target, hopefully an exec
|
|
file. */
|
|
if (!target->has_memory ())
|
|
return TARGET_XFER_EOF;
|
|
|
|
if (!sim_data->program_loaded)
|
|
error (_("No program loaded."));
|
|
|
|
/* Note that we obtained the sim_data pointer above using
|
|
SIM_INSTANCE_NOT_NEEDED. We do this so that we don't needlessly
|
|
allocate a sim instance prior to loading a program. If we
|
|
get to this point in the code though, gdbsim_desc should be
|
|
non-NULL. (Note that a sim instance is needed in order to load
|
|
the program...) */
|
|
gdb_assert (sim_data->gdbsim_desc != NULL);
|
|
|
|
if (remote_debug)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"gdbsim_xfer_memory: readbuf %s, writebuf %s, "
|
|
"memaddr %s, len %s\n",
|
|
host_address_to_string (readbuf),
|
|
host_address_to_string (writebuf),
|
|
paddress (target_gdbarch (), memaddr),
|
|
pulongest (len));
|
|
|
|
if (writebuf)
|
|
{
|
|
if (remote_debug && len > 0)
|
|
dump_mem (writebuf, len);
|
|
l = sim_write (sim_data->gdbsim_desc, memaddr, writebuf, len);
|
|
}
|
|
else
|
|
{
|
|
l = sim_read (sim_data->gdbsim_desc, memaddr, readbuf, len);
|
|
if (remote_debug && len > 0)
|
|
dump_mem (readbuf, len);
|
|
}
|
|
if (l > 0)
|
|
{
|
|
*xfered_len = (ULONGEST) l;
|
|
return TARGET_XFER_OK;
|
|
}
|
|
else if (l == 0)
|
|
return TARGET_XFER_EOF;
|
|
else
|
|
return TARGET_XFER_E_IO;
|
|
}
|
|
|
|
/* Target to_xfer_partial implementation. */
|
|
|
|
enum target_xfer_status
|
|
gdbsim_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 gdbsim_xfer_memory (this, readbuf, writebuf, offset, len,
|
|
xfered_len);
|
|
|
|
default:
|
|
return TARGET_XFER_E_IO;
|
|
}
|
|
}
|
|
|
|
void
|
|
gdbsim_target::files_info ()
|
|
{
|
|
struct sim_inferior_data *sim_data
|
|
= get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NEEDED);
|
|
const char *file = "nothing";
|
|
|
|
if (exec_bfd)
|
|
file = bfd_get_filename (exec_bfd);
|
|
|
|
if (remote_debug)
|
|
fprintf_unfiltered (gdb_stdlog, "gdbsim_files_info: file \"%s\"\n", file);
|
|
|
|
if (exec_bfd)
|
|
{
|
|
fprintf_unfiltered (gdb_stdlog, "\tAttached to %s running program %s\n",
|
|
target_shortname, file);
|
|
sim_info (sim_data->gdbsim_desc, 0);
|
|
}
|
|
}
|
|
|
|
/* Clear the simulator's notion of what the break points are. */
|
|
|
|
void
|
|
gdbsim_target::mourn_inferior ()
|
|
{
|
|
struct sim_inferior_data *sim_data
|
|
= get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NOT_NEEDED);
|
|
|
|
if (remote_debug)
|
|
fprintf_unfiltered (gdb_stdlog, "gdbsim_mourn_inferior:\n");
|
|
|
|
remove_breakpoints ();
|
|
generic_mourn_inferior ();
|
|
delete_thread_silent (sim_data->remote_sim_ptid);
|
|
}
|
|
|
|
/* Pass the command argument through to the simulator verbatim. The
|
|
simulator must do any command interpretation work. */
|
|
|
|
void
|
|
simulator_command (const char *args, int from_tty)
|
|
{
|
|
struct sim_inferior_data *sim_data;
|
|
|
|
/* We use inferior_data() instead of get_sim_inferior_data() here in
|
|
order to avoid attaching a sim_inferior_data struct to an
|
|
inferior unnecessarily. The reason we take such care here is due
|
|
to the fact that this function, simulator_command(), may be called
|
|
even when the sim target is not active. If we were to use
|
|
get_sim_inferior_data() here, it is possible that this call would
|
|
be made either prior to gdbsim_open() or after gdbsim_close(),
|
|
thus allocating memory that would not be garbage collected until
|
|
the ultimate destruction of the associated inferior. */
|
|
|
|
sim_data = ((struct sim_inferior_data *)
|
|
inferior_data (current_inferior (), sim_inferior_data_key));
|
|
if (sim_data == NULL || sim_data->gdbsim_desc == NULL)
|
|
{
|
|
|
|
/* PREVIOUSLY: The user may give a command before the simulator
|
|
is opened. [...] (??? assuming of course one wishes to
|
|
continue to allow commands to be sent to unopened simulators,
|
|
which isn't entirely unreasonable). */
|
|
|
|
/* The simulator is a builtin abstraction of a remote target.
|
|
Consistent with that model, access to the simulator, via sim
|
|
commands, is restricted to the period when the channel to the
|
|
simulator is open. */
|
|
|
|
error (_("Not connected to the simulator target"));
|
|
}
|
|
|
|
sim_do_command (sim_data->gdbsim_desc, args);
|
|
|
|
/* Invalidate the register cache, in case the simulator command does
|
|
something funny. */
|
|
registers_changed ();
|
|
}
|
|
|
|
static void
|
|
sim_command_completer (struct cmd_list_element *ignore,
|
|
completion_tracker &tracker,
|
|
const char *text, const char *word)
|
|
{
|
|
struct sim_inferior_data *sim_data;
|
|
|
|
sim_data = ((struct sim_inferior_data *)
|
|
inferior_data (current_inferior (), sim_inferior_data_key));
|
|
if (sim_data == NULL || sim_data->gdbsim_desc == NULL)
|
|
return;
|
|
|
|
/* sim_complete_command returns a NULL-terminated malloc'ed array of
|
|
malloc'ed strings. */
|
|
struct sim_completions_deleter
|
|
{
|
|
void operator() (char **ptr) const
|
|
{
|
|
for (size_t i = 0; ptr[i] != NULL; i++)
|
|
xfree (ptr[i]);
|
|
xfree (ptr);
|
|
}
|
|
};
|
|
|
|
std::unique_ptr<char *[], sim_completions_deleter> sim_completions
|
|
(sim_complete_command (sim_data->gdbsim_desc, text, word));
|
|
if (sim_completions == NULL)
|
|
return;
|
|
|
|
/* Count the elements and add completions from tail to head because
|
|
below we'll swap elements out of the array in case add_completion
|
|
throws and the deleter deletes until it finds a NULL element. */
|
|
size_t count = 0;
|
|
while (sim_completions[count] != NULL)
|
|
count++;
|
|
|
|
for (size_t i = count; i > 0; i--)
|
|
{
|
|
gdb::unique_xmalloc_ptr<char> match (sim_completions[i - 1]);
|
|
sim_completions[i - 1] = NULL;
|
|
tracker.add_completion (std::move (match));
|
|
}
|
|
}
|
|
|
|
/* Check to see if a thread is still alive. */
|
|
|
|
int
|
|
gdbsim_target::thread_alive (ptid_t ptid)
|
|
{
|
|
struct sim_inferior_data *sim_data
|
|
= get_sim_inferior_data_by_ptid (ptid, SIM_INSTANCE_NOT_NEEDED);
|
|
|
|
if (sim_data == NULL)
|
|
return 0;
|
|
|
|
if (ptid_equal (ptid, sim_data->remote_sim_ptid))
|
|
/* The simulators' task is always alive. */
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Convert a thread ID to a string. Returns the string in a static
|
|
buffer. */
|
|
|
|
const char *
|
|
gdbsim_target::pid_to_str (ptid_t ptid)
|
|
{
|
|
return normal_pid_to_str (ptid);
|
|
}
|
|
|
|
/* Simulator memory may be accessed after the program has been loaded. */
|
|
|
|
int
|
|
gdbsim_target::has_all_memory ()
|
|
{
|
|
struct sim_inferior_data *sim_data
|
|
= get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NOT_NEEDED);
|
|
|
|
if (!sim_data->program_loaded)
|
|
return 0;
|
|
|
|
return 1;
|
|
}
|
|
|
|
int
|
|
gdbsim_target::has_memory ()
|
|
{
|
|
struct sim_inferior_data *sim_data
|
|
= get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NOT_NEEDED);
|
|
|
|
if (!sim_data->program_loaded)
|
|
return 0;
|
|
|
|
return 1;
|
|
}
|
|
|
|
void
|
|
_initialize_remote_sim (void)
|
|
{
|
|
struct cmd_list_element *c;
|
|
|
|
add_target (&gdbsim_ops);
|
|
|
|
c = add_com ("sim", class_obscure, simulator_command,
|
|
_("Send a command to the simulator."));
|
|
set_cmd_completer (c, sim_command_completer);
|
|
|
|
sim_inferior_data_key
|
|
= register_inferior_data_with_cleanup (NULL, sim_inferior_data_cleanup);
|
|
}
|