forked from Imagelibrary/binutils-gdb
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.
2733 lines
71 KiB
C
2733 lines
71 KiB
C
/* MI Command Set.
|
||
|
||
Copyright (C) 2000-2018 Free Software Foundation, Inc.
|
||
|
||
Contributed by Cygnus Solutions (a Red Hat company).
|
||
|
||
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 "arch-utils.h"
|
||
#include "target.h"
|
||
#include "inferior.h"
|
||
#include "infrun.h"
|
||
#include "top.h"
|
||
#include "gdbthread.h"
|
||
#include "mi-cmds.h"
|
||
#include "mi-parse.h"
|
||
#include "mi-getopt.h"
|
||
#include "mi-console.h"
|
||
#include "ui-out.h"
|
||
#include "mi-out.h"
|
||
#include "interps.h"
|
||
#include "event-loop.h"
|
||
#include "event-top.h"
|
||
#include "gdbcore.h" /* For write_memory(). */
|
||
#include "value.h"
|
||
#include "regcache.h"
|
||
#include "frame.h"
|
||
#include "mi-main.h"
|
||
#include "mi-common.h"
|
||
#include "language.h"
|
||
#include "valprint.h"
|
||
#include "inferior.h"
|
||
#include "osdata.h"
|
||
#include "common/gdb_splay_tree.h"
|
||
#include "tracepoint.h"
|
||
#include "ctf.h"
|
||
#include "ada-lang.h"
|
||
#include "linespec.h"
|
||
#include "extension.h"
|
||
#include "gdbcmd.h"
|
||
#include "observable.h"
|
||
#include "common/gdb_optional.h"
|
||
#include "common/byte-vector.h"
|
||
|
||
#include <ctype.h>
|
||
#include "run-time-clock.h"
|
||
#include <chrono>
|
||
#include "progspace-and-thread.h"
|
||
#include "common/rsp-low.h"
|
||
#include <algorithm>
|
||
#include <set>
|
||
#include <map>
|
||
|
||
enum
|
||
{
|
||
FROM_TTY = 0
|
||
};
|
||
|
||
int mi_debug_p;
|
||
|
||
/* This is used to pass the current command timestamp down to
|
||
continuation routines. */
|
||
static struct mi_timestamp *current_command_ts;
|
||
|
||
static int do_timings = 0;
|
||
|
||
char *current_token;
|
||
/* Few commands would like to know if options like --thread-group were
|
||
explicitly specified. This variable keeps the current parsed
|
||
command including all option, and make it possible. */
|
||
static struct mi_parse *current_context;
|
||
|
||
int running_result_record_printed = 1;
|
||
|
||
/* Flag indicating that the target has proceeded since the last
|
||
command was issued. */
|
||
int mi_proceeded;
|
||
|
||
static void mi_cmd_execute (struct mi_parse *parse);
|
||
|
||
static void mi_execute_cli_command (const char *cmd, int args_p,
|
||
const char *args);
|
||
static void mi_execute_async_cli_command (const char *cli_command,
|
||
char **argv, int argc);
|
||
static bool register_changed_p (int regnum, readonly_detached_regcache *,
|
||
readonly_detached_regcache *);
|
||
static void output_register (struct frame_info *, int regnum, int format,
|
||
int skip_unavailable);
|
||
|
||
/* Controls whether the frontend wants MI in async mode. */
|
||
static int mi_async = 0;
|
||
|
||
/* The set command writes to this variable. If the inferior is
|
||
executing, mi_async is *not* updated. */
|
||
static int mi_async_1 = 0;
|
||
|
||
static void
|
||
set_mi_async_command (const char *args, int from_tty,
|
||
struct cmd_list_element *c)
|
||
{
|
||
if (have_live_inferiors ())
|
||
{
|
||
mi_async_1 = mi_async;
|
||
error (_("Cannot change this setting while the inferior is running."));
|
||
}
|
||
|
||
mi_async = mi_async_1;
|
||
}
|
||
|
||
static void
|
||
show_mi_async_command (struct ui_file *file, int from_tty,
|
||
struct cmd_list_element *c,
|
||
const char *value)
|
||
{
|
||
fprintf_filtered (file,
|
||
_("Whether MI is in asynchronous mode is %s.\n"),
|
||
value);
|
||
}
|
||
|
||
/* A wrapper for target_can_async_p that takes the MI setting into
|
||
account. */
|
||
|
||
int
|
||
mi_async_p (void)
|
||
{
|
||
return mi_async && target_can_async_p ();
|
||
}
|
||
|
||
/* Command implementations. FIXME: Is this libgdb? No. This is the MI
|
||
layer that calls libgdb. Any operation used in the below should be
|
||
formalized. */
|
||
|
||
static void timestamp (struct mi_timestamp *tv);
|
||
|
||
static void print_diff (struct ui_file *file, struct mi_timestamp *start,
|
||
struct mi_timestamp *end);
|
||
|
||
void
|
||
mi_cmd_gdb_exit (const char *command, char **argv, int argc)
|
||
{
|
||
struct mi_interp *mi = (struct mi_interp *) current_interpreter ();
|
||
|
||
/* We have to print everything right here because we never return. */
|
||
if (current_token)
|
||
fputs_unfiltered (current_token, mi->raw_stdout);
|
||
fputs_unfiltered ("^exit\n", mi->raw_stdout);
|
||
mi_out_put (current_uiout, mi->raw_stdout);
|
||
gdb_flush (mi->raw_stdout);
|
||
/* FIXME: The function called is not yet a formal libgdb function. */
|
||
quit_force (NULL, FROM_TTY);
|
||
}
|
||
|
||
void
|
||
mi_cmd_exec_next (const char *command, char **argv, int argc)
|
||
{
|
||
/* FIXME: Should call a libgdb function, not a cli wrapper. */
|
||
if (argc > 0 && strcmp(argv[0], "--reverse") == 0)
|
||
mi_execute_async_cli_command ("reverse-next", argv + 1, argc - 1);
|
||
else
|
||
mi_execute_async_cli_command ("next", argv, argc);
|
||
}
|
||
|
||
void
|
||
mi_cmd_exec_next_instruction (const char *command, char **argv, int argc)
|
||
{
|
||
/* FIXME: Should call a libgdb function, not a cli wrapper. */
|
||
if (argc > 0 && strcmp(argv[0], "--reverse") == 0)
|
||
mi_execute_async_cli_command ("reverse-nexti", argv + 1, argc - 1);
|
||
else
|
||
mi_execute_async_cli_command ("nexti", argv, argc);
|
||
}
|
||
|
||
void
|
||
mi_cmd_exec_step (const char *command, char **argv, int argc)
|
||
{
|
||
/* FIXME: Should call a libgdb function, not a cli wrapper. */
|
||
if (argc > 0 && strcmp(argv[0], "--reverse") == 0)
|
||
mi_execute_async_cli_command ("reverse-step", argv + 1, argc - 1);
|
||
else
|
||
mi_execute_async_cli_command ("step", argv, argc);
|
||
}
|
||
|
||
void
|
||
mi_cmd_exec_step_instruction (const char *command, char **argv, int argc)
|
||
{
|
||
/* FIXME: Should call a libgdb function, not a cli wrapper. */
|
||
if (argc > 0 && strcmp(argv[0], "--reverse") == 0)
|
||
mi_execute_async_cli_command ("reverse-stepi", argv + 1, argc - 1);
|
||
else
|
||
mi_execute_async_cli_command ("stepi", argv, argc);
|
||
}
|
||
|
||
void
|
||
mi_cmd_exec_finish (const char *command, char **argv, int argc)
|
||
{
|
||
/* FIXME: Should call a libgdb function, not a cli wrapper. */
|
||
if (argc > 0 && strcmp(argv[0], "--reverse") == 0)
|
||
mi_execute_async_cli_command ("reverse-finish", argv + 1, argc - 1);
|
||
else
|
||
mi_execute_async_cli_command ("finish", argv, argc);
|
||
}
|
||
|
||
void
|
||
mi_cmd_exec_return (const char *command, char **argv, int argc)
|
||
{
|
||
/* This command doesn't really execute the target, it just pops the
|
||
specified number of frames. */
|
||
if (argc)
|
||
/* Call return_command with from_tty argument equal to 0 so as to
|
||
avoid being queried. */
|
||
return_command (*argv, 0);
|
||
else
|
||
/* Call return_command with from_tty argument equal to 0 so as to
|
||
avoid being queried. */
|
||
return_command (NULL, 0);
|
||
|
||
/* Because we have called return_command with from_tty = 0, we need
|
||
to print the frame here. */
|
||
print_stack_frame (get_selected_frame (NULL), 1, LOC_AND_ADDRESS, 1);
|
||
}
|
||
|
||
void
|
||
mi_cmd_exec_jump (const char *args, char **argv, int argc)
|
||
{
|
||
/* FIXME: Should call a libgdb function, not a cli wrapper. */
|
||
mi_execute_async_cli_command ("jump", argv, argc);
|
||
}
|
||
|
||
static void
|
||
proceed_thread (struct thread_info *thread, int pid)
|
||
{
|
||
if (!is_stopped (thread->ptid))
|
||
return;
|
||
|
||
if (pid != 0 && ptid_get_pid (thread->ptid) != pid)
|
||
return;
|
||
|
||
switch_to_thread (thread->ptid);
|
||
clear_proceed_status (0);
|
||
proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT);
|
||
}
|
||
|
||
static int
|
||
proceed_thread_callback (struct thread_info *thread, void *arg)
|
||
{
|
||
int pid = *(int *)arg;
|
||
|
||
proceed_thread (thread, pid);
|
||
return 0;
|
||
}
|
||
|
||
static void
|
||
exec_continue (char **argv, int argc)
|
||
{
|
||
prepare_execution_command (target_stack, mi_async_p ());
|
||
|
||
if (non_stop)
|
||
{
|
||
/* In non-stop mode, 'resume' always resumes a single thread.
|
||
Therefore, to resume all threads of the current inferior, or
|
||
all threads in all inferiors, we need to iterate over
|
||
threads.
|
||
|
||
See comment on infcmd.c:proceed_thread_callback for rationale. */
|
||
if (current_context->all || current_context->thread_group != -1)
|
||
{
|
||
scoped_restore_current_thread restore_thread;
|
||
int pid = 0;
|
||
|
||
if (!current_context->all)
|
||
{
|
||
struct inferior *inf
|
||
= find_inferior_id (current_context->thread_group);
|
||
|
||
pid = inf->pid;
|
||
}
|
||
iterate_over_threads (proceed_thread_callback, &pid);
|
||
}
|
||
else
|
||
{
|
||
continue_1 (0);
|
||
}
|
||
}
|
||
else
|
||
{
|
||
scoped_restore save_multi = make_scoped_restore (&sched_multi);
|
||
|
||
if (current_context->all)
|
||
{
|
||
sched_multi = 1;
|
||
continue_1 (0);
|
||
}
|
||
else
|
||
{
|
||
/* In all-stop mode, -exec-continue traditionally resumed
|
||
either all threads, or one thread, depending on the
|
||
'scheduler-locking' variable. Let's continue to do the
|
||
same. */
|
||
continue_1 (1);
|
||
}
|
||
}
|
||
}
|
||
|
||
static void
|
||
exec_reverse_continue (char **argv, int argc)
|
||
{
|
||
enum exec_direction_kind dir = execution_direction;
|
||
|
||
if (dir == EXEC_REVERSE)
|
||
error (_("Already in reverse mode."));
|
||
|
||
if (!target_can_execute_reverse)
|
||
error (_("Target %s does not support this command."), target_shortname);
|
||
|
||
scoped_restore save_exec_dir = make_scoped_restore (&execution_direction,
|
||
EXEC_REVERSE);
|
||
exec_continue (argv, argc);
|
||
}
|
||
|
||
void
|
||
mi_cmd_exec_continue (const char *command, char **argv, int argc)
|
||
{
|
||
if (argc > 0 && strcmp (argv[0], "--reverse") == 0)
|
||
exec_reverse_continue (argv + 1, argc - 1);
|
||
else
|
||
exec_continue (argv, argc);
|
||
}
|
||
|
||
static int
|
||
interrupt_thread_callback (struct thread_info *thread, void *arg)
|
||
{
|
||
int pid = *(int *)arg;
|
||
|
||
if (!is_running (thread->ptid))
|
||
return 0;
|
||
|
||
if (ptid_get_pid (thread->ptid) != pid)
|
||
return 0;
|
||
|
||
target_stop (thread->ptid);
|
||
return 0;
|
||
}
|
||
|
||
/* Interrupt the execution of the target. Note how we must play
|
||
around with the token variables, in order to display the current
|
||
token in the result of the interrupt command, and the previous
|
||
execution token when the target finally stops. See comments in
|
||
mi_cmd_execute. */
|
||
|
||
void
|
||
mi_cmd_exec_interrupt (const char *command, char **argv, int argc)
|
||
{
|
||
/* In all-stop mode, everything stops, so we don't need to try
|
||
anything specific. */
|
||
if (!non_stop)
|
||
{
|
||
interrupt_target_1 (0);
|
||
return;
|
||
}
|
||
|
||
if (current_context->all)
|
||
{
|
||
/* This will interrupt all threads in all inferiors. */
|
||
interrupt_target_1 (1);
|
||
}
|
||
else if (current_context->thread_group != -1)
|
||
{
|
||
struct inferior *inf = find_inferior_id (current_context->thread_group);
|
||
|
||
iterate_over_threads (interrupt_thread_callback, &inf->pid);
|
||
}
|
||
else
|
||
{
|
||
/* Interrupt just the current thread -- either explicitly
|
||
specified via --thread or whatever was current before
|
||
MI command was sent. */
|
||
interrupt_target_1 (0);
|
||
}
|
||
}
|
||
|
||
/* Callback for iterate_over_inferiors which starts the execution
|
||
of the given inferior.
|
||
|
||
ARG is a pointer to an integer whose value, if non-zero, indicates
|
||
that the program should be stopped when reaching the main subprogram
|
||
(similar to what the CLI "start" command does). */
|
||
|
||
static int
|
||
run_one_inferior (struct inferior *inf, void *arg)
|
||
{
|
||
int start_p = *(int *) arg;
|
||
const char *run_cmd = start_p ? "start" : "run";
|
||
struct target_ops *run_target = find_run_target ();
|
||
int async_p = mi_async && run_target->can_async_p ();
|
||
|
||
if (inf->pid != 0)
|
||
{
|
||
if (inf->pid != ptid_get_pid (inferior_ptid))
|
||
{
|
||
struct thread_info *tp;
|
||
|
||
tp = any_thread_of_process (inf->pid);
|
||
if (!tp)
|
||
error (_("Inferior has no threads."));
|
||
|
||
switch_to_thread (tp->ptid);
|
||
}
|
||
}
|
||
else
|
||
{
|
||
set_current_inferior (inf);
|
||
switch_to_thread (null_ptid);
|
||
set_current_program_space (inf->pspace);
|
||
}
|
||
mi_execute_cli_command (run_cmd, async_p,
|
||
async_p ? "&" : NULL);
|
||
return 0;
|
||
}
|
||
|
||
void
|
||
mi_cmd_exec_run (const char *command, char **argv, int argc)
|
||
{
|
||
int start_p = 0;
|
||
|
||
/* Parse the command options. */
|
||
enum opt
|
||
{
|
||
START_OPT,
|
||
};
|
||
static const struct mi_opt opts[] =
|
||
{
|
||
{"-start", START_OPT, 0},
|
||
{NULL, 0, 0},
|
||
};
|
||
|
||
int oind = 0;
|
||
char *oarg;
|
||
|
||
while (1)
|
||
{
|
||
int opt = mi_getopt ("-exec-run", argc, argv, opts, &oind, &oarg);
|
||
|
||
if (opt < 0)
|
||
break;
|
||
switch ((enum opt) opt)
|
||
{
|
||
case START_OPT:
|
||
start_p = 1;
|
||
break;
|
||
}
|
||
}
|
||
|
||
/* This command does not accept any argument. Make sure the user
|
||
did not provide any. */
|
||
if (oind != argc)
|
||
error (_("Invalid argument: %s"), argv[oind]);
|
||
|
||
if (current_context->all)
|
||
{
|
||
scoped_restore_current_pspace_and_thread restore_pspace_thread;
|
||
|
||
iterate_over_inferiors (run_one_inferior, &start_p);
|
||
}
|
||
else
|
||
{
|
||
const char *run_cmd = start_p ? "start" : "run";
|
||
struct target_ops *run_target = find_run_target ();
|
||
int async_p = mi_async && run_target->can_async_p ();
|
||
|
||
mi_execute_cli_command (run_cmd, async_p,
|
||
async_p ? "&" : NULL);
|
||
}
|
||
}
|
||
|
||
|
||
static int
|
||
find_thread_of_process (struct thread_info *ti, void *p)
|
||
{
|
||
int pid = *(int *)p;
|
||
|
||
if (ptid_get_pid (ti->ptid) == pid && !is_exited (ti->ptid))
|
||
return 1;
|
||
|
||
return 0;
|
||
}
|
||
|
||
void
|
||
mi_cmd_target_detach (const char *command, char **argv, int argc)
|
||
{
|
||
if (argc != 0 && argc != 1)
|
||
error (_("Usage: -target-detach [pid | thread-group]"));
|
||
|
||
if (argc == 1)
|
||
{
|
||
struct thread_info *tp;
|
||
char *end = argv[0];
|
||
int pid;
|
||
|
||
/* First see if we are dealing with a thread-group id. */
|
||
if (*argv[0] == 'i')
|
||
{
|
||
struct inferior *inf;
|
||
int id = strtoul (argv[0] + 1, &end, 0);
|
||
|
||
if (*end != '\0')
|
||
error (_("Invalid syntax of thread-group id '%s'"), argv[0]);
|
||
|
||
inf = find_inferior_id (id);
|
||
if (!inf)
|
||
error (_("Non-existent thread-group id '%d'"), id);
|
||
|
||
pid = inf->pid;
|
||
}
|
||
else
|
||
{
|
||
/* We must be dealing with a pid. */
|
||
pid = strtol (argv[0], &end, 10);
|
||
|
||
if (*end != '\0')
|
||
error (_("Invalid identifier '%s'"), argv[0]);
|
||
}
|
||
|
||
/* Pick any thread in the desired process. Current
|
||
target_detach detaches from the parent of inferior_ptid. */
|
||
tp = iterate_over_threads (find_thread_of_process, &pid);
|
||
if (!tp)
|
||
error (_("Thread group is empty"));
|
||
|
||
switch_to_thread (tp->ptid);
|
||
}
|
||
|
||
detach_command (NULL, 0);
|
||
}
|
||
|
||
void
|
||
mi_cmd_target_flash_erase (const char *command, char **argv, int argc)
|
||
{
|
||
flash_erase_command (NULL, 0);
|
||
}
|
||
|
||
void
|
||
mi_cmd_thread_select (const char *command, char **argv, int argc)
|
||
{
|
||
if (argc != 1)
|
||
error (_("-thread-select: USAGE: threadnum."));
|
||
|
||
int num = value_as_long (parse_and_eval (argv[0]));
|
||
thread_info *thr = find_thread_global_id (num);
|
||
if (thr == NULL)
|
||
error (_("Thread ID %d not known."), num);
|
||
|
||
ptid_t previous_ptid = inferior_ptid;
|
||
|
||
thread_select (argv[0], thr);
|
||
|
||
print_selected_thread_frame (current_uiout,
|
||
USER_SELECTED_THREAD | USER_SELECTED_FRAME);
|
||
|
||
/* Notify if the thread has effectively changed. */
|
||
if (!ptid_equal (inferior_ptid, previous_ptid))
|
||
{
|
||
gdb::observers::user_selected_context_changed.notify
|
||
(USER_SELECTED_THREAD | USER_SELECTED_FRAME);
|
||
}
|
||
}
|
||
|
||
void
|
||
mi_cmd_thread_list_ids (const char *command, char **argv, int argc)
|
||
{
|
||
if (argc != 0)
|
||
error (_("-thread-list-ids: No arguments required."));
|
||
|
||
int num = 0;
|
||
int current_thread = -1;
|
||
|
||
update_thread_list ();
|
||
|
||
{
|
||
ui_out_emit_tuple tuple_emitter (current_uiout, "thread-ids");
|
||
|
||
struct thread_info *tp;
|
||
ALL_NON_EXITED_THREADS (tp)
|
||
{
|
||
if (tp->ptid == inferior_ptid)
|
||
current_thread = tp->global_num;
|
||
|
||
num++;
|
||
current_uiout->field_int ("thread-id", tp->global_num);
|
||
}
|
||
}
|
||
|
||
if (current_thread != -1)
|
||
current_uiout->field_int ("current-thread-id", current_thread);
|
||
current_uiout->field_int ("number-of-threads", num);
|
||
}
|
||
|
||
void
|
||
mi_cmd_thread_info (const char *command, char **argv, int argc)
|
||
{
|
||
if (argc != 0 && argc != 1)
|
||
error (_("Invalid MI command"));
|
||
|
||
print_thread_info (current_uiout, argv[0], -1);
|
||
}
|
||
|
||
struct collect_cores_data
|
||
{
|
||
int pid;
|
||
std::set<int> cores;
|
||
};
|
||
|
||
static int
|
||
collect_cores (struct thread_info *ti, void *xdata)
|
||
{
|
||
struct collect_cores_data *data = (struct collect_cores_data *) xdata;
|
||
|
||
if (ptid_get_pid (ti->ptid) == data->pid)
|
||
{
|
||
int core = target_core_of_thread (ti->ptid);
|
||
|
||
if (core != -1)
|
||
data->cores.insert (core);
|
||
}
|
||
|
||
return 0;
|
||
}
|
||
|
||
struct print_one_inferior_data
|
||
{
|
||
int recurse;
|
||
const std::set<int> *inferiors;
|
||
};
|
||
|
||
static int
|
||
print_one_inferior (struct inferior *inferior, void *xdata)
|
||
{
|
||
struct print_one_inferior_data *top_data
|
||
= (struct print_one_inferior_data *) xdata;
|
||
struct ui_out *uiout = current_uiout;
|
||
|
||
if (top_data->inferiors->empty ()
|
||
|| (top_data->inferiors->find (inferior->pid)
|
||
!= top_data->inferiors->end ()))
|
||
{
|
||
struct collect_cores_data data;
|
||
ui_out_emit_tuple tuple_emitter (uiout, NULL);
|
||
|
||
uiout->field_fmt ("id", "i%d", inferior->num);
|
||
uiout->field_string ("type", "process");
|
||
if (inferior->has_exit_code)
|
||
uiout->field_string ("exit-code",
|
||
int_string (inferior->exit_code, 8, 0, 0, 1));
|
||
if (inferior->pid != 0)
|
||
uiout->field_int ("pid", inferior->pid);
|
||
|
||
if (inferior->pspace->pspace_exec_filename != NULL)
|
||
{
|
||
uiout->field_string ("executable",
|
||
inferior->pspace->pspace_exec_filename);
|
||
}
|
||
|
||
if (inferior->pid != 0)
|
||
{
|
||
data.pid = inferior->pid;
|
||
iterate_over_threads (collect_cores, &data);
|
||
}
|
||
|
||
if (!data.cores.empty ())
|
||
{
|
||
ui_out_emit_list list_emitter (uiout, "cores");
|
||
|
||
for (int b : data.cores)
|
||
uiout->field_int (NULL, b);
|
||
}
|
||
|
||
if (top_data->recurse)
|
||
print_thread_info (uiout, NULL, inferior->pid);
|
||
}
|
||
|
||
return 0;
|
||
}
|
||
|
||
/* Output a field named 'cores' with a list as the value. The
|
||
elements of the list are obtained by splitting 'cores' on
|
||
comma. */
|
||
|
||
static void
|
||
output_cores (struct ui_out *uiout, const char *field_name, const char *xcores)
|
||
{
|
||
ui_out_emit_list list_emitter (uiout, field_name);
|
||
gdb::unique_xmalloc_ptr<char> cores (xstrdup (xcores));
|
||
char *p = cores.get ();
|
||
|
||
for (p = strtok (p, ","); p; p = strtok (NULL, ","))
|
||
uiout->field_string (NULL, p);
|
||
}
|
||
|
||
static void
|
||
list_available_thread_groups (const std::set<int> &ids, int recurse)
|
||
{
|
||
struct ui_out *uiout = current_uiout;
|
||
|
||
/* This keeps a map from integer (pid) to vector of struct osdata_item.
|
||
The vector contains information about all threads for the given pid. */
|
||
std::map<int, std::vector<osdata_item>> tree;
|
||
|
||
/* get_osdata will throw if it cannot return data. */
|
||
std::unique_ptr<osdata> data = get_osdata ("processes");
|
||
|
||
if (recurse)
|
||
{
|
||
std::unique_ptr<osdata> threads = get_osdata ("threads");
|
||
|
||
for (const osdata_item &item : threads->items)
|
||
{
|
||
const std::string *pid = get_osdata_column (item, "pid");
|
||
int pid_i = strtoul (pid->c_str (), NULL, 0);
|
||
|
||
tree[pid_i].push_back (item);
|
||
}
|
||
}
|
||
|
||
ui_out_emit_list list_emitter (uiout, "groups");
|
||
|
||
for (const osdata_item &item : data->items)
|
||
{
|
||
const std::string *pid = get_osdata_column (item, "pid");
|
||
const std::string *cmd = get_osdata_column (item, "command");
|
||
const std::string *user = get_osdata_column (item, "user");
|
||
const std::string *cores = get_osdata_column (item, "cores");
|
||
|
||
int pid_i = strtoul (pid->c_str (), NULL, 0);
|
||
|
||
/* At present, the target will return all available processes
|
||
and if information about specific ones was required, we filter
|
||
undesired processes here. */
|
||
if (!ids.empty () && ids.find (pid_i) == ids.end ())
|
||
continue;
|
||
|
||
ui_out_emit_tuple tuple_emitter (uiout, NULL);
|
||
|
||
uiout->field_fmt ("id", "%s", pid->c_str ());
|
||
uiout->field_string ("type", "process");
|
||
if (cmd)
|
||
uiout->field_string ("description", cmd->c_str ());
|
||
if (user)
|
||
uiout->field_string ("user", user->c_str ());
|
||
if (cores)
|
||
output_cores (uiout, "cores", cores->c_str ());
|
||
|
||
if (recurse)
|
||
{
|
||
auto n = tree.find (pid_i);
|
||
if (n != tree.end ())
|
||
{
|
||
std::vector<osdata_item> &children = n->second;
|
||
|
||
ui_out_emit_list thread_list_emitter (uiout, "threads");
|
||
|
||
for (const osdata_item &child : children)
|
||
{
|
||
ui_out_emit_tuple tuple_emitter (uiout, NULL);
|
||
const std::string *tid = get_osdata_column (child, "tid");
|
||
const std::string *tcore = get_osdata_column (child, "core");
|
||
|
||
uiout->field_string ("id", tid->c_str ());
|
||
if (tcore)
|
||
uiout->field_string ("core", tcore->c_str ());
|
||
}
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
void
|
||
mi_cmd_list_thread_groups (const char *command, char **argv, int argc)
|
||
{
|
||
struct ui_out *uiout = current_uiout;
|
||
int available = 0;
|
||
int recurse = 0;
|
||
std::set<int> ids;
|
||
|
||
enum opt
|
||
{
|
||
AVAILABLE_OPT, RECURSE_OPT
|
||
};
|
||
static const struct mi_opt opts[] =
|
||
{
|
||
{"-available", AVAILABLE_OPT, 0},
|
||
{"-recurse", RECURSE_OPT, 1},
|
||
{ 0, 0, 0 }
|
||
};
|
||
|
||
int oind = 0;
|
||
char *oarg;
|
||
|
||
while (1)
|
||
{
|
||
int opt = mi_getopt ("-list-thread-groups", argc, argv, opts,
|
||
&oind, &oarg);
|
||
|
||
if (opt < 0)
|
||
break;
|
||
switch ((enum opt) opt)
|
||
{
|
||
case AVAILABLE_OPT:
|
||
available = 1;
|
||
break;
|
||
case RECURSE_OPT:
|
||
if (strcmp (oarg, "0") == 0)
|
||
;
|
||
else if (strcmp (oarg, "1") == 0)
|
||
recurse = 1;
|
||
else
|
||
error (_("only '0' and '1' are valid values "
|
||
"for the '--recurse' option"));
|
||
break;
|
||
}
|
||
}
|
||
|
||
for (; oind < argc; ++oind)
|
||
{
|
||
char *end;
|
||
int inf;
|
||
|
||
if (*(argv[oind]) != 'i')
|
||
error (_("invalid syntax of group id '%s'"), argv[oind]);
|
||
|
||
inf = strtoul (argv[oind] + 1, &end, 0);
|
||
|
||
if (*end != '\0')
|
||
error (_("invalid syntax of group id '%s'"), argv[oind]);
|
||
ids.insert (inf);
|
||
}
|
||
|
||
if (available)
|
||
{
|
||
list_available_thread_groups (ids, recurse);
|
||
}
|
||
else if (ids.size () == 1)
|
||
{
|
||
/* Local thread groups, single id. */
|
||
int id = *(ids.begin ());
|
||
struct inferior *inf = find_inferior_id (id);
|
||
|
||
if (!inf)
|
||
error (_("Non-existent thread group id '%d'"), id);
|
||
|
||
print_thread_info (uiout, NULL, inf->pid);
|
||
}
|
||
else
|
||
{
|
||
struct print_one_inferior_data data;
|
||
|
||
data.recurse = recurse;
|
||
data.inferiors = &ids;
|
||
|
||
/* Local thread groups. Either no explicit ids -- and we
|
||
print everything, or several explicit ids. In both cases,
|
||
we print more than one group, and have to use 'groups'
|
||
as the top-level element. */
|
||
ui_out_emit_list list_emitter (uiout, "groups");
|
||
update_thread_list ();
|
||
iterate_over_inferiors (print_one_inferior, &data);
|
||
}
|
||
}
|
||
|
||
void
|
||
mi_cmd_data_list_register_names (const char *command, char **argv, int argc)
|
||
{
|
||
struct gdbarch *gdbarch;
|
||
struct ui_out *uiout = current_uiout;
|
||
int regnum, numregs;
|
||
int i;
|
||
|
||
/* Note that the test for a valid register must include checking the
|
||
gdbarch_register_name because gdbarch_num_regs may be allocated
|
||
for the union of the register sets within a family of related
|
||
processors. In this case, some entries of gdbarch_register_name
|
||
will change depending upon the particular processor being
|
||
debugged. */
|
||
|
||
gdbarch = get_current_arch ();
|
||
numregs = gdbarch_num_regs (gdbarch) + gdbarch_num_pseudo_regs (gdbarch);
|
||
|
||
ui_out_emit_list list_emitter (uiout, "register-names");
|
||
|
||
if (argc == 0) /* No args, just do all the regs. */
|
||
{
|
||
for (regnum = 0;
|
||
regnum < numregs;
|
||
regnum++)
|
||
{
|
||
if (gdbarch_register_name (gdbarch, regnum) == NULL
|
||
|| *(gdbarch_register_name (gdbarch, regnum)) == '\0')
|
||
uiout->field_string (NULL, "");
|
||
else
|
||
uiout->field_string (NULL, gdbarch_register_name (gdbarch, regnum));
|
||
}
|
||
}
|
||
|
||
/* Else, list of register #s, just do listed regs. */
|
||
for (i = 0; i < argc; i++)
|
||
{
|
||
regnum = atoi (argv[i]);
|
||
if (regnum < 0 || regnum >= numregs)
|
||
error (_("bad register number"));
|
||
|
||
if (gdbarch_register_name (gdbarch, regnum) == NULL
|
||
|| *(gdbarch_register_name (gdbarch, regnum)) == '\0')
|
||
uiout->field_string (NULL, "");
|
||
else
|
||
uiout->field_string (NULL, gdbarch_register_name (gdbarch, regnum));
|
||
}
|
||
}
|
||
|
||
void
|
||
mi_cmd_data_list_changed_registers (const char *command, char **argv, int argc)
|
||
{
|
||
static std::unique_ptr<readonly_detached_regcache> this_regs;
|
||
struct ui_out *uiout = current_uiout;
|
||
std::unique_ptr<readonly_detached_regcache> prev_regs;
|
||
struct gdbarch *gdbarch;
|
||
int regnum, numregs;
|
||
int i;
|
||
|
||
/* The last time we visited this function, the current frame's
|
||
register contents were saved in THIS_REGS. Move THIS_REGS over
|
||
to PREV_REGS, and refresh THIS_REGS with the now-current register
|
||
contents. */
|
||
|
||
prev_regs = std::move (this_regs);
|
||
this_regs = frame_save_as_regcache (get_selected_frame (NULL));
|
||
|
||
/* Note that the test for a valid register must include checking the
|
||
gdbarch_register_name because gdbarch_num_regs may be allocated
|
||
for the union of the register sets within a family of related
|
||
processors. In this case, some entries of gdbarch_register_name
|
||
will change depending upon the particular processor being
|
||
debugged. */
|
||
|
||
gdbarch = this_regs->arch ();
|
||
numregs = gdbarch_num_regs (gdbarch) + gdbarch_num_pseudo_regs (gdbarch);
|
||
|
||
ui_out_emit_list list_emitter (uiout, "changed-registers");
|
||
|
||
if (argc == 0)
|
||
{
|
||
/* No args, just do all the regs. */
|
||
for (regnum = 0;
|
||
regnum < numregs;
|
||
regnum++)
|
||
{
|
||
if (gdbarch_register_name (gdbarch, regnum) == NULL
|
||
|| *(gdbarch_register_name (gdbarch, regnum)) == '\0')
|
||
continue;
|
||
|
||
if (register_changed_p (regnum, prev_regs.get (),
|
||
this_regs.get ()))
|
||
uiout->field_int (NULL, regnum);
|
||
}
|
||
}
|
||
|
||
/* Else, list of register #s, just do listed regs. */
|
||
for (i = 0; i < argc; i++)
|
||
{
|
||
regnum = atoi (argv[i]);
|
||
|
||
if (regnum >= 0
|
||
&& regnum < numregs
|
||
&& gdbarch_register_name (gdbarch, regnum) != NULL
|
||
&& *gdbarch_register_name (gdbarch, regnum) != '\000')
|
||
{
|
||
if (register_changed_p (regnum, prev_regs.get (),
|
||
this_regs.get ()))
|
||
uiout->field_int (NULL, regnum);
|
||
}
|
||
else
|
||
error (_("bad register number"));
|
||
}
|
||
}
|
||
|
||
static bool
|
||
register_changed_p (int regnum, readonly_detached_regcache *prev_regs,
|
||
readonly_detached_regcache *this_regs)
|
||
{
|
||
struct gdbarch *gdbarch = this_regs->arch ();
|
||
struct value *prev_value, *this_value;
|
||
|
||
/* First time through or after gdbarch change consider all registers
|
||
as changed. */
|
||
if (!prev_regs || prev_regs->arch () != gdbarch)
|
||
return true;
|
||
|
||
/* Get register contents and compare. */
|
||
prev_value = prev_regs->cooked_read_value (regnum);
|
||
this_value = this_regs->cooked_read_value (regnum);
|
||
gdb_assert (prev_value != NULL);
|
||
gdb_assert (this_value != NULL);
|
||
|
||
auto ret = !value_contents_eq (prev_value, 0, this_value, 0,
|
||
register_size (gdbarch, regnum));
|
||
|
||
release_value (prev_value);
|
||
release_value (this_value);
|
||
return ret;
|
||
}
|
||
|
||
/* Return a list of register number and value pairs. The valid
|
||
arguments expected are: a letter indicating the format in which to
|
||
display the registers contents. This can be one of: x
|
||
(hexadecimal), d (decimal), N (natural), t (binary), o (octal), r
|
||
(raw). After the format argument there can be a sequence of
|
||
numbers, indicating which registers to fetch the content of. If
|
||
the format is the only argument, a list of all the registers with
|
||
their values is returned. */
|
||
|
||
void
|
||
mi_cmd_data_list_register_values (const char *command, char **argv, int argc)
|
||
{
|
||
struct ui_out *uiout = current_uiout;
|
||
struct frame_info *frame;
|
||
struct gdbarch *gdbarch;
|
||
int regnum, numregs, format;
|
||
int i;
|
||
int skip_unavailable = 0;
|
||
int oind = 0;
|
||
enum opt
|
||
{
|
||
SKIP_UNAVAILABLE,
|
||
};
|
||
static const struct mi_opt opts[] =
|
||
{
|
||
{"-skip-unavailable", SKIP_UNAVAILABLE, 0},
|
||
{ 0, 0, 0 }
|
||
};
|
||
|
||
/* Note that the test for a valid register must include checking the
|
||
gdbarch_register_name because gdbarch_num_regs may be allocated
|
||
for the union of the register sets within a family of related
|
||
processors. In this case, some entries of gdbarch_register_name
|
||
will change depending upon the particular processor being
|
||
debugged. */
|
||
|
||
while (1)
|
||
{
|
||
char *oarg;
|
||
int opt = mi_getopt ("-data-list-register-values", argc, argv,
|
||
opts, &oind, &oarg);
|
||
|
||
if (opt < 0)
|
||
break;
|
||
switch ((enum opt) opt)
|
||
{
|
||
case SKIP_UNAVAILABLE:
|
||
skip_unavailable = 1;
|
||
break;
|
||
}
|
||
}
|
||
|
||
if (argc - oind < 1)
|
||
error (_("-data-list-register-values: Usage: "
|
||
"-data-list-register-values [--skip-unavailable] <format>"
|
||
" [<regnum1>...<regnumN>]"));
|
||
|
||
format = (int) argv[oind][0];
|
||
|
||
frame = get_selected_frame (NULL);
|
||
gdbarch = get_frame_arch (frame);
|
||
numregs = gdbarch_num_regs (gdbarch) + gdbarch_num_pseudo_regs (gdbarch);
|
||
|
||
ui_out_emit_list list_emitter (uiout, "register-values");
|
||
|
||
if (argc - oind == 1)
|
||
{
|
||
/* No args, beside the format: do all the regs. */
|
||
for (regnum = 0;
|
||
regnum < numregs;
|
||
regnum++)
|
||
{
|
||
if (gdbarch_register_name (gdbarch, regnum) == NULL
|
||
|| *(gdbarch_register_name (gdbarch, regnum)) == '\0')
|
||
continue;
|
||
|
||
output_register (frame, regnum, format, skip_unavailable);
|
||
}
|
||
}
|
||
|
||
/* Else, list of register #s, just do listed regs. */
|
||
for (i = 1 + oind; i < argc; i++)
|
||
{
|
||
regnum = atoi (argv[i]);
|
||
|
||
if (regnum >= 0
|
||
&& regnum < numregs
|
||
&& gdbarch_register_name (gdbarch, regnum) != NULL
|
||
&& *gdbarch_register_name (gdbarch, regnum) != '\000')
|
||
output_register (frame, regnum, format, skip_unavailable);
|
||
else
|
||
error (_("bad register number"));
|
||
}
|
||
}
|
||
|
||
/* Output one register REGNUM's contents in the desired FORMAT. If
|
||
SKIP_UNAVAILABLE is true, skip the register if it is
|
||
unavailable. */
|
||
|
||
static void
|
||
output_register (struct frame_info *frame, int regnum, int format,
|
||
int skip_unavailable)
|
||
{
|
||
struct ui_out *uiout = current_uiout;
|
||
struct value *val = value_of_register (regnum, frame);
|
||
struct value_print_options opts;
|
||
|
||
if (skip_unavailable && !value_entirely_available (val))
|
||
return;
|
||
|
||
ui_out_emit_tuple tuple_emitter (uiout, NULL);
|
||
uiout->field_int ("number", regnum);
|
||
|
||
if (format == 'N')
|
||
format = 0;
|
||
|
||
if (format == 'r')
|
||
format = 'z';
|
||
|
||
string_file stb;
|
||
|
||
get_formatted_print_options (&opts, format);
|
||
opts.deref_ref = 1;
|
||
val_print (value_type (val),
|
||
value_embedded_offset (val), 0,
|
||
&stb, 0, val, &opts, current_language);
|
||
uiout->field_stream ("value", stb);
|
||
}
|
||
|
||
/* Write given values into registers. The registers and values are
|
||
given as pairs. The corresponding MI command is
|
||
-data-write-register-values <format>
|
||
[<regnum1> <value1>...<regnumN> <valueN>] */
|
||
void
|
||
mi_cmd_data_write_register_values (const char *command, char **argv, int argc)
|
||
{
|
||
struct regcache *regcache;
|
||
struct gdbarch *gdbarch;
|
||
int numregs, i;
|
||
|
||
/* Note that the test for a valid register must include checking the
|
||
gdbarch_register_name because gdbarch_num_regs may be allocated
|
||
for the union of the register sets within a family of related
|
||
processors. In this case, some entries of gdbarch_register_name
|
||
will change depending upon the particular processor being
|
||
debugged. */
|
||
|
||
regcache = get_current_regcache ();
|
||
gdbarch = regcache->arch ();
|
||
numregs = gdbarch_num_regs (gdbarch) + gdbarch_num_pseudo_regs (gdbarch);
|
||
|
||
if (argc == 0)
|
||
error (_("-data-write-register-values: Usage: -data-write-register-"
|
||
"values <format> [<regnum1> <value1>...<regnumN> <valueN>]"));
|
||
|
||
if (!target_has_registers)
|
||
error (_("-data-write-register-values: No registers."));
|
||
|
||
if (!(argc - 1))
|
||
error (_("-data-write-register-values: No regs and values specified."));
|
||
|
||
if ((argc - 1) % 2)
|
||
error (_("-data-write-register-values: "
|
||
"Regs and vals are not in pairs."));
|
||
|
||
for (i = 1; i < argc; i = i + 2)
|
||
{
|
||
int regnum = atoi (argv[i]);
|
||
|
||
if (regnum >= 0 && regnum < numregs
|
||
&& gdbarch_register_name (gdbarch, regnum)
|
||
&& *gdbarch_register_name (gdbarch, regnum))
|
||
{
|
||
LONGEST value;
|
||
|
||
/* Get the value as a number. */
|
||
value = parse_and_eval_address (argv[i + 1]);
|
||
|
||
/* Write it down. */
|
||
regcache_cooked_write_signed (regcache, regnum, value);
|
||
}
|
||
else
|
||
error (_("bad register number"));
|
||
}
|
||
}
|
||
|
||
/* Evaluate the value of the argument. The argument is an
|
||
expression. If the expression contains spaces it needs to be
|
||
included in double quotes. */
|
||
|
||
void
|
||
mi_cmd_data_evaluate_expression (const char *command, char **argv, int argc)
|
||
{
|
||
struct value *val;
|
||
struct value_print_options opts;
|
||
struct ui_out *uiout = current_uiout;
|
||
|
||
if (argc != 1)
|
||
error (_("-data-evaluate-expression: "
|
||
"Usage: -data-evaluate-expression expression"));
|
||
|
||
expression_up expr = parse_expression (argv[0]);
|
||
|
||
val = evaluate_expression (expr.get ());
|
||
|
||
string_file stb;
|
||
|
||
/* Print the result of the expression evaluation. */
|
||
get_user_print_options (&opts);
|
||
opts.deref_ref = 0;
|
||
common_val_print (val, &stb, 0, &opts, current_language);
|
||
|
||
uiout->field_stream ("value", stb);
|
||
}
|
||
|
||
/* This is the -data-read-memory command.
|
||
|
||
ADDR: start address of data to be dumped.
|
||
WORD-FORMAT: a char indicating format for the ``word''. See
|
||
the ``x'' command.
|
||
WORD-SIZE: size of each ``word''; 1,2,4, or 8 bytes.
|
||
NR_ROW: Number of rows.
|
||
NR_COL: The number of colums (words per row).
|
||
ASCHAR: (OPTIONAL) Append an ascii character dump to each row. Use
|
||
ASCHAR for unprintable characters.
|
||
|
||
Reads SIZE*NR_ROW*NR_COL bytes starting at ADDR from memory and
|
||
displayes them. Returns:
|
||
|
||
{addr="...",rowN={wordN="..." ,... [,ascii="..."]}, ...}
|
||
|
||
Returns:
|
||
The number of bytes read is SIZE*ROW*COL. */
|
||
|
||
void
|
||
mi_cmd_data_read_memory (const char *command, char **argv, int argc)
|
||
{
|
||
struct gdbarch *gdbarch = get_current_arch ();
|
||
struct ui_out *uiout = current_uiout;
|
||
CORE_ADDR addr;
|
||
long total_bytes, nr_cols, nr_rows;
|
||
char word_format;
|
||
struct type *word_type;
|
||
long word_size;
|
||
char word_asize;
|
||
char aschar;
|
||
int nr_bytes;
|
||
long offset = 0;
|
||
int oind = 0;
|
||
char *oarg;
|
||
enum opt
|
||
{
|
||
OFFSET_OPT
|
||
};
|
||
static const struct mi_opt opts[] =
|
||
{
|
||
{"o", OFFSET_OPT, 1},
|
||
{ 0, 0, 0 }
|
||
};
|
||
|
||
while (1)
|
||
{
|
||
int opt = mi_getopt ("-data-read-memory", argc, argv, opts,
|
||
&oind, &oarg);
|
||
|
||
if (opt < 0)
|
||
break;
|
||
switch ((enum opt) opt)
|
||
{
|
||
case OFFSET_OPT:
|
||
offset = atol (oarg);
|
||
break;
|
||
}
|
||
}
|
||
argv += oind;
|
||
argc -= oind;
|
||
|
||
if (argc < 5 || argc > 6)
|
||
error (_("-data-read-memory: Usage: "
|
||
"ADDR WORD-FORMAT WORD-SIZE NR-ROWS NR-COLS [ASCHAR]."));
|
||
|
||
/* Extract all the arguments. */
|
||
|
||
/* Start address of the memory dump. */
|
||
addr = parse_and_eval_address (argv[0]) + offset;
|
||
/* The format character to use when displaying a memory word. See
|
||
the ``x'' command. */
|
||
word_format = argv[1][0];
|
||
/* The size of the memory word. */
|
||
word_size = atol (argv[2]);
|
||
switch (word_size)
|
||
{
|
||
case 1:
|
||
word_type = builtin_type (gdbarch)->builtin_int8;
|
||
word_asize = 'b';
|
||
break;
|
||
case 2:
|
||
word_type = builtin_type (gdbarch)->builtin_int16;
|
||
word_asize = 'h';
|
||
break;
|
||
case 4:
|
||
word_type = builtin_type (gdbarch)->builtin_int32;
|
||
word_asize = 'w';
|
||
break;
|
||
case 8:
|
||
word_type = builtin_type (gdbarch)->builtin_int64;
|
||
word_asize = 'g';
|
||
break;
|
||
default:
|
||
word_type = builtin_type (gdbarch)->builtin_int8;
|
||
word_asize = 'b';
|
||
}
|
||
/* The number of rows. */
|
||
nr_rows = atol (argv[3]);
|
||
if (nr_rows <= 0)
|
||
error (_("-data-read-memory: invalid number of rows."));
|
||
|
||
/* Number of bytes per row. */
|
||
nr_cols = atol (argv[4]);
|
||
if (nr_cols <= 0)
|
||
error (_("-data-read-memory: invalid number of columns."));
|
||
|
||
/* The un-printable character when printing ascii. */
|
||
if (argc == 6)
|
||
aschar = *argv[5];
|
||
else
|
||
aschar = 0;
|
||
|
||
/* Create a buffer and read it in. */
|
||
total_bytes = word_size * nr_rows * nr_cols;
|
||
|
||
gdb::byte_vector mbuf (total_bytes);
|
||
|
||
nr_bytes = target_read (target_stack, TARGET_OBJECT_MEMORY, NULL, mbuf.data (),
|
||
addr, total_bytes);
|
||
if (nr_bytes <= 0)
|
||
error (_("Unable to read memory."));
|
||
|
||
/* Output the header information. */
|
||
uiout->field_core_addr ("addr", gdbarch, addr);
|
||
uiout->field_int ("nr-bytes", nr_bytes);
|
||
uiout->field_int ("total-bytes", total_bytes);
|
||
uiout->field_core_addr ("next-row", gdbarch, addr + word_size * nr_cols);
|
||
uiout->field_core_addr ("prev-row", gdbarch, addr - word_size * nr_cols);
|
||
uiout->field_core_addr ("next-page", gdbarch, addr + total_bytes);
|
||
uiout->field_core_addr ("prev-page", gdbarch, addr - total_bytes);
|
||
|
||
/* Build the result as a two dimentional table. */
|
||
{
|
||
int row;
|
||
int row_byte;
|
||
|
||
string_file stream;
|
||
|
||
ui_out_emit_list list_emitter (uiout, "memory");
|
||
for (row = 0, row_byte = 0;
|
||
row < nr_rows;
|
||
row++, row_byte += nr_cols * word_size)
|
||
{
|
||
int col;
|
||
int col_byte;
|
||
struct value_print_options opts;
|
||
|
||
ui_out_emit_tuple tuple_emitter (uiout, NULL);
|
||
uiout->field_core_addr ("addr", gdbarch, addr + row_byte);
|
||
/* ui_out_field_core_addr_symbolic (uiout, "saddr", addr +
|
||
row_byte); */
|
||
{
|
||
ui_out_emit_list list_data_emitter (uiout, "data");
|
||
get_formatted_print_options (&opts, word_format);
|
||
for (col = 0, col_byte = row_byte;
|
||
col < nr_cols;
|
||
col++, col_byte += word_size)
|
||
{
|
||
if (col_byte + word_size > nr_bytes)
|
||
{
|
||
uiout->field_string (NULL, "N/A");
|
||
}
|
||
else
|
||
{
|
||
stream.clear ();
|
||
print_scalar_formatted (&mbuf[col_byte], word_type, &opts,
|
||
word_asize, &stream);
|
||
uiout->field_stream (NULL, stream);
|
||
}
|
||
}
|
||
}
|
||
|
||
if (aschar)
|
||
{
|
||
int byte;
|
||
|
||
stream.clear ();
|
||
for (byte = row_byte;
|
||
byte < row_byte + word_size * nr_cols; byte++)
|
||
{
|
||
if (byte >= nr_bytes)
|
||
stream.putc ('X');
|
||
else if (mbuf[byte] < 32 || mbuf[byte] > 126)
|
||
stream.putc (aschar);
|
||
else
|
||
stream.putc (mbuf[byte]);
|
||
}
|
||
uiout->field_stream ("ascii", stream);
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
void
|
||
mi_cmd_data_read_memory_bytes (const char *command, char **argv, int argc)
|
||
{
|
||
struct gdbarch *gdbarch = get_current_arch ();
|
||
struct ui_out *uiout = current_uiout;
|
||
CORE_ADDR addr;
|
||
LONGEST length;
|
||
long offset = 0;
|
||
int unit_size = gdbarch_addressable_memory_unit_size (gdbarch);
|
||
int oind = 0;
|
||
char *oarg;
|
||
enum opt
|
||
{
|
||
OFFSET_OPT
|
||
};
|
||
static const struct mi_opt opts[] =
|
||
{
|
||
{"o", OFFSET_OPT, 1},
|
||
{ 0, 0, 0 }
|
||
};
|
||
|
||
while (1)
|
||
{
|
||
int opt = mi_getopt ("-data-read-memory-bytes", argc, argv, opts,
|
||
&oind, &oarg);
|
||
if (opt < 0)
|
||
break;
|
||
switch ((enum opt) opt)
|
||
{
|
||
case OFFSET_OPT:
|
||
offset = atol (oarg);
|
||
break;
|
||
}
|
||
}
|
||
argv += oind;
|
||
argc -= oind;
|
||
|
||
if (argc != 2)
|
||
error (_("Usage: [ -o OFFSET ] ADDR LENGTH."));
|
||
|
||
addr = parse_and_eval_address (argv[0]) + offset;
|
||
length = atol (argv[1]);
|
||
|
||
std::vector<memory_read_result> result
|
||
= read_memory_robust (target_stack, addr, length);
|
||
|
||
if (result.size () == 0)
|
||
error (_("Unable to read memory."));
|
||
|
||
ui_out_emit_list list_emitter (uiout, "memory");
|
||
for (const memory_read_result &read_result : result)
|
||
{
|
||
ui_out_emit_tuple tuple_emitter (uiout, NULL);
|
||
|
||
uiout->field_core_addr ("begin", gdbarch, read_result.begin);
|
||
uiout->field_core_addr ("offset", gdbarch, read_result.begin - addr);
|
||
uiout->field_core_addr ("end", gdbarch, read_result.end);
|
||
|
||
std::string data = bin2hex (read_result.data.get (),
|
||
(read_result.end - read_result.begin)
|
||
* unit_size);
|
||
uiout->field_string ("contents", data.c_str ());
|
||
}
|
||
}
|
||
|
||
/* Implementation of the -data-write_memory command.
|
||
|
||
COLUMN_OFFSET: optional argument. Must be preceded by '-o'. The
|
||
offset from the beginning of the memory grid row where the cell to
|
||
be written is.
|
||
ADDR: start address of the row in the memory grid where the memory
|
||
cell is, if OFFSET_COLUMN is specified. Otherwise, the address of
|
||
the location to write to.
|
||
FORMAT: a char indicating format for the ``word''. See
|
||
the ``x'' command.
|
||
WORD_SIZE: size of each ``word''; 1,2,4, or 8 bytes
|
||
VALUE: value to be written into the memory address.
|
||
|
||
Writes VALUE into ADDR + (COLUMN_OFFSET * WORD_SIZE).
|
||
|
||
Prints nothing. */
|
||
|
||
void
|
||
mi_cmd_data_write_memory (const char *command, char **argv, int argc)
|
||
{
|
||
struct gdbarch *gdbarch = get_current_arch ();
|
||
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
|
||
CORE_ADDR addr;
|
||
long word_size;
|
||
/* FIXME: ezannoni 2000-02-17 LONGEST could possibly not be big
|
||
enough when using a compiler other than GCC. */
|
||
LONGEST value;
|
||
long offset = 0;
|
||
int oind = 0;
|
||
char *oarg;
|
||
enum opt
|
||
{
|
||
OFFSET_OPT
|
||
};
|
||
static const struct mi_opt opts[] =
|
||
{
|
||
{"o", OFFSET_OPT, 1},
|
||
{ 0, 0, 0 }
|
||
};
|
||
|
||
while (1)
|
||
{
|
||
int opt = mi_getopt ("-data-write-memory", argc, argv, opts,
|
||
&oind, &oarg);
|
||
|
||
if (opt < 0)
|
||
break;
|
||
switch ((enum opt) opt)
|
||
{
|
||
case OFFSET_OPT:
|
||
offset = atol (oarg);
|
||
break;
|
||
}
|
||
}
|
||
argv += oind;
|
||
argc -= oind;
|
||
|
||
if (argc != 4)
|
||
error (_("-data-write-memory: Usage: "
|
||
"[-o COLUMN_OFFSET] ADDR FORMAT WORD-SIZE VALUE."));
|
||
|
||
/* Extract all the arguments. */
|
||
/* Start address of the memory dump. */
|
||
addr = parse_and_eval_address (argv[0]);
|
||
/* The size of the memory word. */
|
||
word_size = atol (argv[2]);
|
||
|
||
/* Calculate the real address of the write destination. */
|
||
addr += (offset * word_size);
|
||
|
||
/* Get the value as a number. */
|
||
value = parse_and_eval_address (argv[3]);
|
||
/* Get the value into an array. */
|
||
gdb::byte_vector buffer (word_size);
|
||
store_signed_integer (buffer.data (), word_size, byte_order, value);
|
||
/* Write it down to memory. */
|
||
write_memory_with_notification (addr, buffer.data (), word_size);
|
||
}
|
||
|
||
/* Implementation of the -data-write-memory-bytes command.
|
||
|
||
ADDR: start address
|
||
DATA: string of bytes to write at that address
|
||
COUNT: number of bytes to be filled (decimal integer). */
|
||
|
||
void
|
||
mi_cmd_data_write_memory_bytes (const char *command, char **argv, int argc)
|
||
{
|
||
CORE_ADDR addr;
|
||
char *cdata;
|
||
size_t len_hex, len_bytes, len_units, i, steps, remaining_units;
|
||
long int count_units;
|
||
int unit_size;
|
||
|
||
if (argc != 2 && argc != 3)
|
||
error (_("Usage: ADDR DATA [COUNT]."));
|
||
|
||
addr = parse_and_eval_address (argv[0]);
|
||
cdata = argv[1];
|
||
len_hex = strlen (cdata);
|
||
unit_size = gdbarch_addressable_memory_unit_size (get_current_arch ());
|
||
|
||
if (len_hex % (unit_size * 2) != 0)
|
||
error (_("Hex-encoded '%s' must represent an integral number of "
|
||
"addressable memory units."),
|
||
cdata);
|
||
|
||
len_bytes = len_hex / 2;
|
||
len_units = len_bytes / unit_size;
|
||
|
||
if (argc == 3)
|
||
count_units = strtoul (argv[2], NULL, 10);
|
||
else
|
||
count_units = len_units;
|
||
|
||
gdb::byte_vector databuf (len_bytes);
|
||
|
||
for (i = 0; i < len_bytes; ++i)
|
||
{
|
||
int x;
|
||
if (sscanf (cdata + i * 2, "%02x", &x) != 1)
|
||
error (_("Invalid argument"));
|
||
databuf[i] = (gdb_byte) x;
|
||
}
|
||
|
||
gdb::byte_vector data;
|
||
if (len_units < count_units)
|
||
{
|
||
/* Pattern is made of less units than count:
|
||
repeat pattern to fill memory. */
|
||
data = gdb::byte_vector (count_units * unit_size);
|
||
|
||
/* Number of times the pattern is entirely repeated. */
|
||
steps = count_units / len_units;
|
||
/* Number of remaining addressable memory units. */
|
||
remaining_units = count_units % len_units;
|
||
for (i = 0; i < steps; i++)
|
||
memcpy (&data[i * len_bytes], &databuf[0], len_bytes);
|
||
|
||
if (remaining_units > 0)
|
||
memcpy (&data[steps * len_bytes], &databuf[0],
|
||
remaining_units * unit_size);
|
||
}
|
||
else
|
||
{
|
||
/* Pattern is longer than or equal to count:
|
||
just copy count addressable memory units. */
|
||
data = std::move (databuf);
|
||
}
|
||
|
||
write_memory_with_notification (addr, data.data (), count_units);
|
||
}
|
||
|
||
void
|
||
mi_cmd_enable_timings (const char *command, char **argv, int argc)
|
||
{
|
||
if (argc == 0)
|
||
do_timings = 1;
|
||
else if (argc == 1)
|
||
{
|
||
if (strcmp (argv[0], "yes") == 0)
|
||
do_timings = 1;
|
||
else if (strcmp (argv[0], "no") == 0)
|
||
do_timings = 0;
|
||
else
|
||
goto usage_error;
|
||
}
|
||
else
|
||
goto usage_error;
|
||
|
||
return;
|
||
|
||
usage_error:
|
||
error (_("-enable-timings: Usage: %s {yes|no}"), command);
|
||
}
|
||
|
||
void
|
||
mi_cmd_list_features (const char *command, char **argv, int argc)
|
||
{
|
||
if (argc == 0)
|
||
{
|
||
struct ui_out *uiout = current_uiout;
|
||
|
||
ui_out_emit_list list_emitter (uiout, "features");
|
||
uiout->field_string (NULL, "frozen-varobjs");
|
||
uiout->field_string (NULL, "pending-breakpoints");
|
||
uiout->field_string (NULL, "thread-info");
|
||
uiout->field_string (NULL, "data-read-memory-bytes");
|
||
uiout->field_string (NULL, "breakpoint-notifications");
|
||
uiout->field_string (NULL, "ada-task-info");
|
||
uiout->field_string (NULL, "language-option");
|
||
uiout->field_string (NULL, "info-gdb-mi-command");
|
||
uiout->field_string (NULL, "undefined-command-error-code");
|
||
uiout->field_string (NULL, "exec-run-start-option");
|
||
|
||
if (ext_lang_initialized_p (get_ext_lang_defn (EXT_LANG_PYTHON)))
|
||
uiout->field_string (NULL, "python");
|
||
|
||
return;
|
||
}
|
||
|
||
error (_("-list-features should be passed no arguments"));
|
||
}
|
||
|
||
void
|
||
mi_cmd_list_target_features (const char *command, char **argv, int argc)
|
||
{
|
||
if (argc == 0)
|
||
{
|
||
struct ui_out *uiout = current_uiout;
|
||
|
||
ui_out_emit_list list_emitter (uiout, "features");
|
||
if (mi_async_p ())
|
||
uiout->field_string (NULL, "async");
|
||
if (target_can_execute_reverse)
|
||
uiout->field_string (NULL, "reverse");
|
||
return;
|
||
}
|
||
|
||
error (_("-list-target-features should be passed no arguments"));
|
||
}
|
||
|
||
void
|
||
mi_cmd_add_inferior (const char *command, char **argv, int argc)
|
||
{
|
||
struct inferior *inf;
|
||
|
||
if (argc != 0)
|
||
error (_("-add-inferior should be passed no arguments"));
|
||
|
||
inf = add_inferior_with_spaces ();
|
||
|
||
current_uiout->field_fmt ("inferior", "i%d", inf->num);
|
||
}
|
||
|
||
/* Callback used to find the first inferior other than the current
|
||
one. */
|
||
|
||
static int
|
||
get_other_inferior (struct inferior *inf, void *arg)
|
||
{
|
||
if (inf == current_inferior ())
|
||
return 0;
|
||
|
||
return 1;
|
||
}
|
||
|
||
void
|
||
mi_cmd_remove_inferior (const char *command, char **argv, int argc)
|
||
{
|
||
int id;
|
||
struct inferior *inf;
|
||
|
||
if (argc != 1)
|
||
error (_("-remove-inferior should be passed a single argument"));
|
||
|
||
if (sscanf (argv[0], "i%d", &id) != 1)
|
||
error (_("the thread group id is syntactically invalid"));
|
||
|
||
inf = find_inferior_id (id);
|
||
if (!inf)
|
||
error (_("the specified thread group does not exist"));
|
||
|
||
if (inf->pid != 0)
|
||
error (_("cannot remove an active inferior"));
|
||
|
||
if (inf == current_inferior ())
|
||
{
|
||
struct thread_info *tp = 0;
|
||
struct inferior *new_inferior
|
||
= iterate_over_inferiors (get_other_inferior, NULL);
|
||
|
||
if (new_inferior == NULL)
|
||
error (_("Cannot remove last inferior"));
|
||
|
||
set_current_inferior (new_inferior);
|
||
if (new_inferior->pid != 0)
|
||
tp = any_thread_of_process (new_inferior->pid);
|
||
switch_to_thread (tp ? tp->ptid : null_ptid);
|
||
set_current_program_space (new_inferior->pspace);
|
||
}
|
||
|
||
delete_inferior (inf);
|
||
}
|
||
|
||
|
||
|
||
/* Execute a command within a safe environment.
|
||
Return <0 for error; >=0 for ok.
|
||
|
||
args->action will tell mi_execute_command what action
|
||
to perform after the given command has executed (display/suppress
|
||
prompt, display error). */
|
||
|
||
static void
|
||
captured_mi_execute_command (struct ui_out *uiout, struct mi_parse *context)
|
||
{
|
||
struct mi_interp *mi = (struct mi_interp *) command_interp ();
|
||
|
||
if (do_timings)
|
||
current_command_ts = context->cmd_start;
|
||
|
||
scoped_restore save_token = make_scoped_restore (¤t_token,
|
||
context->token);
|
||
|
||
running_result_record_printed = 0;
|
||
mi_proceeded = 0;
|
||
switch (context->op)
|
||
{
|
||
case MI_COMMAND:
|
||
/* A MI command was read from the input stream. */
|
||
if (mi_debug_p)
|
||
/* FIXME: gdb_???? */
|
||
fprintf_unfiltered (mi->raw_stdout,
|
||
" token=`%s' command=`%s' args=`%s'\n",
|
||
context->token, context->command, context->args);
|
||
|
||
mi_cmd_execute (context);
|
||
|
||
/* Print the result if there were no errors.
|
||
|
||
Remember that on the way out of executing a command, you have
|
||
to directly use the mi_interp's uiout, since the command
|
||
could have reset the interpreter, in which case the current
|
||
uiout will most likely crash in the mi_out_* routines. */
|
||
if (!running_result_record_printed)
|
||
{
|
||
fputs_unfiltered (context->token, mi->raw_stdout);
|
||
/* There's no particularly good reason why target-connect results
|
||
in not ^done. Should kill ^connected for MI3. */
|
||
fputs_unfiltered (strcmp (context->command, "target-select") == 0
|
||
? "^connected" : "^done", mi->raw_stdout);
|
||
mi_out_put (uiout, mi->raw_stdout);
|
||
mi_out_rewind (uiout);
|
||
mi_print_timing_maybe (mi->raw_stdout);
|
||
fputs_unfiltered ("\n", mi->raw_stdout);
|
||
}
|
||
else
|
||
/* The command does not want anything to be printed. In that
|
||
case, the command probably should not have written anything
|
||
to uiout, but in case it has written something, discard it. */
|
||
mi_out_rewind (uiout);
|
||
break;
|
||
|
||
case CLI_COMMAND:
|
||
{
|
||
char *argv[2];
|
||
|
||
/* A CLI command was read from the input stream. */
|
||
/* This "feature" will be removed as soon as we have a
|
||
complete set of mi commands. */
|
||
/* Echo the command on the console. */
|
||
fprintf_unfiltered (gdb_stdlog, "%s\n", context->command);
|
||
/* Call the "console" interpreter. */
|
||
argv[0] = (char *) INTERP_CONSOLE;
|
||
argv[1] = context->command;
|
||
mi_cmd_interpreter_exec ("-interpreter-exec", argv, 2);
|
||
|
||
/* If we changed interpreters, DON'T print out anything. */
|
||
if (current_interp_named_p (INTERP_MI)
|
||
|| current_interp_named_p (INTERP_MI1)
|
||
|| current_interp_named_p (INTERP_MI2)
|
||
|| current_interp_named_p (INTERP_MI3))
|
||
{
|
||
if (!running_result_record_printed)
|
||
{
|
||
fputs_unfiltered (context->token, mi->raw_stdout);
|
||
fputs_unfiltered ("^done", mi->raw_stdout);
|
||
mi_out_put (uiout, mi->raw_stdout);
|
||
mi_out_rewind (uiout);
|
||
mi_print_timing_maybe (mi->raw_stdout);
|
||
fputs_unfiltered ("\n", mi->raw_stdout);
|
||
}
|
||
else
|
||
mi_out_rewind (uiout);
|
||
}
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
|
||
/* Print a gdb exception to the MI output stream. */
|
||
|
||
static void
|
||
mi_print_exception (const char *token, struct gdb_exception exception)
|
||
{
|
||
struct mi_interp *mi = (struct mi_interp *) current_interpreter ();
|
||
|
||
fputs_unfiltered (token, mi->raw_stdout);
|
||
fputs_unfiltered ("^error,msg=\"", mi->raw_stdout);
|
||
if (exception.message == NULL)
|
||
fputs_unfiltered ("unknown error", mi->raw_stdout);
|
||
else
|
||
fputstr_unfiltered (exception.message, '"', mi->raw_stdout);
|
||
fputs_unfiltered ("\"", mi->raw_stdout);
|
||
|
||
switch (exception.error)
|
||
{
|
||
case UNDEFINED_COMMAND_ERROR:
|
||
fputs_unfiltered (",code=\"undefined-command\"", mi->raw_stdout);
|
||
break;
|
||
}
|
||
|
||
fputs_unfiltered ("\n", mi->raw_stdout);
|
||
}
|
||
|
||
/* Determine whether the parsed command already notifies the
|
||
user_selected_context_changed observer. */
|
||
|
||
static int
|
||
command_notifies_uscc_observer (struct mi_parse *command)
|
||
{
|
||
if (command->op == CLI_COMMAND)
|
||
{
|
||
/* CLI commands "thread" and "inferior" already send it. */
|
||
return (strncmp (command->command, "thread ", 7) == 0
|
||
|| strncmp (command->command, "inferior ", 9) == 0);
|
||
}
|
||
else /* MI_COMMAND */
|
||
{
|
||
if (strcmp (command->command, "interpreter-exec") == 0
|
||
&& command->argc > 1)
|
||
{
|
||
/* "thread" and "inferior" again, but through -interpreter-exec. */
|
||
return (strncmp (command->argv[1], "thread ", 7) == 0
|
||
|| strncmp (command->argv[1], "inferior ", 9) == 0);
|
||
}
|
||
|
||
else
|
||
/* -thread-select already sends it. */
|
||
return strcmp (command->command, "thread-select") == 0;
|
||
}
|
||
}
|
||
|
||
void
|
||
mi_execute_command (const char *cmd, int from_tty)
|
||
{
|
||
char *token;
|
||
std::unique_ptr<struct mi_parse> command;
|
||
|
||
/* This is to handle EOF (^D). We just quit gdb. */
|
||
/* FIXME: we should call some API function here. */
|
||
if (cmd == 0)
|
||
quit_force (NULL, from_tty);
|
||
|
||
target_log_command (cmd);
|
||
|
||
TRY
|
||
{
|
||
command = mi_parse (cmd, &token);
|
||
}
|
||
CATCH (exception, RETURN_MASK_ALL)
|
||
{
|
||
mi_print_exception (token, exception);
|
||
xfree (token);
|
||
}
|
||
END_CATCH
|
||
|
||
if (command != NULL)
|
||
{
|
||
ptid_t previous_ptid = inferior_ptid;
|
||
|
||
gdb::optional<scoped_restore_tmpl<int>> restore_suppress;
|
||
|
||
if (command->cmd != NULL && command->cmd->suppress_notification != NULL)
|
||
restore_suppress.emplace (command->cmd->suppress_notification, 1);
|
||
|
||
command->token = token;
|
||
|
||
if (do_timings)
|
||
{
|
||
command->cmd_start = new mi_timestamp ();
|
||
timestamp (command->cmd_start);
|
||
}
|
||
|
||
TRY
|
||
{
|
||
captured_mi_execute_command (current_uiout, command.get ());
|
||
}
|
||
CATCH (result, RETURN_MASK_ALL)
|
||
{
|
||
/* Like in start_event_loop, enable input and force display
|
||
of the prompt. Otherwise, any command that calls
|
||
async_disable_stdin, and then throws, will leave input
|
||
disabled. */
|
||
async_enable_stdin ();
|
||
current_ui->prompt_state = PROMPT_NEEDED;
|
||
|
||
/* The command execution failed and error() was called
|
||
somewhere. */
|
||
mi_print_exception (command->token, result);
|
||
mi_out_rewind (current_uiout);
|
||
}
|
||
END_CATCH
|
||
|
||
bpstat_do_actions ();
|
||
|
||
if (/* The notifications are only output when the top-level
|
||
interpreter (specified on the command line) is MI. */
|
||
interp_ui_out (top_level_interpreter ())->is_mi_like_p ()
|
||
/* Don't try report anything if there are no threads --
|
||
the program is dead. */
|
||
&& thread_count () != 0
|
||
/* If the command already reports the thread change, no need to do it
|
||
again. */
|
||
&& !command_notifies_uscc_observer (command.get ()))
|
||
{
|
||
struct mi_interp *mi = (struct mi_interp *) top_level_interpreter ();
|
||
int report_change = 0;
|
||
|
||
if (command->thread == -1)
|
||
{
|
||
report_change = (!ptid_equal (previous_ptid, null_ptid)
|
||
&& !ptid_equal (inferior_ptid, previous_ptid)
|
||
&& !ptid_equal (inferior_ptid, null_ptid));
|
||
}
|
||
else if (!ptid_equal (inferior_ptid, null_ptid))
|
||
{
|
||
struct thread_info *ti = inferior_thread ();
|
||
|
||
report_change = (ti->global_num != command->thread);
|
||
}
|
||
|
||
if (report_change)
|
||
{
|
||
gdb::observers::user_selected_context_changed.notify
|
||
(USER_SELECTED_THREAD | USER_SELECTED_FRAME);
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
static void
|
||
mi_cmd_execute (struct mi_parse *parse)
|
||
{
|
||
scoped_value_mark cleanup = prepare_execute_command ();
|
||
|
||
if (parse->all && parse->thread_group != -1)
|
||
error (_("Cannot specify --thread-group together with --all"));
|
||
|
||
if (parse->all && parse->thread != -1)
|
||
error (_("Cannot specify --thread together with --all"));
|
||
|
||
if (parse->thread_group != -1 && parse->thread != -1)
|
||
error (_("Cannot specify --thread together with --thread-group"));
|
||
|
||
if (parse->frame != -1 && parse->thread == -1)
|
||
error (_("Cannot specify --frame without --thread"));
|
||
|
||
if (parse->thread_group != -1)
|
||
{
|
||
struct inferior *inf = find_inferior_id (parse->thread_group);
|
||
struct thread_info *tp = 0;
|
||
|
||
if (!inf)
|
||
error (_("Invalid thread group for the --thread-group option"));
|
||
|
||
set_current_inferior (inf);
|
||
/* This behaviour means that if --thread-group option identifies
|
||
an inferior with multiple threads, then a random one will be
|
||
picked. This is not a problem -- frontend should always
|
||
provide --thread if it wishes to operate on a specific
|
||
thread. */
|
||
if (inf->pid != 0)
|
||
tp = any_live_thread_of_process (inf->pid);
|
||
switch_to_thread (tp ? tp->ptid : null_ptid);
|
||
set_current_program_space (inf->pspace);
|
||
}
|
||
|
||
if (parse->thread != -1)
|
||
{
|
||
struct thread_info *tp = find_thread_global_id (parse->thread);
|
||
|
||
if (!tp)
|
||
error (_("Invalid thread id: %d"), parse->thread);
|
||
|
||
if (is_exited (tp->ptid))
|
||
error (_("Thread id: %d has terminated"), parse->thread);
|
||
|
||
switch_to_thread (tp->ptid);
|
||
}
|
||
|
||
if (parse->frame != -1)
|
||
{
|
||
struct frame_info *fid;
|
||
int frame = parse->frame;
|
||
|
||
fid = find_relative_frame (get_current_frame (), &frame);
|
||
if (frame == 0)
|
||
/* find_relative_frame was successful */
|
||
select_frame (fid);
|
||
else
|
||
error (_("Invalid frame id: %d"), frame);
|
||
}
|
||
|
||
gdb::optional<scoped_restore_current_language> lang_saver;
|
||
if (parse->language != language_unknown)
|
||
{
|
||
lang_saver.emplace ();
|
||
set_language (parse->language);
|
||
}
|
||
|
||
current_context = parse;
|
||
|
||
if (parse->cmd->argv_func != NULL)
|
||
{
|
||
parse->cmd->argv_func (parse->command, parse->argv, parse->argc);
|
||
}
|
||
else if (parse->cmd->cli.cmd != 0)
|
||
{
|
||
/* FIXME: DELETE THIS. */
|
||
/* The operation is still implemented by a cli command. */
|
||
/* Must be a synchronous one. */
|
||
mi_execute_cli_command (parse->cmd->cli.cmd, parse->cmd->cli.args_p,
|
||
parse->args);
|
||
}
|
||
else
|
||
{
|
||
/* FIXME: DELETE THIS. */
|
||
string_file stb;
|
||
|
||
stb.puts ("Undefined mi command: ");
|
||
stb.putstr (parse->command, '"');
|
||
stb.puts (" (missing implementation)");
|
||
|
||
error_stream (stb);
|
||
}
|
||
}
|
||
|
||
/* FIXME: This is just a hack so we can get some extra commands going.
|
||
We don't want to channel things through the CLI, but call libgdb directly.
|
||
Use only for synchronous commands. */
|
||
|
||
void
|
||
mi_execute_cli_command (const char *cmd, int args_p, const char *args)
|
||
{
|
||
if (cmd != 0)
|
||
{
|
||
std::string run = cmd;
|
||
|
||
if (args_p)
|
||
run = run + " " + args;
|
||
if (mi_debug_p)
|
||
/* FIXME: gdb_???? */
|
||
fprintf_unfiltered (gdb_stdout, "cli=%s run=%s\n",
|
||
cmd, run.c_str ());
|
||
execute_command (run.c_str (), 0 /* from_tty */ );
|
||
}
|
||
}
|
||
|
||
void
|
||
mi_execute_async_cli_command (const char *cli_command, char **argv, int argc)
|
||
{
|
||
std::string run = cli_command;
|
||
|
||
if (argc)
|
||
run = run + " " + *argv;
|
||
if (mi_async_p ())
|
||
run += "&";
|
||
|
||
execute_command (run.c_str (), 0 /* from_tty */ );
|
||
}
|
||
|
||
void
|
||
mi_load_progress (const char *section_name,
|
||
unsigned long sent_so_far,
|
||
unsigned long total_section,
|
||
unsigned long total_sent,
|
||
unsigned long grand_total)
|
||
{
|
||
using namespace std::chrono;
|
||
static steady_clock::time_point last_update;
|
||
static char *previous_sect_name = NULL;
|
||
int new_section;
|
||
struct mi_interp *mi = (struct mi_interp *) current_interpreter ();
|
||
|
||
/* This function is called through deprecated_show_load_progress
|
||
which means uiout may not be correct. Fix it for the duration
|
||
of this function. */
|
||
|
||
std::unique_ptr<ui_out> uiout;
|
||
|
||
if (current_interp_named_p (INTERP_MI)
|
||
|| current_interp_named_p (INTERP_MI2))
|
||
uiout.reset (mi_out_new (2));
|
||
else if (current_interp_named_p (INTERP_MI1))
|
||
uiout.reset (mi_out_new (1));
|
||
else if (current_interp_named_p (INTERP_MI3))
|
||
uiout.reset (mi_out_new (3));
|
||
else
|
||
return;
|
||
|
||
scoped_restore save_uiout
|
||
= make_scoped_restore (¤t_uiout, uiout.get ());
|
||
|
||
new_section = (previous_sect_name ?
|
||
strcmp (previous_sect_name, section_name) : 1);
|
||
if (new_section)
|
||
{
|
||
xfree (previous_sect_name);
|
||
previous_sect_name = xstrdup (section_name);
|
||
|
||
if (current_token)
|
||
fputs_unfiltered (current_token, mi->raw_stdout);
|
||
fputs_unfiltered ("+download", mi->raw_stdout);
|
||
{
|
||
ui_out_emit_tuple tuple_emitter (uiout.get (), NULL);
|
||
uiout->field_string ("section", section_name);
|
||
uiout->field_int ("section-size", total_section);
|
||
uiout->field_int ("total-size", grand_total);
|
||
}
|
||
mi_out_put (uiout.get (), mi->raw_stdout);
|
||
fputs_unfiltered ("\n", mi->raw_stdout);
|
||
gdb_flush (mi->raw_stdout);
|
||
}
|
||
|
||
steady_clock::time_point time_now = steady_clock::now ();
|
||
if (time_now - last_update > milliseconds (500))
|
||
{
|
||
last_update = time_now;
|
||
if (current_token)
|
||
fputs_unfiltered (current_token, mi->raw_stdout);
|
||
fputs_unfiltered ("+download", mi->raw_stdout);
|
||
{
|
||
ui_out_emit_tuple tuple_emitter (uiout.get (), NULL);
|
||
uiout->field_string ("section", section_name);
|
||
uiout->field_int ("section-sent", sent_so_far);
|
||
uiout->field_int ("section-size", total_section);
|
||
uiout->field_int ("total-sent", total_sent);
|
||
uiout->field_int ("total-size", grand_total);
|
||
}
|
||
mi_out_put (uiout.get (), mi->raw_stdout);
|
||
fputs_unfiltered ("\n", mi->raw_stdout);
|
||
gdb_flush (mi->raw_stdout);
|
||
}
|
||
}
|
||
|
||
static void
|
||
timestamp (struct mi_timestamp *tv)
|
||
{
|
||
using namespace std::chrono;
|
||
|
||
tv->wallclock = steady_clock::now ();
|
||
run_time_clock::now (tv->utime, tv->stime);
|
||
}
|
||
|
||
static void
|
||
print_diff_now (struct ui_file *file, struct mi_timestamp *start)
|
||
{
|
||
struct mi_timestamp now;
|
||
|
||
timestamp (&now);
|
||
print_diff (file, start, &now);
|
||
}
|
||
|
||
void
|
||
mi_print_timing_maybe (struct ui_file *file)
|
||
{
|
||
/* If the command is -enable-timing then do_timings may be true
|
||
whilst current_command_ts is not initialized. */
|
||
if (do_timings && current_command_ts)
|
||
print_diff_now (file, current_command_ts);
|
||
}
|
||
|
||
static void
|
||
print_diff (struct ui_file *file, struct mi_timestamp *start,
|
||
struct mi_timestamp *end)
|
||
{
|
||
using namespace std::chrono;
|
||
|
||
duration<double> wallclock = end->wallclock - start->wallclock;
|
||
duration<double> utime = end->utime - start->utime;
|
||
duration<double> stime = end->stime - start->stime;
|
||
|
||
fprintf_unfiltered
|
||
(file,
|
||
",time={wallclock=\"%0.5f\",user=\"%0.5f\",system=\"%0.5f\"}",
|
||
wallclock.count (), utime.count (), stime.count ());
|
||
}
|
||
|
||
void
|
||
mi_cmd_trace_define_variable (const char *command, char **argv, int argc)
|
||
{
|
||
LONGEST initval = 0;
|
||
struct trace_state_variable *tsv;
|
||
char *name = 0;
|
||
|
||
if (argc != 1 && argc != 2)
|
||
error (_("Usage: -trace-define-variable VARIABLE [VALUE]"));
|
||
|
||
name = argv[0];
|
||
if (*name++ != '$')
|
||
error (_("Name of trace variable should start with '$'"));
|
||
|
||
validate_trace_state_variable_name (name);
|
||
|
||
tsv = find_trace_state_variable (name);
|
||
if (!tsv)
|
||
tsv = create_trace_state_variable (name);
|
||
|
||
if (argc == 2)
|
||
initval = value_as_long (parse_and_eval (argv[1]));
|
||
|
||
tsv->initial_value = initval;
|
||
}
|
||
|
||
void
|
||
mi_cmd_trace_list_variables (const char *command, char **argv, int argc)
|
||
{
|
||
if (argc != 0)
|
||
error (_("-trace-list-variables: no arguments allowed"));
|
||
|
||
tvariables_info_1 ();
|
||
}
|
||
|
||
void
|
||
mi_cmd_trace_find (const char *command, char **argv, int argc)
|
||
{
|
||
char *mode;
|
||
|
||
if (argc == 0)
|
||
error (_("trace selection mode is required"));
|
||
|
||
mode = argv[0];
|
||
|
||
if (strcmp (mode, "none") == 0)
|
||
{
|
||
tfind_1 (tfind_number, -1, 0, 0, 0);
|
||
return;
|
||
}
|
||
|
||
check_trace_running (current_trace_status ());
|
||
|
||
if (strcmp (mode, "frame-number") == 0)
|
||
{
|
||
if (argc != 2)
|
||
error (_("frame number is required"));
|
||
tfind_1 (tfind_number, atoi (argv[1]), 0, 0, 0);
|
||
}
|
||
else if (strcmp (mode, "tracepoint-number") == 0)
|
||
{
|
||
if (argc != 2)
|
||
error (_("tracepoint number is required"));
|
||
tfind_1 (tfind_tp, atoi (argv[1]), 0, 0, 0);
|
||
}
|
||
else if (strcmp (mode, "pc") == 0)
|
||
{
|
||
if (argc != 2)
|
||
error (_("PC is required"));
|
||
tfind_1 (tfind_pc, 0, parse_and_eval_address (argv[1]), 0, 0);
|
||
}
|
||
else if (strcmp (mode, "pc-inside-range") == 0)
|
||
{
|
||
if (argc != 3)
|
||
error (_("Start and end PC are required"));
|
||
tfind_1 (tfind_range, 0, parse_and_eval_address (argv[1]),
|
||
parse_and_eval_address (argv[2]), 0);
|
||
}
|
||
else if (strcmp (mode, "pc-outside-range") == 0)
|
||
{
|
||
if (argc != 3)
|
||
error (_("Start and end PC are required"));
|
||
tfind_1 (tfind_outside, 0, parse_and_eval_address (argv[1]),
|
||
parse_and_eval_address (argv[2]), 0);
|
||
}
|
||
else if (strcmp (mode, "line") == 0)
|
||
{
|
||
if (argc != 2)
|
||
error (_("Line is required"));
|
||
|
||
std::vector<symtab_and_line> sals
|
||
= decode_line_with_current_source (argv[1],
|
||
DECODE_LINE_FUNFIRSTLINE);
|
||
const symtab_and_line &sal = sals[0];
|
||
|
||
if (sal.symtab == 0)
|
||
error (_("Could not find the specified line"));
|
||
|
||
CORE_ADDR start_pc, end_pc;
|
||
if (sal.line > 0 && find_line_pc_range (sal, &start_pc, &end_pc))
|
||
tfind_1 (tfind_range, 0, start_pc, end_pc - 1, 0);
|
||
else
|
||
error (_("Could not find the specified line"));
|
||
}
|
||
else
|
||
error (_("Invalid mode '%s'"), mode);
|
||
|
||
if (has_stack_frames () || get_traceframe_number () >= 0)
|
||
print_stack_frame (get_selected_frame (NULL), 1, LOC_AND_ADDRESS, 1);
|
||
}
|
||
|
||
void
|
||
mi_cmd_trace_save (const char *command, char **argv, int argc)
|
||
{
|
||
int target_saves = 0;
|
||
int generate_ctf = 0;
|
||
char *filename;
|
||
int oind = 0;
|
||
char *oarg;
|
||
|
||
enum opt
|
||
{
|
||
TARGET_SAVE_OPT, CTF_OPT
|
||
};
|
||
static const struct mi_opt opts[] =
|
||
{
|
||
{"r", TARGET_SAVE_OPT, 0},
|
||
{"ctf", CTF_OPT, 0},
|
||
{ 0, 0, 0 }
|
||
};
|
||
|
||
while (1)
|
||
{
|
||
int opt = mi_getopt ("-trace-save", argc, argv, opts,
|
||
&oind, &oarg);
|
||
|
||
if (opt < 0)
|
||
break;
|
||
switch ((enum opt) opt)
|
||
{
|
||
case TARGET_SAVE_OPT:
|
||
target_saves = 1;
|
||
break;
|
||
case CTF_OPT:
|
||
generate_ctf = 1;
|
||
break;
|
||
}
|
||
}
|
||
|
||
if (argc - oind != 1)
|
||
error (_("Exactly one argument required "
|
||
"(file in which to save trace data)"));
|
||
|
||
filename = argv[oind];
|
||
|
||
if (generate_ctf)
|
||
trace_save_ctf (filename, target_saves);
|
||
else
|
||
trace_save_tfile (filename, target_saves);
|
||
}
|
||
|
||
void
|
||
mi_cmd_trace_start (const char *command, char **argv, int argc)
|
||
{
|
||
start_tracing (NULL);
|
||
}
|
||
|
||
void
|
||
mi_cmd_trace_status (const char *command, char **argv, int argc)
|
||
{
|
||
trace_status_mi (0);
|
||
}
|
||
|
||
void
|
||
mi_cmd_trace_stop (const char *command, char **argv, int argc)
|
||
{
|
||
stop_tracing (NULL);
|
||
trace_status_mi (1);
|
||
}
|
||
|
||
/* Implement the "-ada-task-info" command. */
|
||
|
||
void
|
||
mi_cmd_ada_task_info (const char *command, char **argv, int argc)
|
||
{
|
||
if (argc != 0 && argc != 1)
|
||
error (_("Invalid MI command"));
|
||
|
||
print_ada_task_info (current_uiout, argv[0], current_inferior ());
|
||
}
|
||
|
||
/* Print EXPRESSION according to VALUES. */
|
||
|
||
static void
|
||
print_variable_or_computed (const char *expression, enum print_values values)
|
||
{
|
||
struct value *val;
|
||
struct type *type;
|
||
struct ui_out *uiout = current_uiout;
|
||
|
||
string_file stb;
|
||
|
||
expression_up expr = parse_expression (expression);
|
||
|
||
if (values == PRINT_SIMPLE_VALUES)
|
||
val = evaluate_type (expr.get ());
|
||
else
|
||
val = evaluate_expression (expr.get ());
|
||
|
||
gdb::optional<ui_out_emit_tuple> tuple_emitter;
|
||
if (values != PRINT_NO_VALUES)
|
||
tuple_emitter.emplace (uiout, nullptr);
|
||
uiout->field_string ("name", expression);
|
||
|
||
switch (values)
|
||
{
|
||
case PRINT_SIMPLE_VALUES:
|
||
type = check_typedef (value_type (val));
|
||
type_print (value_type (val), "", &stb, -1);
|
||
uiout->field_stream ("type", stb);
|
||
if (TYPE_CODE (type) != TYPE_CODE_ARRAY
|
||
&& TYPE_CODE (type) != TYPE_CODE_STRUCT
|
||
&& TYPE_CODE (type) != TYPE_CODE_UNION)
|
||
{
|
||
struct value_print_options opts;
|
||
|
||
get_no_prettyformat_print_options (&opts);
|
||
opts.deref_ref = 1;
|
||
common_val_print (val, &stb, 0, &opts, current_language);
|
||
uiout->field_stream ("value", stb);
|
||
}
|
||
break;
|
||
case PRINT_ALL_VALUES:
|
||
{
|
||
struct value_print_options opts;
|
||
|
||
get_no_prettyformat_print_options (&opts);
|
||
opts.deref_ref = 1;
|
||
common_val_print (val, &stb, 0, &opts, current_language);
|
||
uiout->field_stream ("value", stb);
|
||
}
|
||
break;
|
||
}
|
||
}
|
||
|
||
/* Implement the "-trace-frame-collected" command. */
|
||
|
||
void
|
||
mi_cmd_trace_frame_collected (const char *command, char **argv, int argc)
|
||
{
|
||
struct bp_location *tloc;
|
||
int stepping_frame;
|
||
struct collection_list *clist;
|
||
struct collection_list tracepoint_list, stepping_list;
|
||
struct traceframe_info *tinfo;
|
||
int oind = 0;
|
||
enum print_values var_print_values = PRINT_ALL_VALUES;
|
||
enum print_values comp_print_values = PRINT_ALL_VALUES;
|
||
int registers_format = 'x';
|
||
int memory_contents = 0;
|
||
struct ui_out *uiout = current_uiout;
|
||
enum opt
|
||
{
|
||
VAR_PRINT_VALUES,
|
||
COMP_PRINT_VALUES,
|
||
REGISTERS_FORMAT,
|
||
MEMORY_CONTENTS,
|
||
};
|
||
static const struct mi_opt opts[] =
|
||
{
|
||
{"-var-print-values", VAR_PRINT_VALUES, 1},
|
||
{"-comp-print-values", COMP_PRINT_VALUES, 1},
|
||
{"-registers-format", REGISTERS_FORMAT, 1},
|
||
{"-memory-contents", MEMORY_CONTENTS, 0},
|
||
{ 0, 0, 0 }
|
||
};
|
||
|
||
while (1)
|
||
{
|
||
char *oarg;
|
||
int opt = mi_getopt ("-trace-frame-collected", argc, argv, opts,
|
||
&oind, &oarg);
|
||
if (opt < 0)
|
||
break;
|
||
switch ((enum opt) opt)
|
||
{
|
||
case VAR_PRINT_VALUES:
|
||
var_print_values = mi_parse_print_values (oarg);
|
||
break;
|
||
case COMP_PRINT_VALUES:
|
||
comp_print_values = mi_parse_print_values (oarg);
|
||
break;
|
||
case REGISTERS_FORMAT:
|
||
registers_format = oarg[0];
|
||
case MEMORY_CONTENTS:
|
||
memory_contents = 1;
|
||
break;
|
||
}
|
||
}
|
||
|
||
if (oind != argc)
|
||
error (_("Usage: -trace-frame-collected "
|
||
"[--var-print-values PRINT_VALUES] "
|
||
"[--comp-print-values PRINT_VALUES] "
|
||
"[--registers-format FORMAT]"
|
||
"[--memory-contents]"));
|
||
|
||
/* This throws an error is not inspecting a trace frame. */
|
||
tloc = get_traceframe_location (&stepping_frame);
|
||
|
||
/* This command only makes sense for the current frame, not the
|
||
selected frame. */
|
||
scoped_restore_current_thread restore_thread;
|
||
select_frame (get_current_frame ());
|
||
|
||
encode_actions (tloc, &tracepoint_list, &stepping_list);
|
||
|
||
if (stepping_frame)
|
||
clist = &stepping_list;
|
||
else
|
||
clist = &tracepoint_list;
|
||
|
||
tinfo = get_traceframe_info ();
|
||
|
||
/* Explicitly wholly collected variables. */
|
||
{
|
||
ui_out_emit_list list_emitter (uiout, "explicit-variables");
|
||
const std::vector<std::string> &wholly_collected
|
||
= clist->wholly_collected ();
|
||
for (size_t i = 0; i < wholly_collected.size (); i++)
|
||
{
|
||
const std::string &str = wholly_collected[i];
|
||
print_variable_or_computed (str.c_str (), var_print_values);
|
||
}
|
||
}
|
||
|
||
/* Computed expressions. */
|
||
{
|
||
ui_out_emit_list list_emitter (uiout, "computed-expressions");
|
||
|
||
const std::vector<std::string> &computed = clist->computed ();
|
||
for (size_t i = 0; i < computed.size (); i++)
|
||
{
|
||
const std::string &str = computed[i];
|
||
print_variable_or_computed (str.c_str (), comp_print_values);
|
||
}
|
||
}
|
||
|
||
/* Registers. Given pseudo-registers, and that some architectures
|
||
(like MIPS) actually hide the raw registers, we don't go through
|
||
the trace frame info, but instead consult the register cache for
|
||
register availability. */
|
||
{
|
||
struct frame_info *frame;
|
||
struct gdbarch *gdbarch;
|
||
int regnum;
|
||
int numregs;
|
||
|
||
ui_out_emit_list list_emitter (uiout, "registers");
|
||
|
||
frame = get_selected_frame (NULL);
|
||
gdbarch = get_frame_arch (frame);
|
||
numregs = gdbarch_num_regs (gdbarch) + gdbarch_num_pseudo_regs (gdbarch);
|
||
|
||
for (regnum = 0; regnum < numregs; regnum++)
|
||
{
|
||
if (gdbarch_register_name (gdbarch, regnum) == NULL
|
||
|| *(gdbarch_register_name (gdbarch, regnum)) == '\0')
|
||
continue;
|
||
|
||
output_register (frame, regnum, registers_format, 1);
|
||
}
|
||
}
|
||
|
||
/* Trace state variables. */
|
||
{
|
||
ui_out_emit_list list_emitter (uiout, "tvars");
|
||
|
||
for (int tvar : tinfo->tvars)
|
||
{
|
||
struct trace_state_variable *tsv;
|
||
|
||
tsv = find_trace_state_variable_by_number (tvar);
|
||
|
||
ui_out_emit_tuple tuple_emitter (uiout, NULL);
|
||
|
||
if (tsv != NULL)
|
||
{
|
||
uiout->field_fmt ("name", "$%s", tsv->name.c_str ());
|
||
|
||
tsv->value_known = target_get_trace_state_variable_value (tsv->number,
|
||
&tsv->value);
|
||
uiout->field_int ("current", tsv->value);
|
||
}
|
||
else
|
||
{
|
||
uiout->field_skip ("name");
|
||
uiout->field_skip ("current");
|
||
}
|
||
}
|
||
}
|
||
|
||
/* Memory. */
|
||
{
|
||
std::vector<mem_range> available_memory;
|
||
|
||
traceframe_available_memory (&available_memory, 0, ULONGEST_MAX);
|
||
|
||
ui_out_emit_list list_emitter (uiout, "memory");
|
||
|
||
for (const mem_range &r : available_memory)
|
||
{
|
||
struct gdbarch *gdbarch = target_gdbarch ();
|
||
|
||
ui_out_emit_tuple tuple_emitter (uiout, NULL);
|
||
|
||
uiout->field_core_addr ("address", gdbarch, r.start);
|
||
uiout->field_int ("length", r.length);
|
||
|
||
gdb::byte_vector data (r.length);
|
||
|
||
if (memory_contents)
|
||
{
|
||
if (target_read_memory (r.start, data.data (), r.length) == 0)
|
||
{
|
||
std::string data_str = bin2hex (data.data (), r.length);
|
||
uiout->field_string ("contents", data_str.c_str ());
|
||
}
|
||
else
|
||
uiout->field_skip ("contents");
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
void
|
||
_initialize_mi_main (void)
|
||
{
|
||
struct cmd_list_element *c;
|
||
|
||
add_setshow_boolean_cmd ("mi-async", class_run,
|
||
&mi_async_1, _("\
|
||
Set whether MI asynchronous mode is enabled."), _("\
|
||
Show whether MI asynchronous mode is enabled."), _("\
|
||
Tells GDB whether MI should be in asynchronous mode."),
|
||
set_mi_async_command,
|
||
show_mi_async_command,
|
||
&setlist,
|
||
&showlist);
|
||
|
||
/* Alias old "target-async" to "mi-async". */
|
||
c = add_alias_cmd ("target-async", "mi-async", class_run, 0, &setlist);
|
||
deprecate_cmd (c, "set mi-async");
|
||
c = add_alias_cmd ("target-async", "mi-async", class_run, 0, &showlist);
|
||
deprecate_cmd (c, "show mi-async");
|
||
}
|