mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-09 04:21:49 +08:00
f6ac5f3d63
I.e., use C++ virtual methods and inheritance instead of tables of function pointers. Unfortunately, there's no way to do a smooth transition. ALL native targets in the tree must be converted at the same time. I've tested all I could with cross compilers and with help from GCC compile farm, but naturally I haven't been able to test many of the ports. Still, I made a best effort to port everything over, and while I expect some build problems due to typos and such, which should be trivial to fix, I don't expect any design problems. * Implementation notes: - The flattened current_target is gone. References to current_target or current_target.beneath are replaced with references to target_stack (the top of the stack) directly. - To keep "set debug target" working, this adds a new debug_stratum layer that sits on top of the stack, prints the debug, and delegates to the target beneath. In addition, this makes the shortname and longname properties of target_ops be virtual methods instead of data fields, and makes the debug target defer those to the target beneath. This is so that debug code sprinkled around that does "if (debugtarget) ..." can transparently print the name of the target beneath. A patch later in the series actually splits out the shortname/longname methods to a separate structure, but I preferred to keep that chance separate as it is associated with changing a bit the design of how targets are registered and open. - Since you can't check whether a C++ virtual method is overridden, the old method of checking whether a target_ops implements a method by comparing the function pointer must be replaced with something else. Some cases are fixed by adding a parallel "can_do_foo" target_ops methods. E.g.,: + for (t = target_stack; t != NULL; t = t->beneath) { - if (t->to_create_inferior != NULL) + if (t->can_create_inferior ()) break; } Others are fixed by changing void return type to bool or int return type, and have the default implementation return false or -1, to indicate lack of support. - make-target-delegates was adjusted to generate C++ classes and methods. It needed tweaks to grok "virtual" in front of the target method name, and for the fact that methods are no longer function pointers. (In particular, the current code parsing the return type was simple because it could simply parse up until the '(' in '(*to_foo)'. It now generates a couple C++ classes that inherit target_ops: dummy_target and debug_target. Since we need to generate the class declarations as well, i.e., we need to emit methods twice, we now generate the code in two passes. - The core_target global is renamed to avoid conflict with the "core_target" class. - ctf/tfile targets init_tracefile_ops is replaced by a base class that is inherited by both ctf and tfile. - bsd-uthread The bsd_uthread_ops_hack hack is gone. It's not needed because nothing was extending a target created by bsd_uthread_target. - remote/extended-remote targets This is a first pass, just enough to C++ify target_ops. A later pass will convert more free functions to methods, and make remote_state be truly per remote instance, allowing multiple simultaneous instances of remote targets. - inf-child/"native" is converted to an actual base class (inf_child_target), that is inherited by all native targets. - GNU/Linux The old weird double-target linux_ops mechanism in linux-nat.c, is gone, replaced by adding a few virtual methods to linux-nat.h's target_ops, called low_XXX, that the concrete linux-nat implementations override. Sort of like gdbserver's linux_target_ops, but simpler, for requiring only one target_ops-like hierarchy, which spares implementing the same method twice when we need to forward the method to a low implementation. The low target simply reimplements the target_ops method directly in that case. There are a few remaining linux-nat.c hooks that would be better converted to low_ methods like above too. E.g.: linux_nat_set_new_thread (t, x86_linux_new_thread); linux_nat_set_new_fork (t, x86_linux_new_fork); linux_nat_set_forget_process That'll be done in a follow up patch. - We can no longer use functions like x86_use_watchpoints to install custom methods on an arbitrary base target. The patch replaces instances of such a pattern with template mixins. For example memory_breakpoint_target defined in target.h, or x86_nat_target in x86-nat.h. - linux_trad_target, MIPS and Alpha GNU/Linux The code in the new linux-nat-trad.h/c files which was split off of inf-ptrace.h/c recently, is converted to a C++ base class, and used by the MIPS and Alpha GNU/Linux ports. - BSD targets The $architecture x NetBSD/OpenBSD/FreeBSD support matrix complicates things a bit. There's common BSD target code, and there's common architecture-specific code shared between the different BSDs. Currently, all that is stiched together to form a final target, via the i386bsd_target, x86bsd_target, fbsd_nat_add_target functions etc. This introduces new fbsd_nat_target, obsd_nat_target and nbsd_nat_target classes that serve as base/prototype target for the corresponding BSD variant. And introduces generic i386/AMD64 BSD targets, to be used as template mixin to build a final target. Similarly, a generic SPARC target is added, used by both BSD and Linux ports. - bsd_kvm_add_target, BSD libkvm target I considered making bsd_kvm_supply_pcb a virtual method, and then have each port inherit bsd_kvm_target and override that method, but that was resulting in lots of unjustified churn, so I left the function pointer mechanism alone. gdb/ChangeLog: 2018-05-02 Pedro Alves <palves@redhat.com> John Baldwin <jhb@freebsd.org> * target.h (enum strata) <debug_stratum>: New. (struct target_ops) <all delegation methods>: Replace by C++ virtual methods, and drop "to_" prefix. All references updated throughout. <to_shortname, to_longname, to_doc, to_data, to_have_steppable_watchpoint, to_have_continuable_watchpoint, to_has_thread_control, to_attach_no_wait>: Delete, replaced by virtual methods. All references updated throughout. <can_attach, supports_terminal_ours, can_create_inferior, get_thread_control_capabilities, attach_no_wait>: New virtual methods. <insert_breakpoint, remove_breakpoint>: Now TARGET_DEFAULT_NORETURN methods. <info_proc>: Now returns bool. <to_magic>: Delete. (OPS_MAGIC): Delete. (current_target): Delete. All references replaced by references to ... (target_stack): ... this. New. (target_shortname, target_longname): Adjust. (target_can_run): Now a function declaration. (default_child_has_all_memory, default_child_has_memory) (default_child_has_stack, default_child_has_registers) (default_child_has_execution): Remove target_ops parameter. (complete_target_initialization): Delete. (memory_breakpoint_target): New template class. (test_target_ops): Refactor as a C++ class with virtual methods. * make-target-delegates (NAME_PART): Tighten. (POINTER_PART, CP_SYMBOL): New. (SIMPLE_RETURN_PART): Reimplement. (VEC_RETURN_PART): Expect less. (RETURN_PART, VIRTUAL_PART): New. (METHOD): Adjust to C++ virtual methods. (scan_target_h): Remove reference to C99. (dname): Output "target_ops::" prefix. (write_function_header): Adjust to output a C++ class method. (write_declaration): New. (write_delegator): Adjust to output a C++ class method. (tdname): Output "dummy_target::" prefix. (write_tdefault, write_debugmethod): Adjust to output a C++ class method. (tdefault_names, debug_names): Delete. (return_types, tdefaults, styles, argtypes_array): New. (top level): All methods are delegators. (print_class): New. (top level): Print dummy_target and debug_target classes. * target-delegates.c: Regenerate. * target-debug.h (target_debug_print_enum_info_proc_what) (target_debug_print_thread_control_capabilities) (target_debug_print_thread_info_p): New. * target.c (dummy_target): Delete. (the_dummy_target, the_debug_target): New. (target_stack): Now extern. (set_targetdebug): Push/unpush debug target. (default_child_has_all_memory, default_child_has_memory) (default_child_has_stack, default_child_has_registers) (default_child_has_execution): Remove target_ops parameter. (complete_target_initialization): Delete. (add_target_with_completer): No longer call complete_target_initialization. (target_supports_terminal_ours): Use regular delegation. (update_current_target): Delete. (push_target): No longer check magic number. Don't call update_current_target. (unpush_target): Don't call update_current_target. (target_is_pushed): No longer check magic number. (target_require_runnable): Skip for all stratums over process_stratum. (target_ops::info_proc): New. (target_info_proc): Use find_target_at and find_default_run_target. (target_supports_disable_randomization): Use regular delegation. (target_get_osdata): Use find_target_at. (target_ops::open, target_ops::close, target_ops::can_attach) (target_ops::attach, target_ops::can_create_inferior) (target_ops::create_inferior, target_ops::can_run) (target_can_run): New. (default_fileio_target): Use regular delegation. (target_ops::fileio_open, target_ops::fileio_pwrite) (target_ops::fileio_pread, target_ops::fileio_fstat) (target_ops::fileio_close, target_ops::fileio_unlink) (target_ops::fileio_readlink): New. (target_fileio_open_1, target_fileio_unlink) (target_fileio_readlink): Always call the target method. Handle FILEIO_ENOSYS. (return_zero, return_zero_has_execution): Delete. (init_dummy_target): Delete. (dummy_target::dummy_target, dummy_target::shortname) (dummy_target::longname, dummy_target::doc) (debug_target::debug_target, debug_target::shortname) (debug_target::longname, debug_target::doc): New. (target_supports_delete_record): Use regular delegation. (setup_target_debug): Delete. (maintenance_print_target_stack): Skip debug_stratum. (initialize_targets): Instantiate the_dummy_target and the_debug_target. * auxv.c (target_auxv_parse): Remove 'ops' parameter. Adjust to use target_stack. (target_auxv_search, fprint_target_auxv): Adjust. (info_auxv_command): Adjust to use target_stack. * auxv.h (target_auxv_parse): Remove 'ops' parameter. * exceptions.c (print_flush): Handle a NULL target_stack. * regcache.c (target_ops_no_register): Refactor as class with virtual methods. * exec.c (exec_target): New class. (exec_ops): Now an exec_target. (exec_open, exec_close_1, exec_get_section_table) (exec_xfer_partial, exec_files_info, exec_has_memory) (exec_make_note_section): Refactor as exec_target methods. (exec_file_clear, ignore, exec_remove_breakpoint, init_exec_ops): Delete. (exec_target::find_memory_regions): New. (_initialize_exec): Don't call init_exec_ops. * gdbcore.h (exec_file_clear): Delete. * corefile.c (core_target): Delete. (core_file_command): Adjust. * corelow.c (core_target): New class. (the_core_target): New. (core_close): Remove target_ops parameter. (core_close_cleanup): Adjust. (core_target::close): New. (core_open, core_detach, get_core_registers, core_files_info) (core_xfer_partial, core_thread_alive, core_read_description) (core_pid_to_str, core_thread_name, core_has_memory) (core_has_stack, core_has_registers, core_info_proc): Rework as core_target methods. (ignore, core_remove_breakpoint, init_core_ops): Delete. (_initialize_corelow): Initialize the_core_target. * gdbcore.h (core_target): Delete. (the_core_target): New. * ctf.c: (ctf_target): New class. (ctf_ops): Now a ctf_target. (ctf_open, ctf_close, ctf_files_info, ctf_fetch_registers) (ctf_xfer_partial, ctf_get_trace_state_variable_value) (ctf_trace_find, ctf_traceframe_info): Refactor as ctf_target methods. (init_ctf_ops): Delete. (_initialize_ctf): Don't call it. * tracefile-tfile.c (tfile_target): New class. (tfile_ops): Now a tfile_target. (tfile_open, tfile_close, tfile_files_info) (tfile_get_tracepoint_status, tfile_trace_find) (tfile_fetch_registers, tfile_xfer_partial) (tfile_get_trace_state_variable_value, tfile_traceframe_info): Refactor as tfile_target methods. (tfile_xfer_partial_features): Remove target_ops parameter. (init_tfile_ops): Delete. (_initialize_tracefile_tfile): Don't call it. * tracefile.c (tracefile_has_all_memory, tracefile_has_memory) (tracefile_has_stack, tracefile_has_registers) (tracefile_thread_alive, tracefile_get_trace_status): Refactor as tracefile_target methods. (init_tracefile_ops): Delete. (tracefile_target::tracefile_target): New. * tracefile.h: Include "target.h". (tracefile_target): New class. (init_tracefile_ops): Delete. * spu-multiarch.c (spu_multiarch_target): New class. (spu_ops): Now a spu_multiarch_target. (spu_thread_architecture, spu_region_ok_for_hw_watchpoint) (spu_fetch_registers, spu_store_registers, spu_xfer_partial) (spu_search_memory, spu_mourn_inferior): Refactor as spu_multiarch_target methods. (init_spu_ops): Delete. (_initialize_spu_multiarch): Remove references to init_spu_ops, complete_target_initialization. * ravenscar-thread.c (ravenscar_thread_target): New class. (ravenscar_ops): Now a ravenscar_thread_target. (ravenscar_resume, ravenscar_wait, ravenscar_update_thread_list) (ravenscar_thread_alive, ravenscar_pid_to_str) (ravenscar_fetch_registers, ravenscar_store_registers) (ravenscar_prepare_to_store, ravenscar_stopped_by_sw_breakpoint) (ravenscar_stopped_by_hw_breakpoint) (ravenscar_stopped_by_watchpoint, ravenscar_stopped_data_address) (ravenscar_mourn_inferior, ravenscar_core_of_thread) (ravenscar_get_ada_task_ptid): Refactor as ravenscar_thread_target methods. (init_ravenscar_thread_ops): Delete. (_initialize_ravenscar): Remove references to init_ravenscar_thread_ops and complete_target_initialization. * bsd-uthread.c (bsd_uthread_ops_hack): Delete. (bsd_uthread_target): New class. (bsd_uthread_ops): Now a bsd_uthread_target. (bsd_uthread_activate): Adjust to refer to bsd_uthread_ops. (bsd_uthread_close, bsd_uthread_mourn_inferior) (bsd_uthread_fetch_registers, bsd_uthread_store_registers) (bsd_uthread_wait, bsd_uthread_resume, bsd_uthread_thread_alive) (bsd_uthread_update_thread_list, bsd_uthread_extra_thread_info) (bsd_uthread_pid_to_str): Refactor as bsd_uthread_target methods. (bsd_uthread_target): Delete function. (_initialize_bsd_uthread): Remove reference to complete_target_initialization. * bfd-target.c (target_bfd_data): Delete. Fields folded into ... (target_bfd): ... this new class. (target_bfd_xfer_partial, target_bfd_get_section_table) (target_bfd_close): Refactor as target_bfd methods. (target_bfd::~target_bfd): New. (target_bfd_reopen): Adjust. (target_bfd::close): New. * record-btrace.c (record_btrace_target): New class. (record_btrace_ops): Now a record_btrace_target. (record_btrace_open, record_btrace_stop_recording) (record_btrace_disconnect, record_btrace_close) (record_btrace_async, record_btrace_info) (record_btrace_insn_history, record_btrace_insn_history_range) (record_btrace_insn_history_from, record_btrace_call_history) (record_btrace_call_history_range) (record_btrace_call_history_from, record_btrace_record_method) (record_btrace_is_replaying, record_btrace_will_replay) (record_btrace_xfer_partial, record_btrace_insert_breakpoint) (record_btrace_remove_breakpoint, record_btrace_fetch_registers) (record_btrace_store_registers, record_btrace_prepare_to_store) (record_btrace_to_get_unwinder) (record_btrace_to_get_tailcall_unwinder, record_btrace_resume) (record_btrace_commit_resume, record_btrace_wait) (record_btrace_stop, record_btrace_can_execute_reverse) (record_btrace_stopped_by_sw_breakpoint) (record_btrace_supports_stopped_by_sw_breakpoint) (record_btrace_stopped_by_hw_breakpoint) (record_btrace_supports_stopped_by_hw_breakpoint) (record_btrace_update_thread_list, record_btrace_thread_alive) (record_btrace_goto_begin, record_btrace_goto_end) (record_btrace_goto, record_btrace_stop_replaying_all) (record_btrace_execution_direction) (record_btrace_prepare_to_generate_core) (record_btrace_done_generating_core): Refactor as record_btrace_target methods. (init_record_btrace_ops): Delete. (_initialize_record_btrace): Remove reference to init_record_btrace_ops. * record-full.c (RECORD_FULL_IS_REPLAY): Adjust to always refer to the execution_direction global. (record_full_base_target, record_full_target) (record_full_core_target): New classes. (record_full_ops): Now a record_full_target. (record_full_core_ops): Now a record_full_core_target. (record_full_target::detach, record_full_target::disconnect) (record_full_core_target::disconnect) (record_full_target::mourn_inferior, record_full_target::kill): New. (record_full_open, record_full_close, record_full_async): Refactor as methods of the record_full_base_target class. (record_full_resume, record_full_commit_resume): Refactor as methods of the record_full_target class. (record_full_wait, record_full_stopped_by_watchpoint) (record_full_stopped_data_address) (record_full_stopped_by_sw_breakpoint) (record_full_supports_stopped_by_sw_breakpoint) (record_full_stopped_by_hw_breakpoint) (record_full_supports_stopped_by_hw_breakpoint): Refactor as methods of the record_full_base_target class. (record_full_store_registers, record_full_xfer_partial) (record_full_insert_breakpoint, record_full_remove_breakpoint): Refactor as methods of the record_full_target class. (record_full_can_execute_reverse, record_full_get_bookmark) (record_full_goto_bookmark, record_full_execution_direction) (record_full_record_method, record_full_info, record_full_delete) (record_full_is_replaying, record_full_will_replay) (record_full_goto_begin, record_full_goto_end, record_full_goto) (record_full_stop_replaying): Refactor as methods of the record_full_base_target class. (record_full_core_resume, record_full_core_kill) (record_full_core_fetch_registers) (record_full_core_prepare_to_store) (record_full_core_store_registers, record_full_core_xfer_partial) (record_full_core_insert_breakpoint) (record_full_core_remove_breakpoint) (record_full_core_has_execution): Refactor as methods of the record_full_core_target class. (record_full_base_target::supports_delete_record): New. (init_record_full_ops): Delete. (init_record_full_core_ops): Delete. (record_full_save): Refactor as method of the record_full_base_target class. (_initialize_record_full): Remove references to init_record_full_ops and init_record_full_core_ops. * remote.c (remote_target, extended_remote_target): New classes. (remote_ops): Now a remote_target. (extended_remote_ops): Now an extended_remote_target. (remote_insert_fork_catchpoint, remote_remove_fork_catchpoint) (remote_insert_vfork_catchpoint, remote_remove_vfork_catchpoint) (remote_insert_exec_catchpoint, remote_remove_exec_catchpoint) (remote_pass_signals, remote_set_syscall_catchpoint) (remote_program_signals, ) (remote_thread_always_alive): Remove target_ops parameter. (remote_thread_alive, remote_thread_name) (remote_update_thread_list, remote_threads_extra_info) (remote_static_tracepoint_marker_at) (remote_static_tracepoint_markers_by_strid) (remote_get_ada_task_ptid, remote_close, remote_start_remote) (remote_open): Refactor as methods of remote_target. (extended_remote_open, extended_remote_detach) (extended_remote_attach, extended_remote_post_attach): (extended_remote_supports_disable_randomization) (extended_remote_create_inferior): : Refactor as method of extended_remote_target. (remote_set_permissions, remote_open_1, remote_detach) (remote_follow_fork, remote_follow_exec, remote_disconnect) (remote_resume, remote_commit_resume, remote_stop) (remote_interrupt, remote_pass_ctrlc, remote_terminal_inferior) (remote_terminal_ours, remote_wait, remote_fetch_registers) (remote_prepare_to_store, remote_store_registers) (remote_flash_erase, remote_flash_done, remote_files_info) (remote_kill, remote_mourn, remote_insert_breakpoint) (remote_remove_breakpoint, remote_insert_watchpoint) (remote_watchpoint_addr_within_range) (remote_remove_watchpoint, remote_region_ok_for_hw_watchpoint) (remote_check_watch_resources, remote_stopped_by_sw_breakpoint) (remote_supports_stopped_by_sw_breakpoint) (remote_stopped_by_hw_breakpoint) (remote_supports_stopped_by_hw_breakpoint) (remote_stopped_by_watchpoint, remote_stopped_data_address) (remote_insert_hw_breakpoint, remote_remove_hw_breakpoint) (remote_verify_memory): Refactor as methods of remote_target. (remote_write_qxfer, remote_read_qxfer): Remove target_ops parameter. (remote_xfer_partial, remote_get_memory_xfer_limit) (remote_search_memory, remote_rcmd, remote_memory_map) (remote_pid_to_str, remote_get_thread_local_address) (remote_get_tib_address, remote_read_description): Refactor as methods of remote_target. (remote_target::fileio_open, remote_target::fileio_pwrite) (remote_target::fileio_pread, remote_target::fileio_close): New. (remote_hostio_readlink, remote_hostio_fstat) (remote_filesystem_is_local, remote_can_execute_reverse) (remote_supports_non_stop, remote_supports_disable_randomization) (remote_supports_multi_process, remote_supports_cond_breakpoints) (remote_supports_enable_disable_tracepoint) (remote_supports_string_tracing) (remote_can_run_breakpoint_commands, remote_trace_init) (remote_download_tracepoint, remote_can_download_tracepoint) (remote_download_trace_state_variable, remote_enable_tracepoint) (remote_disable_tracepoint, remote_trace_set_readonly_regions) (remote_trace_start, remote_get_trace_status) (remote_get_tracepoint_status, remote_trace_stop) (remote_trace_find, remote_get_trace_state_variable_value) (remote_save_trace_data, remote_get_raw_trace_data) (remote_set_disconnected_tracing, remote_core_of_thread) (remote_set_circular_trace_buffer, remote_traceframe_info) (remote_get_min_fast_tracepoint_insn_len) (remote_set_trace_buffer_size, remote_set_trace_notes) (remote_use_agent, remote_can_use_agent, remote_enable_btrace) (remote_disable_btrace, remote_teardown_btrace) (remote_read_btrace, remote_btrace_conf) (remote_augmented_libraries_svr4_read, remote_load) (remote_pid_to_exec_file, remote_can_do_single_step) (remote_execution_direction, remote_thread_handle_to_thread_info): Refactor as methods of remote_target. (init_remote_ops, init_extended_remote_ops): Delete. (remote_can_async_p, remote_is_async_p, remote_async) (remote_thread_events, remote_upload_tracepoints) (remote_upload_trace_state_variables): Refactor as methods of remote_target. (_initialize_remote): Remove references to init_remote_ops and init_extended_remote_ops. * remote-sim.c (gdbsim_target): New class. (gdbsim_fetch_register, gdbsim_store_register, gdbsim_kill) (gdbsim_load, gdbsim_create_inferior, gdbsim_open, gdbsim_close) (gdbsim_detach, gdbsim_resume, gdbsim_interrupt) (gdbsim_wait, gdbsim_prepare_to_store, gdbsim_xfer_partial) (gdbsim_files_info, gdbsim_mourn_inferior, gdbsim_thread_alive) (gdbsim_pid_to_str, gdbsim_has_all_memory, gdbsim_has_memory): Refactor as methods of gdbsim_target. (gdbsim_ops): Now a gdbsim_target. (init_gdbsim_ops): Delete. (gdbsim_cntrl_c): Adjust. (_initialize_remote_sim): Remove reference to init_gdbsim_ops. * amd64-linux-nat.c (amd64_linux_nat_target): New class. (the_amd64_linux_nat_target): New. (amd64_linux_fetch_inferior_registers) (amd64_linux_store_inferior_registers): Refactor as methods of amd64_linux_nat_target. (_initialize_amd64_linux_nat): Adjust. Set linux_target. * i386-linux-nat.c: Don't include "linux-nat.h". (i386_linux_nat_target): New class. (the_i386_linux_nat_target): New. (i386_linux_fetch_inferior_registers) (i386_linux_store_inferior_registers, i386_linux_resume): Refactor as methods of i386_linux_nat_target. (_initialize_i386_linux_nat): Adjust. Set linux_target. * inf-child.c (inf_child_ops): Delete. (inf_child_fetch_inferior_registers) (inf_child_store_inferior_registers): Delete. (inf_child_post_attach, inf_child_prepare_to_store): Refactor as methods of inf_child_target. (inf_child_target::supports_terminal_ours) (inf_child_target::terminal_init) (inf_child_target::terminal_inferior) (inf_child_target::terminal_ours_for_output) (inf_child_target::terminal_ours, inf_child_target::interrupt) (inf_child_target::pass_ctrlc, inf_child_target::terminal_info): New. (inf_child_open, inf_child_disconnect, inf_child_close) (inf_child_mourn_inferior, inf_child_maybe_unpush_target) (inf_child_post_startup_inferior, inf_child_can_run) (inf_child_pid_to_exec_file): Refactor as methods of inf_child_target. (inf_child_follow_fork): Delete. (inf_child_target::can_create_inferior) (inf_child_target::can_attach): New. (inf_child_target::has_all_memory, inf_child_target::has_memory) (inf_child_target::has_stack, inf_child_target::has_registers) (inf_child_target::has_execution): New. (inf_child_fileio_open, inf_child_fileio_pwrite) (inf_child_fileio_pread, inf_child_fileio_fstat) (inf_child_fileio_close, inf_child_fileio_unlink) (inf_child_fileio_readlink, inf_child_use_agent) (inf_child_can_use_agent): Refactor as methods of inf_child_target. (return_zero, inf_child_target): Delete. (inf_child_target::inf_child_target): New. * inf-child.h: Include "target.h". (inf_child_target): Delete function prototype. (inf_child_target): New class. (inf_child_open_target, inf_child_mourn_inferior) (inf_child_maybe_unpush_target): Delete. * inf-ptrace.c (inf_ptrace_target::~inf_ptrace_target): New. (inf_ptrace_follow_fork, inf_ptrace_insert_fork_catchpoint) (inf_ptrace_remove_fork_catchpoint, inf_ptrace_create_inferior) (inf_ptrace_post_startup_inferior, inf_ptrace_mourn_inferior) (inf_ptrace_attach, inf_ptrace_post_attach, inf_ptrace_detach) (inf_ptrace_detach_success, inf_ptrace_kill, inf_ptrace_resume) (inf_ptrace_wait, inf_ptrace_xfer_partial) (inf_ptrace_thread_alive, inf_ptrace_files_info) (inf_ptrace_pid_to_str, inf_ptrace_auxv_parse): Refactor as methods of inf_ptrace_target. (inf_ptrace_target): Delete function. * inf-ptrace.h: Include "inf-child.h". (inf_ptrace_target): Delete function declaration. (inf_ptrace_target): New class. (inf_ptrace_trad_target, inf_ptrace_detach_success): Delete. * linux-nat.c (linux_target): New. (linux_ops, linux_ops_saved, super_xfer_partial): Delete. (linux_nat_target::~linux_nat_target): New. (linux_child_post_attach, linux_child_post_startup_inferior) (linux_child_follow_fork, linux_child_insert_fork_catchpoint) (linux_child_remove_fork_catchpoint) (linux_child_insert_vfork_catchpoint) (linux_child_remove_vfork_catchpoint) (linux_child_insert_exec_catchpoint) (linux_child_remove_exec_catchpoint) (linux_child_set_syscall_catchpoint, linux_nat_pass_signals) (linux_nat_create_inferior, linux_nat_attach, linux_nat_detach) (linux_nat_resume, linux_nat_stopped_by_watchpoint) (linux_nat_stopped_data_address) (linux_nat_stopped_by_sw_breakpoint) (linux_nat_supports_stopped_by_sw_breakpoint) (linux_nat_stopped_by_hw_breakpoint) (linux_nat_supports_stopped_by_hw_breakpoint, linux_nat_wait) (linux_nat_kill, linux_nat_mourn_inferior) (linux_nat_xfer_partial, linux_nat_thread_alive) (linux_nat_update_thread_list, linux_nat_pid_to_str) (linux_nat_thread_name, linux_child_pid_to_exec_file) (linux_child_static_tracepoint_markers_by_strid) (linux_nat_is_async_p, linux_nat_can_async_p) (linux_nat_supports_non_stop, linux_nat_always_non_stop_p) (linux_nat_supports_multi_process) (linux_nat_supports_disable_randomization, linux_nat_async) (linux_nat_stop, linux_nat_close, linux_nat_thread_address_space) (linux_nat_core_of_thread, linux_nat_filesystem_is_local) (linux_nat_fileio_open, linux_nat_fileio_readlink) (linux_nat_fileio_unlink, linux_nat_thread_events): Refactor as methods of linux_nat_target. (linux_nat_wait_1, linux_xfer_siginfo, linux_proc_xfer_partial) (linux_proc_xfer_spu, linux_nat_xfer_osdata): Remove target_ops parameter. (check_stopped_by_watchpoint): Adjust. (linux_xfer_partial): Delete. (linux_target_install_ops, linux_target, linux_nat_add_target): Delete. (linux_nat_target::linux_nat_target): New. * linux-nat.h: Include "inf-ptrace.h". (linux_nat_target): New. (linux_target, linux_target_install_ops, linux_nat_add_target): Delete function declarations. (linux_target): Declare global. * linux-thread-db.c (thread_db_target): New. (thread_db_target::thread_db_target): New. (thread_db_ops): Delete. (the_thread_db_target): New. (thread_db_detach, thread_db_wait, thread_db_mourn_inferior) (thread_db_update_thread_list, thread_db_pid_to_str) (thread_db_extra_thread_info) (thread_db_thread_handle_to_thread_info) (thread_db_get_thread_local_address, thread_db_get_ada_task_ptid) (thread_db_resume): Refactor as methods of thread_db_target. (init_thread_db_ops): Delete. (_initialize_thread_db): Remove reference to init_thread_db_ops. * x86-linux-nat.c: Don't include "linux-nat.h". (super_post_startup_inferior): Delete. (x86_linux_nat_target::~x86_linux_nat_target): New. (x86_linux_child_post_startup_inferior) (x86_linux_read_description, x86_linux_enable_btrace) (x86_linux_disable_btrace, x86_linux_teardown_btrace) (x86_linux_read_btrace, x86_linux_btrace_conf): Refactor as methods of x86_linux_nat_target. (x86_linux_create_target): Delete. Bits folded ... (x86_linux_add_target): ... here. Now takes a linux_nat_target pointer. * x86-linux-nat.h: Include "linux-nat.h" and "x86-nat.h". (x86_linux_nat_target): New class. (x86_linux_create_target): Delete. (x86_linux_add_target): Now takes a linux_nat_target pointer. * x86-nat.c (x86_insert_watchpoint, x86_remove_watchpoint) (x86_region_ok_for_watchpoint, x86_stopped_data_address) (x86_stopped_by_watchpoint, x86_insert_hw_breakpoint) (x86_remove_hw_breakpoint, x86_can_use_hw_breakpoint) (x86_stopped_by_hw_breakpoint): Remove target_ops parameter and make extern. (x86_use_watchpoints): Delete. * x86-nat.h: Include "breakpoint.h" and "target.h". (x86_use_watchpoints): Delete. (x86_can_use_hw_breakpoint, x86_region_ok_for_hw_watchpoint) (x86_stopped_by_watchpoint, x86_stopped_data_address) (x86_insert_watchpoint, x86_remove_watchpoint) (x86_insert_hw_breakpoint, x86_remove_hw_breakpoint) (x86_stopped_by_hw_breakpoint): New declarations. (x86_nat_target): New template class. * ppc-linux-nat.c (ppc_linux_nat_target): New class. (the_ppc_linux_nat_target): New. (ppc_linux_fetch_inferior_registers) (ppc_linux_can_use_hw_breakpoint) (ppc_linux_region_ok_for_hw_watchpoint) (ppc_linux_ranged_break_num_registers) (ppc_linux_insert_hw_breakpoint, ppc_linux_remove_hw_breakpoint) (ppc_linux_insert_mask_watchpoint) (ppc_linux_remove_mask_watchpoint) (ppc_linux_can_accel_watchpoint_condition) (ppc_linux_insert_watchpoint, ppc_linux_remove_watchpoint) (ppc_linux_stopped_data_address, ppc_linux_stopped_by_watchpoint) (ppc_linux_watchpoint_addr_within_range) (ppc_linux_masked_watch_num_registers) (ppc_linux_store_inferior_registers, ppc_linux_auxv_parse) (ppc_linux_read_description): Refactor as methods of ppc_linux_nat_target. (_initialize_ppc_linux_nat): Adjust. Set linux_target. * procfs.c (procfs_xfer_partial): Delete forward declaration. (procfs_target): New class. (the_procfs_target): New. (procfs_target): Delete function. (procfs_auxv_parse, procfs_attach, procfs_detach) (procfs_fetch_registers, procfs_store_registers, procfs_wait) (procfs_xfer_partial, procfs_resume, procfs_pass_signals) (procfs_files_info, procfs_kill_inferior, procfs_mourn_inferior) (procfs_create_inferior, procfs_update_thread_list) (procfs_thread_alive, procfs_pid_to_str) (procfs_can_use_hw_breakpoint, procfs_stopped_by_watchpoint) (procfs_stopped_data_address, procfs_insert_watchpoint) (procfs_remove_watchpoint, procfs_region_ok_for_hw_watchpoint) (proc_find_memory_regions, procfs_info_proc) (procfs_make_note_section): Refactor as methods of procfs_target. (_initialize_procfs): Adjust. * sol-thread.c (sol_thread_target): New class. (sol_thread_ops): Now a sol_thread_target. (sol_thread_detach, sol_thread_resume, sol_thread_wait) (sol_thread_fetch_registers, sol_thread_store_registers) (sol_thread_xfer_partial, sol_thread_mourn_inferior) (sol_thread_alive, solaris_pid_to_str, sol_update_thread_list) (sol_get_ada_task_ptid): Refactor as methods of sol_thread_target. (init_sol_thread_ops): Delete. (_initialize_sol_thread): Adjust. Remove references to init_sol_thread_ops and complete_target_initialization. * windows-nat.c (windows_nat_target): New class. (windows_fetch_inferior_registers) (windows_store_inferior_registers, windows_resume, windows_wait) (windows_attach, windows_detach, windows_pid_to_exec_file) (windows_files_info, windows_create_inferior) (windows_mourn_inferior, windows_interrupt, windows_kill_inferior) (windows_close, windows_pid_to_str, windows_xfer_partial) (windows_get_tib_address, windows_get_ada_task_ptid) (windows_thread_name, windows_thread_alive): Refactor as windows_nat_target methods. (do_initial_windows_stuff): Adjust. (windows_target): Delete function. (_initialize_windows_nat): Adjust. * darwin-nat.c (darwin_resume, darwin_wait_to, darwin_interrupt) (darwin_mourn_inferior, darwin_kill_inferior) (darwin_create_inferior, darwin_attach, darwin_detach) (darwin_pid_to_str, darwin_thread_alive, darwin_xfer_partial) (darwin_pid_to_exec_file, darwin_get_ada_task_ptid) (darwin_supports_multi_process): Refactor as darwin_nat_target methods. (darwin_resume_to, darwin_files_info): Delete. (_initialize_darwin_inferior): Rename to ... (_initialize_darwin_nat): ... this. Adjust to C++ification. * darwin-nat.h: Include "inf-child.h". (darwin_nat_target): New class. (darwin_complete_target): Delete. * i386-darwin-nat.c (i386_darwin_nat_target): New class. (darwin_target): New. (i386_darwin_fetch_inferior_registers) (i386_darwin_store_inferior_registers): Refactor as methods of darwin_nat_target. (darwin_complete_target): Delete, with ... (_initialize_i386_darwin_nat): ... bits factored out here. * alpha-linux-nat.c (alpha_linux_nat_target): New class. (the_alpha_linux_nat_target): New. (alpha_linux_register_u_offset): Refactor as alpha_linux_nat_target method. (_initialize_alpha_linux_nat): Adjust. * linux-nat-trad.c (inf_ptrace_register_u_offset): Delete. (inf_ptrace_fetch_register, inf_ptrace_fetch_registers) (inf_ptrace_store_register, inf_ptrace_store_registers): Refact as methods of linux_nat_trad_target. (linux_trad_target): Delete. * linux-nat-trad.h (linux_trad_target): Delete function. (linux_nat_trad_target): New class. * mips-linux-nat.c (mips_linux_nat_target): New class. (super_fetch_registers, super_store_registers, super_close): Delete. (the_mips_linux_nat_target): New. (mips64_linux_regsets_fetch_registers) (mips64_linux_regsets_store_registers) (mips64_linux_fetch_registers, mips64_linux_store_registers) (mips_linux_register_u_offset, mips_linux_read_description) (mips_linux_can_use_hw_breakpoint) (mips_linux_stopped_by_watchpoint) (mips_linux_stopped_data_address) (mips_linux_region_ok_for_hw_watchpoint) (mips_linux_insert_watchpoint, mips_linux_remove_watchpoint) (mips_linux_close): Refactor as methods of mips_linux_nat. (_initialize_mips_linux_nat): Adjust to C++ification. * aix-thread.c (aix_thread_target): New class. (aix_thread_ops): Now an aix_thread_target. (aix_thread_detach, aix_thread_resume, aix_thread_wait) (aix_thread_fetch_registers, aix_thread_store_registers) (aix_thread_xfer_partial, aix_thread_mourn_inferior) (aix_thread_thread_alive, aix_thread_pid_to_str) (aix_thread_extra_thread_info, aix_thread_get_ada_task_ptid): Refactor as methods of aix_thread_target. (init_aix_thread_ops): Delete. (_initialize_aix_thread): Remove references to init_aix_thread_ops and complete_target_initialization. * rs6000-nat.c (rs6000_xfer_shared_libraries): Delete. (rs6000_nat_target): New class. (the_rs6000_nat_target): New. (rs6000_fetch_inferior_registers, rs6000_store_inferior_registers) (rs6000_xfer_partial, rs6000_wait, rs6000_create_inferior) (rs6000_xfer_shared_libraries): Refactor as rs6000_nat_target methods. (super_create_inferior): Delete. (_initialize_rs6000_nat): Adjust to C++ification. * arm-linux-nat.c (arm_linux_nat_target): New class. (the_arm_linux_nat_target): New. (arm_linux_fetch_inferior_registers) (arm_linux_store_inferior_registers, arm_linux_read_description) (arm_linux_can_use_hw_breakpoint, arm_linux_insert_hw_breakpoint) (arm_linux_remove_hw_breakpoint) (arm_linux_region_ok_for_hw_watchpoint) (arm_linux_insert_watchpoint, arm_linux_remove_watchpoint) (arm_linux_stopped_data_address, arm_linux_stopped_by_watchpoint) (arm_linux_watchpoint_addr_within_range): Refactor as methods of arm_linux_nat_target. (_initialize_arm_linux_nat): Adjust to C++ification. * aarch64-linux-nat.c (aarch64_linux_nat_target): New class. (the_aarch64_linux_nat_target): New. (aarch64_linux_fetch_inferior_registers) (aarch64_linux_store_inferior_registers) (aarch64_linux_child_post_startup_inferior) (aarch64_linux_read_description) (aarch64_linux_can_use_hw_breakpoint) (aarch64_linux_insert_hw_breakpoint) (aarch64_linux_remove_hw_breakpoint) (aarch64_linux_insert_watchpoint, aarch64_linux_remove_watchpoint) (aarch64_linux_region_ok_for_hw_watchpoint) (aarch64_linux_stopped_data_address) (aarch64_linux_stopped_by_watchpoint) (aarch64_linux_watchpoint_addr_within_range) (aarch64_linux_can_do_single_step): Refactor as methods of aarch64_linux_nat_target. (super_post_startup_inferior): Delete. (_initialize_aarch64_linux_nat): Adjust to C++ification. * hppa-linux-nat.c (hppa_linux_nat_target): New class. (the_hppa_linux_nat_target): New. (hppa_linux_fetch_inferior_registers) (hppa_linux_store_inferior_registers): Refactor as methods of hppa_linux_nat_target. (_initialize_hppa_linux_nat): Adjust to C++ification. * ia64-linux-nat.c (ia64_linux_nat_target): New class. (the_ia64_linux_nat_target): New. (ia64_linux_insert_watchpoint, ia64_linux_remove_watchpoint) (ia64_linux_stopped_data_address) (ia64_linux_stopped_by_watchpoint, ia64_linux_fetch_registers) (ia64_linux_store_registers, ia64_linux_xfer_partial): Refactor as ia64_linux_nat_target methods. (super_xfer_partial): Delete. (_initialize_ia64_linux_nat): Adjust to C++ification. * m32r-linux-nat.c (m32r_linux_nat_target): New class. (the_m32r_linux_nat_target): New. (m32r_linux_fetch_inferior_registers) (m32r_linux_store_inferior_registers): Refactor as m32r_linux_nat_target methods. (_initialize_m32r_linux_nat): Adjust to C++ification. * m68k-linux-nat.c (m68k_linux_nat_target): New class. (the_m68k_linux_nat_target): New. (m68k_linux_fetch_inferior_registers) (m68k_linux_store_inferior_registers): Refactor as m68k_linux_nat_target methods. (_initialize_m68k_linux_nat): Adjust to C++ification. * s390-linux-nat.c (s390_linux_nat_target): New class. (the_s390_linux_nat_target): New. (s390_linux_fetch_inferior_registers) (s390_linux_store_inferior_registers, s390_stopped_by_watchpoint) (s390_insert_watchpoint, s390_remove_watchpoint) (s390_can_use_hw_breakpoint, s390_insert_hw_breakpoint) (s390_remove_hw_breakpoint, s390_region_ok_for_hw_watchpoint) (s390_auxv_parse, s390_read_description): Refactor as methods of s390_linux_nat_target. (_initialize_s390_nat): Adjust to C++ification. * sparc-linux-nat.c (sparc_linux_nat_target): New class. (the_sparc_linux_nat_target): New. (_initialize_sparc_linux_nat): Adjust to C++ification. * sparc-nat.c (sparc_fetch_inferior_registers) (sparc_store_inferior_registers): Remove target_ops parameter. * sparc-nat.h (sparc_fetch_inferior_registers) (sparc_store_inferior_registers): Remove target_ops parameter. * sparc64-linux-nat.c (sparc64_linux_nat_target): New class. (the_sparc64_linux_nat_target): New. (_initialize_sparc64_linux_nat): Adjust to C++ification. * spu-linux-nat.c (spu_linux_nat_target): New class. (the_spu_linux_nat_target): New. (spu_child_post_startup_inferior, spu_child_post_attach) (spu_child_wait, spu_fetch_inferior_registers) (spu_store_inferior_registers, spu_xfer_partial) (spu_can_use_hw_breakpoint): Refactor as spu_linux_nat_target methods. (_initialize_spu_nat): Adjust to C++ification. * tilegx-linux-nat.c (tilegx_linux_nat_target): New class. (the_tilegx_linux_nat_target): New. (fetch_inferior_registers, store_inferior_registers): Refactor as methods. (_initialize_tile_linux_nat): Adjust to C++ification. * xtensa-linux-nat.c (xtensa_linux_nat_target): New class. (the_xtensa_linux_nat_target): New. (xtensa_linux_fetch_inferior_registers) (xtensa_linux_store_inferior_registers): Refactor as xtensa_linux_nat_target methods. (_initialize_xtensa_linux_nat): Adjust to C++ification. * fbsd-nat.c (USE_SIGTRAP_SIGINFO): Delete. (fbsd_pid_to_exec_file, fbsd_find_memory_regions) (fbsd_find_memory_regions, fbsd_info_proc, fbsd_xfer_partial) (fbsd_thread_alive, fbsd_pid_to_str, fbsd_thread_name) (fbsd_update_thread_list, fbsd_resume, fbsd_wait) (fbsd_stopped_by_sw_breakpoint) (fbsd_supports_stopped_by_sw_breakpoint, fbsd_follow_fork) (fbsd_insert_fork_catchpoint, fbsd_remove_fork_catchpoint) (fbsd_insert_vfork_catchpoint, fbsd_remove_vfork_catchpoint) (fbsd_post_startup_inferior, fbsd_post_attach) (fbsd_insert_exec_catchpoint, fbsd_remove_exec_catchpoint) (fbsd_set_syscall_catchpoint) (super_xfer_partial, super_resume, super_wait) (fbsd_supports_stopped_by_hw_breakpoint): Delete. (fbsd_handle_debug_trap): Remove target_ops parameter. (fbsd_nat_add_target): Delete. * fbsd-nat.h: Include "inf-ptrace.h". (fbsd_nat_add_target): Delete. (USE_SIGTRAP_SIGINFO): Define. (fbsd_nat_target): New class. * amd64-bsd-nat.c (amd64bsd_fetch_inferior_registers) (amd64bsd_store_inferior_registers): Remove target_ops parameter. (amd64bsd_target): Delete. * amd64-bsd-nat.h: New file. * amd64-fbsd-nat.c: Include "amd64-bsd-nat.h" instead of "x86-bsd-nat.h". (amd64_fbsd_nat_target): New class. (the_amd64_fbsd_nat_target): New. (amd64fbsd_read_description): Refactor as method of amd64_fbsd_nat_target. (amd64_fbsd_nat_target::supports_stopped_by_hw_breakpoint): New. (_initialize_amd64fbsd_nat): Adjust to C++ification. * amd64-nat.h (amd64bsd_target): Delete function declaration. * i386-bsd-nat.c (i386bsd_fetch_inferior_registers) (i386bsd_store_inferior_registers): Remove target_ops parameter. (i386bsd_target): Delete. * i386-bsd-nat.h (i386bsd_target): Delete function declaration. (i386bsd_fetch_inferior_registers) (i386bsd_store_inferior_registers): Declare. (i386_bsd_nat_target): New class. * i386-fbsd-nat.c (i386_fbsd_nat_target): New class. (the_i386_fbsd_nat_target): New. (i386fbsd_resume, i386fbsd_read_description): Refactor as i386_fbsd_nat_target methods. (i386_fbsd_nat_target::supports_stopped_by_hw_breakpoint): New. (_initialize_i386fbsd_nat): Adjust to C++ification. * x86-bsd-nat.c (super_mourn_inferior): Delete. (x86bsd_mourn_inferior, x86bsd_target): Delete. (_initialize_x86_bsd_nat): Adjust to C++ification. * x86-bsd-nat.h: Include "x86-nat.h". (x86bsd_target): Delete declaration. (x86bsd_nat_target): New class. * aarch64-fbsd-nat.c (aarch64_fbsd_nat_target): New class. (the_aarch64_fbsd_nat_target): New. (aarch64_fbsd_fetch_inferior_registers) (aarch64_fbsd_store_inferior_registers): Refactor as methods of aarch64_fbsd_nat_target. (_initialize_aarch64_fbsd_nat): Adjust to C++ification. * alpha-bsd-nat.c (alpha_bsd_nat_target): New class. (the_alpha_bsd_nat_target): New. (alphabsd_fetch_inferior_registers) (alphabsd_store_inferior_registers): Refactor as alpha_bsd_nat_target methods. (_initialize_alphabsd_nat): Refactor as methods of alpha_bsd_nat_target. * amd64-nbsd-nat.c: Include "amd64-bsd-nat.h". (the_amd64_nbsd_nat_target): New. (_initialize_amd64nbsd_nat): Adjust to C++ification. * amd64-obsd-nat.c: Include "amd64-bsd-nat.h". (the_amd64_obsd_nat_target): New. (_initialize_amd64obsd_nat): Adjust to C++ification. * arm-fbsd-nat.c (arm_fbsd_nat_target): New. (the_arm_fbsd_nat_target): New. (arm_fbsd_fetch_inferior_registers) (arm_fbsd_store_inferior_registers, arm_fbsd_read_description): (_initialize_arm_fbsd_nat): Refactor as methods of arm_fbsd_nat_target. (_initialize_arm_fbsd_nat): Adjust to C++ification. * arm-nbsd-nat.c (arm_netbsd_nat_target): New class. (the_arm_netbsd_nat_target): New. (armnbsd_fetch_registers, armnbsd_store_registers): Refactor as arm_netbsd_nat_target. (_initialize_arm_netbsd_nat): Adjust to C++ification. * hppa-nbsd-nat.c (hppa_nbsd_nat_target): New class. (the_hppa_nbsd_nat_target): New. (hppanbsd_fetch_registers, hppanbsd_store_registers): Refactor as hppa_nbsd_nat_target methods. (_initialize_hppanbsd_nat): Adjust to C++ification. * hppa-obsd-nat.c (hppa_obsd_nat_target): New class. (the_hppa_obsd_nat_target): New. (hppaobsd_fetch_registers, hppaobsd_store_registers): Refactor as methods of hppa_obsd_nat_target. (_initialize_hppaobsd_nat): Adjust to C++ification. Use add_target. * i386-nbsd-nat.c (the_i386_nbsd_nat_target): New. (_initialize_i386nbsd_nat): Adjust to C++ification. Use add_target. * i386-obsd-nat.c (the_i386_obsd_nat_target): New. (_initialize_i386obsd_nat): Use add_target. * m68k-bsd-nat.c (m68k_bsd_nat_target): New class. (the_m68k_bsd_nat_target): New. (m68kbsd_fetch_inferior_registers) (m68kbsd_store_inferior_registers): Refactor as methods of m68k_bsd_nat_target. (_initialize_m68kbsd_nat): Adjust to C++ification. * mips-fbsd-nat.c (mips_fbsd_nat_target): New class. (the_mips_fbsd_nat_target): New. (mips_fbsd_fetch_inferior_registers) (mips_fbsd_store_inferior_registers): Refactor as methods of mips_fbsd_nat_target. (_initialize_mips_fbsd_nat): Adjust to C++ification. Use add_target. * mips-nbsd-nat.c (mips_nbsd_nat_target): New class. (the_mips_nbsd_nat_target): New. (mipsnbsd_fetch_inferior_registers) (mipsnbsd_store_inferior_registers): Refactor as methods of mips_nbsd_nat_target. (_initialize_mipsnbsd_nat): Adjust to C++ification. * mips64-obsd-nat.c (mips64_obsd_nat_target): New class. (the_mips64_obsd_nat_target): New. (mips64obsd_fetch_inferior_registers) (mips64obsd_store_inferior_registers): Refactor as methods of mips64_obsd_nat_target. (_initialize_mips64obsd_nat): Adjust to C++ification. Use add_target. * nbsd-nat.c (nbsd_pid_to_exec_file): Refactor as method of nbsd_nat_target. * nbsd-nat.h: Include "inf-ptrace.h". (nbsd_nat_target): New class. * obsd-nat.c (obsd_pid_to_str, obsd_update_thread_list) (obsd_wait): Refactor as methods of obsd_nat_target. (obsd_add_target): Delete. * obsd-nat.h: Include "inf-ptrace.h". (obsd_nat_target): New class. * ppc-fbsd-nat.c (ppc_fbsd_nat_target): New class. (the_ppc_fbsd_nat_target): New. (ppcfbsd_fetch_inferior_registers) (ppcfbsd_store_inferior_registers): Refactor as methods of ppc_fbsd_nat_target. (_initialize_ppcfbsd_nat): Adjust to C++ification. Use add_target. * ppc-nbsd-nat.c (ppc_nbsd_nat_target): New class. (the_ppc_nbsd_nat_target): New. (ppcnbsd_fetch_inferior_registers) (ppcnbsd_store_inferior_registers): Refactor as methods of ppc_nbsd_nat_target. (_initialize_ppcnbsd_nat): Adjust to C++ification. * ppc-obsd-nat.c (ppc_obsd_nat_target): New class. (the_ppc_obsd_nat_target): New. (ppcobsd_fetch_registers, ppcobsd_store_registers): Refactor as methods of ppc_obsd_nat_target. (_initialize_ppcobsd_nat): Adjust to C++ification. Use add_target. * sh-nbsd-nat.c (sh_nbsd_nat_target): New class. (the_sh_nbsd_nat_target): New. (shnbsd_fetch_inferior_registers) (shnbsd_store_inferior_registers): Refactor as methods of sh_nbsd_nat_target. (_initialize_shnbsd_nat): Adjust to C++ification. * sparc-nat.c (sparc_xfer_wcookie): Make extern. (inf_ptrace_xfer_partial): Delete. (sparc_xfer_partial, sparc_target): Delete. * sparc-nat.h (sparc_fetch_inferior_registers) (sparc_store_inferior_registers, sparc_xfer_wcookie): Declare. (sparc_target): Delete function declaration. (sparc_target): New template class. * sparc-nbsd-nat.c (the_sparc_nbsd_nat_target): New. (_initialize_sparcnbsd_nat): Adjust to C++ification. * sparc64-fbsd-nat.c (the_sparc64_fbsd_nat_target): New. (_initialize_sparc64fbsd_nat): Adjust to C++ification. Use add_target. * sparc64-nbsd-nat.c (the_sparc64_nbsd_nat_target): New. (_initialize_sparc64nbsd_nat): Adjust to C++ification. * sparc64-obsd-nat.c (the_sparc64_obsd_nat_target): New. (_initialize_sparc64obsd_nat): Adjust to C++ification. Use add_target. * vax-bsd-nat.c (vax_bsd_nat_target): New class. (the_vax_bsd_nat_target): New. (vaxbsd_fetch_inferior_registers) (vaxbsd_store_inferior_registers): Refactor as vax_bsd_nat_target methods. (_initialize_vaxbsd_nat): Adjust to C++ification. * bsd-kvm.c (bsd_kvm_target): New class. (bsd_kvm_ops): Now a bsd_kvm_target. (bsd_kvm_open, bsd_kvm_close, bsd_kvm_xfer_partial) (bsd_kvm_files_info, bsd_kvm_fetch_registers) (bsd_kvm_thread_alive, bsd_kvm_pid_to_str): Refactor as methods of bsd_kvm_target. (bsd_kvm_return_one): Delete. (bsd_kvm_add_target): Adjust to C++ification. * nto-procfs.c (nto_procfs_target, nto_procfs_target_native) (nto_procfs_target_procfs): New classes. (procfs_open_1, procfs_thread_alive, procfs_update_thread_list) (procfs_files_info, procfs_pid_to_exec_file, procfs_attach) (procfs_post_attach, procfs_wait, procfs_fetch_registers) (procfs_xfer_partial, procfs_detach, procfs_insert_breakpoint) (procfs_remove_breakpoint, procfs_insert_hw_breakpoint) (procfs_remove_hw_breakpoint, procfs_resume) (procfs_mourn_inferior, procfs_create_inferior, procfs_interrupt) (procfs_kill_inferior, procfs_store_registers) (procfs_pass_signals, procfs_pid_to_str, procfs_can_run): Refactor as methods of nto_procfs_target. (nto_procfs_ops): Now an nto_procfs_target_procfs. (nto_native_ops): Delete. (procfs_open, procfs_native_open): Delete. (nto_native_ops): Now an nto_procfs_target_native. (init_procfs_targets): Adjust to C++ification. (procfs_can_use_hw_breakpoint, procfs_remove_hw_watchpoint) (procfs_insert_hw_watchpoint, procfs_stopped_by_watchpoint): Refactor as methods of nto_procfs_target. * go32-nat.c (go32_nat_target): New class. (the_go32_nat_target): New. (go32_attach, go32_resume, go32_wait, go32_fetch_registers) (go32_store_registers, go32_xfer_partial, go32_files_info) (go32_kill_inferior, go32_create_inferior, go32_mourn_inferior) (go32_terminal_init, go32_terminal_info, go32_terminal_inferior) (go32_terminal_ours, go32_pass_ctrlc, go32_thread_alive) (go32_pid_to_str): Refactor as methods of go32_nat_target. (go32_target): Delete. (_initialize_go32_nat): Adjust to C++ification. * gnu-nat.c (gnu_wait, gnu_resume, gnu_kill_inferior) (gnu_mourn_inferior, gnu_create_inferior, gnu_attach, gnu_detach) (gnu_stop, gnu_thread_alive, gnu_xfer_partial) (gnu_find_memory_regions, gnu_pid_to_str): Refactor as methods of gnu_nat_target. (gnu_target): Delete. * gnu-nat.h (gnu_target): Delete. (gnu_nat_target): New class. * i386-gnu-nat.c (gnu_base_target): New. (i386_gnu_nat_target): New class. (the_i386_gnu_nat_target): New. (_initialize_i386gnu_nat): Adjust to C++ification. gdb/testsuite/ChangeLog: 2018-05-02 Pedro Alves <palves@redhat.com> * gdb.base/breakpoint-in-ro-region.exp: Adjust to to_resume and to_log_command renames. * gdb.base/sss-bp-on-user-bp-2.exp: Likewise.
1453 lines
49 KiB
C
1453 lines
49 KiB
C
/* Perform an inferior function call, for GDB, the GNU debugger.
|
|
|
|
Copyright (C) 1986-2018 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "infcall.h"
|
|
#include "breakpoint.h"
|
|
#include "tracepoint.h"
|
|
#include "target.h"
|
|
#include "regcache.h"
|
|
#include "inferior.h"
|
|
#include "infrun.h"
|
|
#include "block.h"
|
|
#include "gdbcore.h"
|
|
#include "language.h"
|
|
#include "objfiles.h"
|
|
#include "gdbcmd.h"
|
|
#include "command.h"
|
|
#include "dummy-frame.h"
|
|
#include "ada-lang.h"
|
|
#include "gdbthread.h"
|
|
#include "event-top.h"
|
|
#include "observable.h"
|
|
#include "top.h"
|
|
#include "interps.h"
|
|
#include "thread-fsm.h"
|
|
#include <algorithm>
|
|
|
|
/* If we can't find a function's name from its address,
|
|
we print this instead. */
|
|
#define RAW_FUNCTION_ADDRESS_FORMAT "at 0x%s"
|
|
#define RAW_FUNCTION_ADDRESS_SIZE (sizeof (RAW_FUNCTION_ADDRESS_FORMAT) \
|
|
+ 2 * sizeof (CORE_ADDR))
|
|
|
|
/* NOTE: cagney/2003-04-16: What's the future of this code?
|
|
|
|
GDB needs an asynchronous expression evaluator, that means an
|
|
asynchronous inferior function call implementation, and that in
|
|
turn means restructuring the code so that it is event driven. */
|
|
|
|
/* How you should pass arguments to a function depends on whether it
|
|
was defined in K&R style or prototype style. If you define a
|
|
function using the K&R syntax that takes a `float' argument, then
|
|
callers must pass that argument as a `double'. If you define the
|
|
function using the prototype syntax, then you must pass the
|
|
argument as a `float', with no promotion.
|
|
|
|
Unfortunately, on certain older platforms, the debug info doesn't
|
|
indicate reliably how each function was defined. A function type's
|
|
TYPE_PROTOTYPED flag may be clear, even if the function was defined
|
|
in prototype style. When calling a function whose TYPE_PROTOTYPED
|
|
flag is clear, GDB consults this flag to decide what to do.
|
|
|
|
For modern targets, it is proper to assume that, if the prototype
|
|
flag is clear, that can be trusted: `float' arguments should be
|
|
promoted to `double'. For some older targets, if the prototype
|
|
flag is clear, that doesn't tell us anything. The default is to
|
|
trust the debug information; the user can override this behavior
|
|
with "set coerce-float-to-double 0". */
|
|
|
|
static int coerce_float_to_double_p = 1;
|
|
static void
|
|
show_coerce_float_to_double_p (struct ui_file *file, int from_tty,
|
|
struct cmd_list_element *c, const char *value)
|
|
{
|
|
fprintf_filtered (file,
|
|
_("Coercion of floats to doubles "
|
|
"when calling functions is %s.\n"),
|
|
value);
|
|
}
|
|
|
|
/* This boolean tells what gdb should do if a signal is received while
|
|
in a function called from gdb (call dummy). If set, gdb unwinds
|
|
the stack and restore the context to what as it was before the
|
|
call.
|
|
|
|
The default is to stop in the frame where the signal was received. */
|
|
|
|
static int unwind_on_signal_p = 0;
|
|
static void
|
|
show_unwind_on_signal_p (struct ui_file *file, int from_tty,
|
|
struct cmd_list_element *c, const char *value)
|
|
{
|
|
fprintf_filtered (file,
|
|
_("Unwinding of stack if a signal is "
|
|
"received while in a call dummy is %s.\n"),
|
|
value);
|
|
}
|
|
|
|
/* This boolean tells what gdb should do if a std::terminate call is
|
|
made while in a function called from gdb (call dummy).
|
|
As the confines of a single dummy stack prohibit out-of-frame
|
|
handlers from handling a raised exception, and as out-of-frame
|
|
handlers are common in C++, this can lead to no handler being found
|
|
by the unwinder, and a std::terminate call. This is a false positive.
|
|
If set, gdb unwinds the stack and restores the context to what it
|
|
was before the call.
|
|
|
|
The default is to unwind the frame if a std::terminate call is
|
|
made. */
|
|
|
|
static int unwind_on_terminating_exception_p = 1;
|
|
|
|
static void
|
|
show_unwind_on_terminating_exception_p (struct ui_file *file, int from_tty,
|
|
struct cmd_list_element *c,
|
|
const char *value)
|
|
|
|
{
|
|
fprintf_filtered (file,
|
|
_("Unwind stack if a C++ exception is "
|
|
"unhandled while in a call dummy is %s.\n"),
|
|
value);
|
|
}
|
|
|
|
/* Perform the standard coercions that are specified
|
|
for arguments to be passed to C or Ada functions.
|
|
|
|
If PARAM_TYPE is non-NULL, it is the expected parameter type.
|
|
IS_PROTOTYPED is non-zero if the function declaration is prototyped.
|
|
SP is the stack pointer were additional data can be pushed (updating
|
|
its value as needed). */
|
|
|
|
static struct value *
|
|
value_arg_coerce (struct gdbarch *gdbarch, struct value *arg,
|
|
struct type *param_type, int is_prototyped, CORE_ADDR *sp)
|
|
{
|
|
const struct builtin_type *builtin = builtin_type (gdbarch);
|
|
struct type *arg_type = check_typedef (value_type (arg));
|
|
struct type *type
|
|
= param_type ? check_typedef (param_type) : arg_type;
|
|
|
|
/* Perform any Ada-specific coercion first. */
|
|
if (current_language->la_language == language_ada)
|
|
arg = ada_convert_actual (arg, type);
|
|
|
|
/* Force the value to the target if we will need its address. At
|
|
this point, we could allocate arguments on the stack instead of
|
|
calling malloc if we knew that their addresses would not be
|
|
saved by the called function. */
|
|
arg = value_coerce_to_target (arg);
|
|
|
|
switch (TYPE_CODE (type))
|
|
{
|
|
case TYPE_CODE_REF:
|
|
case TYPE_CODE_RVALUE_REF:
|
|
{
|
|
struct value *new_value;
|
|
|
|
if (TYPE_IS_REFERENCE (arg_type))
|
|
return value_cast_pointers (type, arg, 0);
|
|
|
|
/* Cast the value to the reference's target type, and then
|
|
convert it back to a reference. This will issue an error
|
|
if the value was not previously in memory - in some cases
|
|
we should clearly be allowing this, but how? */
|
|
new_value = value_cast (TYPE_TARGET_TYPE (type), arg);
|
|
new_value = value_ref (new_value, TYPE_CODE (type));
|
|
return new_value;
|
|
}
|
|
case TYPE_CODE_INT:
|
|
case TYPE_CODE_CHAR:
|
|
case TYPE_CODE_BOOL:
|
|
case TYPE_CODE_ENUM:
|
|
/* If we don't have a prototype, coerce to integer type if necessary. */
|
|
if (!is_prototyped)
|
|
{
|
|
if (TYPE_LENGTH (type) < TYPE_LENGTH (builtin->builtin_int))
|
|
type = builtin->builtin_int;
|
|
}
|
|
/* Currently all target ABIs require at least the width of an integer
|
|
type for an argument. We may have to conditionalize the following
|
|
type coercion for future targets. */
|
|
if (TYPE_LENGTH (type) < TYPE_LENGTH (builtin->builtin_int))
|
|
type = builtin->builtin_int;
|
|
break;
|
|
case TYPE_CODE_FLT:
|
|
if (!is_prototyped && coerce_float_to_double_p)
|
|
{
|
|
if (TYPE_LENGTH (type) < TYPE_LENGTH (builtin->builtin_double))
|
|
type = builtin->builtin_double;
|
|
else if (TYPE_LENGTH (type) > TYPE_LENGTH (builtin->builtin_double))
|
|
type = builtin->builtin_long_double;
|
|
}
|
|
break;
|
|
case TYPE_CODE_FUNC:
|
|
type = lookup_pointer_type (type);
|
|
break;
|
|
case TYPE_CODE_ARRAY:
|
|
/* Arrays are coerced to pointers to their first element, unless
|
|
they are vectors, in which case we want to leave them alone,
|
|
because they are passed by value. */
|
|
if (current_language->c_style_arrays)
|
|
if (!TYPE_VECTOR (type))
|
|
type = lookup_pointer_type (TYPE_TARGET_TYPE (type));
|
|
break;
|
|
case TYPE_CODE_UNDEF:
|
|
case TYPE_CODE_PTR:
|
|
case TYPE_CODE_STRUCT:
|
|
case TYPE_CODE_UNION:
|
|
case TYPE_CODE_VOID:
|
|
case TYPE_CODE_SET:
|
|
case TYPE_CODE_RANGE:
|
|
case TYPE_CODE_STRING:
|
|
case TYPE_CODE_ERROR:
|
|
case TYPE_CODE_MEMBERPTR:
|
|
case TYPE_CODE_METHODPTR:
|
|
case TYPE_CODE_METHOD:
|
|
case TYPE_CODE_COMPLEX:
|
|
default:
|
|
break;
|
|
}
|
|
|
|
return value_cast (type, arg);
|
|
}
|
|
|
|
/* See infcall.h. */
|
|
|
|
CORE_ADDR
|
|
find_function_addr (struct value *function,
|
|
struct type **retval_type,
|
|
struct type **function_type)
|
|
{
|
|
struct type *ftype = check_typedef (value_type (function));
|
|
struct gdbarch *gdbarch = get_type_arch (ftype);
|
|
struct type *value_type = NULL;
|
|
/* Initialize it just to avoid a GCC false warning. */
|
|
CORE_ADDR funaddr = 0;
|
|
|
|
/* If it's a member function, just look at the function
|
|
part of it. */
|
|
|
|
/* Determine address to call. */
|
|
if (TYPE_CODE (ftype) == TYPE_CODE_FUNC
|
|
|| TYPE_CODE (ftype) == TYPE_CODE_METHOD)
|
|
funaddr = value_address (function);
|
|
else if (TYPE_CODE (ftype) == TYPE_CODE_PTR)
|
|
{
|
|
funaddr = value_as_address (function);
|
|
ftype = check_typedef (TYPE_TARGET_TYPE (ftype));
|
|
if (TYPE_CODE (ftype) == TYPE_CODE_FUNC
|
|
|| TYPE_CODE (ftype) == TYPE_CODE_METHOD)
|
|
funaddr = gdbarch_convert_from_func_ptr_addr (gdbarch, funaddr,
|
|
target_stack);
|
|
}
|
|
if (TYPE_CODE (ftype) == TYPE_CODE_FUNC
|
|
|| TYPE_CODE (ftype) == TYPE_CODE_METHOD)
|
|
{
|
|
if (TYPE_GNU_IFUNC (ftype))
|
|
{
|
|
CORE_ADDR resolver_addr = funaddr;
|
|
|
|
/* Resolve the ifunc. Note this may call the resolver
|
|
function in the inferior. */
|
|
funaddr = gnu_ifunc_resolve_addr (gdbarch, resolver_addr);
|
|
|
|
/* Skip querying the function symbol if no RETVAL_TYPE or
|
|
FUNCTION_TYPE have been asked for. */
|
|
if (retval_type != NULL || function_type != NULL)
|
|
{
|
|
type *target_ftype = find_function_type (funaddr);
|
|
/* If we don't have debug info for the target function,
|
|
see if we can instead extract the target function's
|
|
type from the type that the resolver returns. */
|
|
if (target_ftype == NULL)
|
|
target_ftype = find_gnu_ifunc_target_type (resolver_addr);
|
|
if (target_ftype != NULL)
|
|
{
|
|
value_type = TYPE_TARGET_TYPE (check_typedef (target_ftype));
|
|
ftype = target_ftype;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
value_type = TYPE_TARGET_TYPE (ftype);
|
|
}
|
|
else if (TYPE_CODE (ftype) == TYPE_CODE_INT)
|
|
{
|
|
/* Handle the case of functions lacking debugging info.
|
|
Their values are characters since their addresses are char. */
|
|
if (TYPE_LENGTH (ftype) == 1)
|
|
funaddr = value_as_address (value_addr (function));
|
|
else
|
|
{
|
|
/* Handle function descriptors lacking debug info. */
|
|
int found_descriptor = 0;
|
|
|
|
funaddr = 0; /* pacify "gcc -Werror" */
|
|
if (VALUE_LVAL (function) == lval_memory)
|
|
{
|
|
CORE_ADDR nfunaddr;
|
|
|
|
funaddr = value_as_address (value_addr (function));
|
|
nfunaddr = funaddr;
|
|
funaddr = gdbarch_convert_from_func_ptr_addr (gdbarch, funaddr,
|
|
target_stack);
|
|
if (funaddr != nfunaddr)
|
|
found_descriptor = 1;
|
|
}
|
|
if (!found_descriptor)
|
|
/* Handle integer used as address of a function. */
|
|
funaddr = (CORE_ADDR) value_as_long (function);
|
|
}
|
|
}
|
|
else
|
|
error (_("Invalid data type for function to be called."));
|
|
|
|
if (retval_type != NULL)
|
|
*retval_type = value_type;
|
|
if (function_type != NULL)
|
|
*function_type = ftype;
|
|
return funaddr + gdbarch_deprecated_function_start_offset (gdbarch);
|
|
}
|
|
|
|
/* For CALL_DUMMY_ON_STACK, push a breakpoint sequence that the called
|
|
function returns to. */
|
|
|
|
static CORE_ADDR
|
|
push_dummy_code (struct gdbarch *gdbarch,
|
|
CORE_ADDR sp, CORE_ADDR funaddr,
|
|
struct value **args, int nargs,
|
|
struct type *value_type,
|
|
CORE_ADDR *real_pc, CORE_ADDR *bp_addr,
|
|
struct regcache *regcache)
|
|
{
|
|
gdb_assert (gdbarch_push_dummy_code_p (gdbarch));
|
|
|
|
return gdbarch_push_dummy_code (gdbarch, sp, funaddr,
|
|
args, nargs, value_type, real_pc, bp_addr,
|
|
regcache);
|
|
}
|
|
|
|
/* See infcall.h. */
|
|
|
|
void
|
|
error_call_unknown_return_type (const char *func_name)
|
|
{
|
|
if (func_name != NULL)
|
|
error (_("'%s' has unknown return type; "
|
|
"cast the call to its declared return type"),
|
|
func_name);
|
|
else
|
|
error (_("function has unknown return type; "
|
|
"cast the call to its declared return type"));
|
|
}
|
|
|
|
/* Fetch the name of the function at FUNADDR.
|
|
This is used in printing an error message for call_function_by_hand.
|
|
BUF is used to print FUNADDR in hex if the function name cannot be
|
|
determined. It must be large enough to hold formatted result of
|
|
RAW_FUNCTION_ADDRESS_FORMAT. */
|
|
|
|
static const char *
|
|
get_function_name (CORE_ADDR funaddr, char *buf, int buf_size)
|
|
{
|
|
{
|
|
struct symbol *symbol = find_pc_function (funaddr);
|
|
|
|
if (symbol)
|
|
return SYMBOL_PRINT_NAME (symbol);
|
|
}
|
|
|
|
{
|
|
/* Try the minimal symbols. */
|
|
struct bound_minimal_symbol msymbol = lookup_minimal_symbol_by_pc (funaddr);
|
|
|
|
if (msymbol.minsym)
|
|
return MSYMBOL_PRINT_NAME (msymbol.minsym);
|
|
}
|
|
|
|
{
|
|
char *tmp = xstrprintf (_(RAW_FUNCTION_ADDRESS_FORMAT),
|
|
hex_string (funaddr));
|
|
|
|
gdb_assert (strlen (tmp) + 1 <= buf_size);
|
|
strcpy (buf, tmp);
|
|
xfree (tmp);
|
|
return buf;
|
|
}
|
|
}
|
|
|
|
/* All the meta data necessary to extract the call's return value. */
|
|
|
|
struct call_return_meta_info
|
|
{
|
|
/* The caller frame's architecture. */
|
|
struct gdbarch *gdbarch;
|
|
|
|
/* The called function. */
|
|
struct value *function;
|
|
|
|
/* The return value's type. */
|
|
struct type *value_type;
|
|
|
|
/* Are we returning a value using a structure return or a normal
|
|
value return? */
|
|
int struct_return_p;
|
|
|
|
/* If using a structure return, this is the structure's address. */
|
|
CORE_ADDR struct_addr;
|
|
};
|
|
|
|
/* Extract the called function's return value. */
|
|
|
|
static struct value *
|
|
get_call_return_value (struct call_return_meta_info *ri)
|
|
{
|
|
struct value *retval = NULL;
|
|
bool stack_temporaries = thread_stack_temporaries_enabled_p (inferior_ptid);
|
|
|
|
if (TYPE_CODE (ri->value_type) == TYPE_CODE_VOID)
|
|
retval = allocate_value (ri->value_type);
|
|
else if (ri->struct_return_p)
|
|
{
|
|
if (stack_temporaries)
|
|
{
|
|
retval = value_from_contents_and_address (ri->value_type, NULL,
|
|
ri->struct_addr);
|
|
push_thread_stack_temporary (inferior_ptid, retval);
|
|
}
|
|
else
|
|
{
|
|
retval = allocate_value (ri->value_type);
|
|
read_value_memory (retval, 0, 1, ri->struct_addr,
|
|
value_contents_raw (retval),
|
|
TYPE_LENGTH (ri->value_type));
|
|
}
|
|
}
|
|
else
|
|
{
|
|
retval = allocate_value (ri->value_type);
|
|
gdbarch_return_value (ri->gdbarch, ri->function, ri->value_type,
|
|
get_current_regcache (),
|
|
value_contents_raw (retval), NULL);
|
|
if (stack_temporaries && class_or_union_p (ri->value_type))
|
|
{
|
|
/* Values of class type returned in registers are copied onto
|
|
the stack and their lval_type set to lval_memory. This is
|
|
required because further evaluation of the expression
|
|
could potentially invoke methods on the return value
|
|
requiring GDB to evaluate the "this" pointer. To evaluate
|
|
the this pointer, GDB needs the memory address of the
|
|
value. */
|
|
value_force_lval (retval, ri->struct_addr);
|
|
push_thread_stack_temporary (inferior_ptid, retval);
|
|
}
|
|
}
|
|
|
|
gdb_assert (retval != NULL);
|
|
return retval;
|
|
}
|
|
|
|
/* Data for the FSM that manages an infcall. It's main job is to
|
|
record the called function's return value. */
|
|
|
|
struct call_thread_fsm
|
|
{
|
|
/* The base class. */
|
|
struct thread_fsm thread_fsm;
|
|
|
|
/* All the info necessary to be able to extract the return
|
|
value. */
|
|
struct call_return_meta_info return_meta_info;
|
|
|
|
/* The called function's return value. This is extracted from the
|
|
target before the dummy frame is popped. */
|
|
struct value *return_value;
|
|
|
|
/* The top level that started the infcall (and is synchronously
|
|
waiting for it to end). */
|
|
struct ui *waiting_ui;
|
|
};
|
|
|
|
static int call_thread_fsm_should_stop (struct thread_fsm *self,
|
|
struct thread_info *thread);
|
|
static int call_thread_fsm_should_notify_stop (struct thread_fsm *self);
|
|
|
|
/* call_thread_fsm's vtable. */
|
|
|
|
static struct thread_fsm_ops call_thread_fsm_ops =
|
|
{
|
|
NULL, /*dtor */
|
|
NULL, /* clean_up */
|
|
call_thread_fsm_should_stop,
|
|
NULL, /* return_value */
|
|
NULL, /* async_reply_reason*/
|
|
call_thread_fsm_should_notify_stop,
|
|
};
|
|
|
|
/* Allocate a new call_thread_fsm object. */
|
|
|
|
static struct call_thread_fsm *
|
|
new_call_thread_fsm (struct ui *waiting_ui, struct interp *cmd_interp,
|
|
struct gdbarch *gdbarch, struct value *function,
|
|
struct type *value_type,
|
|
int struct_return_p, CORE_ADDR struct_addr)
|
|
{
|
|
struct call_thread_fsm *sm;
|
|
|
|
sm = XCNEW (struct call_thread_fsm);
|
|
thread_fsm_ctor (&sm->thread_fsm, &call_thread_fsm_ops, cmd_interp);
|
|
|
|
sm->return_meta_info.gdbarch = gdbarch;
|
|
sm->return_meta_info.function = function;
|
|
sm->return_meta_info.value_type = value_type;
|
|
sm->return_meta_info.struct_return_p = struct_return_p;
|
|
sm->return_meta_info.struct_addr = struct_addr;
|
|
|
|
sm->waiting_ui = waiting_ui;
|
|
|
|
return sm;
|
|
}
|
|
|
|
/* Implementation of should_stop method for infcalls. */
|
|
|
|
static int
|
|
call_thread_fsm_should_stop (struct thread_fsm *self,
|
|
struct thread_info *thread)
|
|
{
|
|
struct call_thread_fsm *f = (struct call_thread_fsm *) self;
|
|
|
|
if (stop_stack_dummy == STOP_STACK_DUMMY)
|
|
{
|
|
/* Done. */
|
|
thread_fsm_set_finished (self);
|
|
|
|
/* Stash the return value before the dummy frame is popped and
|
|
registers are restored to what they were before the
|
|
call.. */
|
|
f->return_value = get_call_return_value (&f->return_meta_info);
|
|
|
|
/* Break out of wait_sync_command_done. */
|
|
scoped_restore save_ui = make_scoped_restore (¤t_ui, f->waiting_ui);
|
|
target_terminal::ours ();
|
|
f->waiting_ui->prompt_state = PROMPT_NEEDED;
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
/* Implementation of should_notify_stop method for infcalls. */
|
|
|
|
static int
|
|
call_thread_fsm_should_notify_stop (struct thread_fsm *self)
|
|
{
|
|
if (thread_fsm_finished_p (self))
|
|
{
|
|
/* Infcall succeeded. Be silent and proceed with evaluating the
|
|
expression. */
|
|
return 0;
|
|
}
|
|
|
|
/* Something wrong happened. E.g., an unexpected breakpoint
|
|
triggered, or a signal was intercepted. Notify the stop. */
|
|
return 1;
|
|
}
|
|
|
|
/* Subroutine of call_function_by_hand to simplify it.
|
|
Start up the inferior and wait for it to stop.
|
|
Return the exception if there's an error, or an exception with
|
|
reason >= 0 if there's no error.
|
|
|
|
This is done inside a TRY_CATCH so the caller needn't worry about
|
|
thrown errors. The caller should rethrow if there's an error. */
|
|
|
|
static struct gdb_exception
|
|
run_inferior_call (struct call_thread_fsm *sm,
|
|
struct thread_info *call_thread, CORE_ADDR real_pc)
|
|
{
|
|
struct gdb_exception caught_error = exception_none;
|
|
int saved_in_infcall = call_thread->control.in_infcall;
|
|
ptid_t call_thread_ptid = call_thread->ptid;
|
|
enum prompt_state saved_prompt_state = current_ui->prompt_state;
|
|
int was_running = call_thread->state == THREAD_RUNNING;
|
|
int saved_ui_async = current_ui->async;
|
|
|
|
/* Infcalls run synchronously, in the foreground. */
|
|
current_ui->prompt_state = PROMPT_BLOCKED;
|
|
/* So that we don't print the prompt prematurely in
|
|
fetch_inferior_event. */
|
|
current_ui->async = 0;
|
|
|
|
delete_file_handler (current_ui->input_fd);
|
|
|
|
call_thread->control.in_infcall = 1;
|
|
|
|
clear_proceed_status (0);
|
|
|
|
/* Associate the FSM with the thread after clear_proceed_status
|
|
(otherwise it'd clear this FSM), and before anything throws, so
|
|
we don't leak it (and any resources it manages). */
|
|
call_thread->thread_fsm = &sm->thread_fsm;
|
|
|
|
disable_watchpoints_before_interactive_call_start ();
|
|
|
|
/* We want to print return value, please... */
|
|
call_thread->control.proceed_to_finish = 1;
|
|
|
|
TRY
|
|
{
|
|
proceed (real_pc, GDB_SIGNAL_0);
|
|
|
|
/* Inferior function calls are always synchronous, even if the
|
|
target supports asynchronous execution. */
|
|
wait_sync_command_done ();
|
|
}
|
|
CATCH (e, RETURN_MASK_ALL)
|
|
{
|
|
caught_error = e;
|
|
}
|
|
END_CATCH
|
|
|
|
/* If GDB has the prompt blocked before, then ensure that it remains
|
|
so. normal_stop calls async_enable_stdin, so reset the prompt
|
|
state again here. In other cases, stdin will be re-enabled by
|
|
inferior_event_handler, when an exception is thrown. */
|
|
current_ui->prompt_state = saved_prompt_state;
|
|
if (current_ui->prompt_state == PROMPT_BLOCKED)
|
|
delete_file_handler (current_ui->input_fd);
|
|
else
|
|
ui_register_input_event_handler (current_ui);
|
|
current_ui->async = saved_ui_async;
|
|
|
|
/* At this point the current thread may have changed. Refresh
|
|
CALL_THREAD as it could be invalid if its thread has exited. */
|
|
call_thread = find_thread_ptid (call_thread_ptid);
|
|
|
|
/* If the infcall does NOT succeed, normal_stop will have already
|
|
finished the thread states. However, on success, normal_stop
|
|
defers here, so that we can set back the thread states to what
|
|
they were before the call. Note that we must also finish the
|
|
state of new threads that might have spawned while the call was
|
|
running. The main cases to handle are:
|
|
|
|
- "(gdb) print foo ()", or any other command that evaluates an
|
|
expression at the prompt. (The thread was marked stopped before.)
|
|
|
|
- "(gdb) break foo if return_false()" or similar cases where we
|
|
do an infcall while handling an event (while the thread is still
|
|
marked running). In this example, whether the condition
|
|
evaluates true and thus we'll present a user-visible stop is
|
|
decided elsewhere. */
|
|
if (!was_running
|
|
&& ptid_equal (call_thread_ptid, inferior_ptid)
|
|
&& stop_stack_dummy == STOP_STACK_DUMMY)
|
|
finish_thread_state (user_visible_resume_ptid (0));
|
|
|
|
enable_watchpoints_after_interactive_call_stop ();
|
|
|
|
/* Call breakpoint_auto_delete on the current contents of the bpstat
|
|
of inferior call thread.
|
|
If all error()s out of proceed ended up calling normal_stop
|
|
(and perhaps they should; it already does in the special case
|
|
of error out of resume()), then we wouldn't need this. */
|
|
if (caught_error.reason < 0)
|
|
{
|
|
if (call_thread != NULL)
|
|
breakpoint_auto_delete (call_thread->control.stop_bpstat);
|
|
}
|
|
|
|
if (call_thread != NULL)
|
|
call_thread->control.in_infcall = saved_in_infcall;
|
|
|
|
return caught_error;
|
|
}
|
|
|
|
/* A cleanup function that calls delete_std_terminate_breakpoint. */
|
|
static void
|
|
cleanup_delete_std_terminate_breakpoint (void *ignore)
|
|
{
|
|
delete_std_terminate_breakpoint ();
|
|
}
|
|
|
|
/* See infcall.h. */
|
|
|
|
struct value *
|
|
call_function_by_hand (struct value *function,
|
|
type *default_return_type,
|
|
int nargs, struct value **args)
|
|
{
|
|
return call_function_by_hand_dummy (function, default_return_type,
|
|
nargs, args, NULL, NULL);
|
|
}
|
|
|
|
/* All this stuff with a dummy frame may seem unnecessarily complicated
|
|
(why not just save registers in GDB?). The purpose of pushing a dummy
|
|
frame which looks just like a real frame is so that if you call a
|
|
function and then hit a breakpoint (get a signal, etc), "backtrace"
|
|
will look right. Whether the backtrace needs to actually show the
|
|
stack at the time the inferior function was called is debatable, but
|
|
it certainly needs to not display garbage. So if you are contemplating
|
|
making dummy frames be different from normal frames, consider that. */
|
|
|
|
/* Perform a function call in the inferior.
|
|
ARGS is a vector of values of arguments (NARGS of them).
|
|
FUNCTION is a value, the function to be called.
|
|
Returns a value representing what the function returned.
|
|
May fail to return, if a breakpoint or signal is hit
|
|
during the execution of the function.
|
|
|
|
ARGS is modified to contain coerced values. */
|
|
|
|
struct value *
|
|
call_function_by_hand_dummy (struct value *function,
|
|
type *default_return_type,
|
|
int nargs, struct value **args,
|
|
dummy_frame_dtor_ftype *dummy_dtor,
|
|
void *dummy_dtor_data)
|
|
{
|
|
CORE_ADDR sp;
|
|
struct type *target_values_type;
|
|
unsigned char struct_return = 0, hidden_first_param_p = 0;
|
|
CORE_ADDR struct_addr = 0;
|
|
struct infcall_control_state *inf_status;
|
|
struct cleanup *inf_status_cleanup;
|
|
struct infcall_suspend_state *caller_state;
|
|
CORE_ADDR real_pc;
|
|
CORE_ADDR bp_addr;
|
|
struct frame_id dummy_id;
|
|
struct frame_info *frame;
|
|
struct gdbarch *gdbarch;
|
|
struct cleanup *terminate_bp_cleanup;
|
|
ptid_t call_thread_ptid;
|
|
struct gdb_exception e;
|
|
char name_buf[RAW_FUNCTION_ADDRESS_SIZE];
|
|
bool stack_temporaries = thread_stack_temporaries_enabled_p (inferior_ptid);
|
|
|
|
if (!target_has_execution)
|
|
noprocess ();
|
|
|
|
if (get_traceframe_number () >= 0)
|
|
error (_("May not call functions while looking at trace frames."));
|
|
|
|
if (execution_direction == EXEC_REVERSE)
|
|
error (_("Cannot call functions in reverse mode."));
|
|
|
|
frame = get_current_frame ();
|
|
gdbarch = get_frame_arch (frame);
|
|
|
|
if (!gdbarch_push_dummy_call_p (gdbarch))
|
|
error (_("This target does not support function calls."));
|
|
|
|
/* A cleanup for the inferior status.
|
|
This is only needed while we're preparing the inferior function call. */
|
|
inf_status = save_infcall_control_state ();
|
|
inf_status_cleanup
|
|
= make_cleanup_restore_infcall_control_state (inf_status);
|
|
|
|
/* Save the caller's registers and other state associated with the
|
|
inferior itself so that they can be restored once the
|
|
callee returns. To allow nested calls the registers are (further
|
|
down) pushed onto a dummy frame stack. Include a cleanup (which
|
|
is tossed once the regcache has been pushed). */
|
|
caller_state = save_infcall_suspend_state ();
|
|
make_cleanup_restore_infcall_suspend_state (caller_state);
|
|
|
|
/* Ensure that the initial SP is correctly aligned. */
|
|
{
|
|
CORE_ADDR old_sp = get_frame_sp (frame);
|
|
|
|
if (gdbarch_frame_align_p (gdbarch))
|
|
{
|
|
sp = gdbarch_frame_align (gdbarch, old_sp);
|
|
/* NOTE: cagney/2003-08-13: Skip the "red zone". For some
|
|
ABIs, a function can use memory beyond the inner most stack
|
|
address. AMD64 called that region the "red zone". Skip at
|
|
least the "red zone" size before allocating any space on
|
|
the stack. */
|
|
if (gdbarch_inner_than (gdbarch, 1, 2))
|
|
sp -= gdbarch_frame_red_zone_size (gdbarch);
|
|
else
|
|
sp += gdbarch_frame_red_zone_size (gdbarch);
|
|
/* Still aligned? */
|
|
gdb_assert (sp == gdbarch_frame_align (gdbarch, sp));
|
|
/* NOTE: cagney/2002-09-18:
|
|
|
|
On a RISC architecture, a void parameterless generic dummy
|
|
frame (i.e., no parameters, no result) typically does not
|
|
need to push anything the stack and hence can leave SP and
|
|
FP. Similarly, a frameless (possibly leaf) function does
|
|
not push anything on the stack and, hence, that too can
|
|
leave FP and SP unchanged. As a consequence, a sequence of
|
|
void parameterless generic dummy frame calls to frameless
|
|
functions will create a sequence of effectively identical
|
|
frames (SP, FP and TOS and PC the same). This, not
|
|
suprisingly, results in what appears to be a stack in an
|
|
infinite loop --- when GDB tries to find a generic dummy
|
|
frame on the internal dummy frame stack, it will always
|
|
find the first one.
|
|
|
|
To avoid this problem, the code below always grows the
|
|
stack. That way, two dummy frames can never be identical.
|
|
It does burn a few bytes of stack but that is a small price
|
|
to pay :-). */
|
|
if (sp == old_sp)
|
|
{
|
|
if (gdbarch_inner_than (gdbarch, 1, 2))
|
|
/* Stack grows down. */
|
|
sp = gdbarch_frame_align (gdbarch, old_sp - 1);
|
|
else
|
|
/* Stack grows up. */
|
|
sp = gdbarch_frame_align (gdbarch, old_sp + 1);
|
|
}
|
|
/* SP may have underflown address zero here from OLD_SP. Memory access
|
|
functions will probably fail in such case but that is a target's
|
|
problem. */
|
|
}
|
|
else
|
|
/* FIXME: cagney/2002-09-18: Hey, you loose!
|
|
|
|
Who knows how badly aligned the SP is!
|
|
|
|
If the generic dummy frame ends up empty (because nothing is
|
|
pushed) GDB won't be able to correctly perform back traces.
|
|
If a target is having trouble with backtraces, first thing to
|
|
do is add FRAME_ALIGN() to the architecture vector. If that
|
|
fails, try dummy_id().
|
|
|
|
If the ABI specifies a "Red Zone" (see the doco) the code
|
|
below will quietly trash it. */
|
|
sp = old_sp;
|
|
|
|
/* Skip over the stack temporaries that might have been generated during
|
|
the evaluation of an expression. */
|
|
if (stack_temporaries)
|
|
{
|
|
struct value *lastval;
|
|
|
|
lastval = get_last_thread_stack_temporary (inferior_ptid);
|
|
if (lastval != NULL)
|
|
{
|
|
CORE_ADDR lastval_addr = value_address (lastval);
|
|
|
|
if (gdbarch_inner_than (gdbarch, 1, 2))
|
|
{
|
|
gdb_assert (sp >= lastval_addr);
|
|
sp = lastval_addr;
|
|
}
|
|
else
|
|
{
|
|
gdb_assert (sp <= lastval_addr);
|
|
sp = lastval_addr + TYPE_LENGTH (value_type (lastval));
|
|
}
|
|
|
|
if (gdbarch_frame_align_p (gdbarch))
|
|
sp = gdbarch_frame_align (gdbarch, sp);
|
|
}
|
|
}
|
|
}
|
|
|
|
type *ftype;
|
|
type *values_type;
|
|
CORE_ADDR funaddr = find_function_addr (function, &values_type, &ftype);
|
|
|
|
if (values_type == NULL)
|
|
values_type = default_return_type;
|
|
if (values_type == NULL)
|
|
{
|
|
const char *name = get_function_name (funaddr,
|
|
name_buf, sizeof (name_buf));
|
|
error (_("'%s' has unknown return type; "
|
|
"cast the call to its declared return type"),
|
|
name);
|
|
}
|
|
|
|
values_type = check_typedef (values_type);
|
|
|
|
/* Are we returning a value using a structure return (passing a
|
|
hidden argument pointing to storage) or a normal value return?
|
|
There are two cases: language-mandated structure return and
|
|
target ABI structure return. The variable STRUCT_RETURN only
|
|
describes the latter. The language version is handled by passing
|
|
the return location as the first parameter to the function,
|
|
even preceding "this". This is different from the target
|
|
ABI version, which is target-specific; for instance, on ia64
|
|
the first argument is passed in out0 but the hidden structure
|
|
return pointer would normally be passed in r8. */
|
|
|
|
if (gdbarch_return_in_first_hidden_param_p (gdbarch, values_type))
|
|
{
|
|
hidden_first_param_p = 1;
|
|
|
|
/* Tell the target specific argument pushing routine not to
|
|
expect a value. */
|
|
target_values_type = builtin_type (gdbarch)->builtin_void;
|
|
}
|
|
else
|
|
{
|
|
struct_return = using_struct_return (gdbarch, function, values_type);
|
|
target_values_type = values_type;
|
|
}
|
|
|
|
gdb::observers::inferior_call_pre.notify (inferior_ptid, funaddr);
|
|
|
|
/* Determine the location of the breakpoint (and possibly other
|
|
stuff) that the called function will return to. The SPARC, for a
|
|
function returning a structure or union, needs to make space for
|
|
not just the breakpoint but also an extra word containing the
|
|
size (?) of the structure being passed. */
|
|
|
|
switch (gdbarch_call_dummy_location (gdbarch))
|
|
{
|
|
case ON_STACK:
|
|
{
|
|
const gdb_byte *bp_bytes;
|
|
CORE_ADDR bp_addr_as_address;
|
|
int bp_size;
|
|
|
|
/* Be careful BP_ADDR is in inferior PC encoding while
|
|
BP_ADDR_AS_ADDRESS is a plain memory address. */
|
|
|
|
sp = push_dummy_code (gdbarch, sp, funaddr, args, nargs,
|
|
target_values_type, &real_pc, &bp_addr,
|
|
get_current_regcache ());
|
|
|
|
/* Write a legitimate instruction at the point where the infcall
|
|
breakpoint is going to be inserted. While this instruction
|
|
is never going to be executed, a user investigating the
|
|
memory from GDB would see this instruction instead of random
|
|
uninitialized bytes. We chose the breakpoint instruction
|
|
as it may look as the most logical one to the user and also
|
|
valgrind 3.7.0 needs it for proper vgdb inferior calls.
|
|
|
|
If software breakpoints are unsupported for this target we
|
|
leave the user visible memory content uninitialized. */
|
|
|
|
bp_addr_as_address = bp_addr;
|
|
bp_bytes = gdbarch_breakpoint_from_pc (gdbarch, &bp_addr_as_address,
|
|
&bp_size);
|
|
if (bp_bytes != NULL)
|
|
write_memory (bp_addr_as_address, bp_bytes, bp_size);
|
|
}
|
|
break;
|
|
case AT_ENTRY_POINT:
|
|
{
|
|
CORE_ADDR dummy_addr;
|
|
|
|
real_pc = funaddr;
|
|
dummy_addr = entry_point_address ();
|
|
|
|
/* A call dummy always consists of just a single breakpoint, so
|
|
its address is the same as the address of the dummy.
|
|
|
|
The actual breakpoint is inserted separatly so there is no need to
|
|
write that out. */
|
|
bp_addr = dummy_addr;
|
|
break;
|
|
}
|
|
default:
|
|
internal_error (__FILE__, __LINE__, _("bad switch"));
|
|
}
|
|
|
|
if (nargs < TYPE_NFIELDS (ftype))
|
|
error (_("Too few arguments in function call."));
|
|
|
|
{
|
|
int i;
|
|
|
|
for (i = nargs - 1; i >= 0; i--)
|
|
{
|
|
int prototyped;
|
|
struct type *param_type;
|
|
|
|
/* FIXME drow/2002-05-31: Should just always mark methods as
|
|
prototyped. Can we respect TYPE_VARARGS? Probably not. */
|
|
if (TYPE_CODE (ftype) == TYPE_CODE_METHOD)
|
|
prototyped = 1;
|
|
if (TYPE_TARGET_TYPE (ftype) == NULL && TYPE_NFIELDS (ftype) == 0
|
|
&& default_return_type != NULL)
|
|
{
|
|
/* Calling a no-debug function with the return type
|
|
explicitly cast. Assume the function is prototyped,
|
|
with a prototype matching the types of the arguments.
|
|
E.g., with:
|
|
float mult (float v1, float v2) { return v1 * v2; }
|
|
This:
|
|
(gdb) p (float) mult (2.0f, 3.0f)
|
|
Is a simpler alternative to:
|
|
(gdb) p ((float (*) (float, float)) mult) (2.0f, 3.0f)
|
|
*/
|
|
prototyped = 1;
|
|
}
|
|
else if (i < TYPE_NFIELDS (ftype))
|
|
prototyped = TYPE_PROTOTYPED (ftype);
|
|
else
|
|
prototyped = 0;
|
|
|
|
if (i < TYPE_NFIELDS (ftype))
|
|
param_type = TYPE_FIELD_TYPE (ftype, i);
|
|
else
|
|
param_type = NULL;
|
|
|
|
args[i] = value_arg_coerce (gdbarch, args[i],
|
|
param_type, prototyped, &sp);
|
|
|
|
if (param_type != NULL && language_pass_by_reference (param_type))
|
|
args[i] = value_addr (args[i]);
|
|
}
|
|
}
|
|
|
|
/* Reserve space for the return structure to be written on the
|
|
stack, if necessary. Make certain that the value is correctly
|
|
aligned.
|
|
|
|
While evaluating expressions, we reserve space on the stack for
|
|
return values of class type even if the language ABI and the target
|
|
ABI do not require that the return value be passed as a hidden first
|
|
argument. This is because we want to store the return value as an
|
|
on-stack temporary while the expression is being evaluated. This
|
|
enables us to have chained function calls in expressions.
|
|
|
|
Keeping the return values as on-stack temporaries while the expression
|
|
is being evaluated is OK because the thread is stopped until the
|
|
expression is completely evaluated. */
|
|
|
|
if (struct_return || hidden_first_param_p
|
|
|| (stack_temporaries && class_or_union_p (values_type)))
|
|
{
|
|
if (gdbarch_inner_than (gdbarch, 1, 2))
|
|
{
|
|
/* Stack grows downward. Align STRUCT_ADDR and SP after
|
|
making space for the return value. */
|
|
sp -= TYPE_LENGTH (values_type);
|
|
if (gdbarch_frame_align_p (gdbarch))
|
|
sp = gdbarch_frame_align (gdbarch, sp);
|
|
struct_addr = sp;
|
|
}
|
|
else
|
|
{
|
|
/* Stack grows upward. Align the frame, allocate space, and
|
|
then again, re-align the frame??? */
|
|
if (gdbarch_frame_align_p (gdbarch))
|
|
sp = gdbarch_frame_align (gdbarch, sp);
|
|
struct_addr = sp;
|
|
sp += TYPE_LENGTH (values_type);
|
|
if (gdbarch_frame_align_p (gdbarch))
|
|
sp = gdbarch_frame_align (gdbarch, sp);
|
|
}
|
|
}
|
|
|
|
std::vector<struct value *> new_args;
|
|
if (hidden_first_param_p)
|
|
{
|
|
/* Add the new argument to the front of the argument list. */
|
|
new_args.push_back
|
|
(value_from_pointer (lookup_pointer_type (values_type), struct_addr));
|
|
std::copy (&args[0], &args[nargs], std::back_inserter (new_args));
|
|
args = new_args.data ();
|
|
nargs++;
|
|
}
|
|
|
|
/* Create the dummy stack frame. Pass in the call dummy address as,
|
|
presumably, the ABI code knows where, in the call dummy, the
|
|
return address should be pointed. */
|
|
sp = gdbarch_push_dummy_call (gdbarch, function, get_current_regcache (),
|
|
bp_addr, nargs, args,
|
|
sp, struct_return, struct_addr);
|
|
|
|
/* Set up a frame ID for the dummy frame so we can pass it to
|
|
set_momentary_breakpoint. We need to give the breakpoint a frame
|
|
ID so that the breakpoint code can correctly re-identify the
|
|
dummy breakpoint. */
|
|
/* Sanity. The exact same SP value is returned by PUSH_DUMMY_CALL,
|
|
saved as the dummy-frame TOS, and used by dummy_id to form
|
|
the frame ID's stack address. */
|
|
dummy_id = frame_id_build (sp, bp_addr);
|
|
|
|
/* Create a momentary breakpoint at the return address of the
|
|
inferior. That way it breaks when it returns. */
|
|
|
|
{
|
|
symtab_and_line sal;
|
|
sal.pspace = current_program_space;
|
|
sal.pc = bp_addr;
|
|
sal.section = find_pc_overlay (sal.pc);
|
|
|
|
/* Sanity. The exact same SP value is returned by
|
|
PUSH_DUMMY_CALL, saved as the dummy-frame TOS, and used by
|
|
dummy_id to form the frame ID's stack address. */
|
|
breakpoint *bpt
|
|
= set_momentary_breakpoint (gdbarch, sal,
|
|
dummy_id, bp_call_dummy).release ();
|
|
|
|
/* set_momentary_breakpoint invalidates FRAME. */
|
|
frame = NULL;
|
|
|
|
bpt->disposition = disp_del;
|
|
gdb_assert (bpt->related_breakpoint == bpt);
|
|
|
|
breakpoint *longjmp_b = set_longjmp_breakpoint_for_call_dummy ();
|
|
if (longjmp_b)
|
|
{
|
|
/* Link BPT into the chain of LONGJMP_B. */
|
|
bpt->related_breakpoint = longjmp_b;
|
|
while (longjmp_b->related_breakpoint != bpt->related_breakpoint)
|
|
longjmp_b = longjmp_b->related_breakpoint;
|
|
longjmp_b->related_breakpoint = bpt;
|
|
}
|
|
}
|
|
|
|
/* Create a breakpoint in std::terminate.
|
|
If a C++ exception is raised in the dummy-frame, and the
|
|
exception handler is (normally, and expected to be) out-of-frame,
|
|
the default C++ handler will (wrongly) be called in an inferior
|
|
function call. This is wrong, as an exception can be normally
|
|
and legally handled out-of-frame. The confines of the dummy frame
|
|
prevent the unwinder from finding the correct handler (or any
|
|
handler, unless it is in-frame). The default handler calls
|
|
std::terminate. This will kill the inferior. Assert that
|
|
terminate should never be called in an inferior function
|
|
call. Place a momentary breakpoint in the std::terminate function
|
|
and if triggered in the call, rewind. */
|
|
if (unwind_on_terminating_exception_p)
|
|
set_std_terminate_breakpoint ();
|
|
|
|
/* Discard both inf_status and caller_state cleanups.
|
|
From this point on we explicitly restore the associated state
|
|
or discard it. */
|
|
discard_cleanups (inf_status_cleanup);
|
|
|
|
/* Everything's ready, push all the info needed to restore the
|
|
caller (and identify the dummy-frame) onto the dummy-frame
|
|
stack. */
|
|
dummy_frame_push (caller_state, &dummy_id, inferior_ptid);
|
|
if (dummy_dtor != NULL)
|
|
register_dummy_frame_dtor (dummy_id, inferior_ptid,
|
|
dummy_dtor, dummy_dtor_data);
|
|
|
|
/* Register a clean-up for unwind_on_terminating_exception_breakpoint. */
|
|
terminate_bp_cleanup = make_cleanup (cleanup_delete_std_terminate_breakpoint,
|
|
NULL);
|
|
|
|
/* - SNIP - SNIP - SNIP - SNIP - SNIP - SNIP - SNIP - SNIP - SNIP -
|
|
If you're looking to implement asynchronous dummy-frames, then
|
|
just below is the place to chop this function in two.. */
|
|
|
|
/* TP is invalid after run_inferior_call returns, so enclose this
|
|
in a block so that it's only in scope during the time it's valid. */
|
|
{
|
|
struct thread_info *tp = inferior_thread ();
|
|
struct thread_fsm *saved_sm;
|
|
struct call_thread_fsm *sm;
|
|
|
|
/* Save the current FSM. We'll override it. */
|
|
saved_sm = tp->thread_fsm;
|
|
tp->thread_fsm = NULL;
|
|
|
|
/* Save this thread's ptid, we need it later but the thread
|
|
may have exited. */
|
|
call_thread_ptid = tp->ptid;
|
|
|
|
/* Run the inferior until it stops. */
|
|
|
|
/* Create the FSM used to manage the infcall. It tells infrun to
|
|
not report the stop to the user, and captures the return value
|
|
before the dummy frame is popped. run_inferior_call registers
|
|
it with the thread ASAP. */
|
|
sm = new_call_thread_fsm (current_ui, command_interp (),
|
|
gdbarch, function,
|
|
values_type,
|
|
struct_return || hidden_first_param_p,
|
|
struct_addr);
|
|
|
|
e = run_inferior_call (sm, tp, real_pc);
|
|
|
|
gdb::observers::inferior_call_post.notify (call_thread_ptid, funaddr);
|
|
|
|
tp = find_thread_ptid (call_thread_ptid);
|
|
if (tp != NULL)
|
|
{
|
|
/* The FSM should still be the same. */
|
|
gdb_assert (tp->thread_fsm == &sm->thread_fsm);
|
|
|
|
if (thread_fsm_finished_p (tp->thread_fsm))
|
|
{
|
|
struct value *retval;
|
|
|
|
/* The inferior call is successful. Pop the dummy frame,
|
|
which runs its destructors and restores the inferior's
|
|
suspend state, and restore the inferior control
|
|
state. */
|
|
dummy_frame_pop (dummy_id, call_thread_ptid);
|
|
restore_infcall_control_state (inf_status);
|
|
|
|
/* Get the return value. */
|
|
retval = sm->return_value;
|
|
|
|
/* Clean up / destroy the call FSM, and restore the
|
|
original one. */
|
|
thread_fsm_clean_up (tp->thread_fsm, tp);
|
|
thread_fsm_delete (tp->thread_fsm);
|
|
tp->thread_fsm = saved_sm;
|
|
|
|
maybe_remove_breakpoints ();
|
|
|
|
do_cleanups (terminate_bp_cleanup);
|
|
gdb_assert (retval != NULL);
|
|
return retval;
|
|
}
|
|
|
|
/* Didn't complete. Restore previous state machine, and
|
|
handle the error. */
|
|
tp->thread_fsm = saved_sm;
|
|
}
|
|
}
|
|
|
|
/* Rethrow an error if we got one trying to run the inferior. */
|
|
|
|
if (e.reason < 0)
|
|
{
|
|
const char *name = get_function_name (funaddr,
|
|
name_buf, sizeof (name_buf));
|
|
|
|
discard_infcall_control_state (inf_status);
|
|
|
|
/* We could discard the dummy frame here if the program exited,
|
|
but it will get garbage collected the next time the program is
|
|
run anyway. */
|
|
|
|
switch (e.reason)
|
|
{
|
|
case RETURN_ERROR:
|
|
throw_error (e.error, _("%s\n\
|
|
An error occurred while in a function called from GDB.\n\
|
|
Evaluation of the expression containing the function\n\
|
|
(%s) will be abandoned.\n\
|
|
When the function is done executing, GDB will silently stop."),
|
|
e.message, name);
|
|
case RETURN_QUIT:
|
|
default:
|
|
throw_exception (e);
|
|
}
|
|
}
|
|
|
|
/* If the program has exited, or we stopped at a different thread,
|
|
exit and inform the user. */
|
|
|
|
if (! target_has_execution)
|
|
{
|
|
const char *name = get_function_name (funaddr,
|
|
name_buf, sizeof (name_buf));
|
|
|
|
/* If we try to restore the inferior status,
|
|
we'll crash as the inferior is no longer running. */
|
|
discard_infcall_control_state (inf_status);
|
|
|
|
/* We could discard the dummy frame here given that the program exited,
|
|
but it will get garbage collected the next time the program is
|
|
run anyway. */
|
|
|
|
error (_("The program being debugged exited while in a function "
|
|
"called from GDB.\n"
|
|
"Evaluation of the expression containing the function\n"
|
|
"(%s) will be abandoned."),
|
|
name);
|
|
}
|
|
|
|
if (! ptid_equal (call_thread_ptid, inferior_ptid))
|
|
{
|
|
const char *name = get_function_name (funaddr,
|
|
name_buf, sizeof (name_buf));
|
|
|
|
/* We've switched threads. This can happen if another thread gets a
|
|
signal or breakpoint while our thread was running.
|
|
There's no point in restoring the inferior status,
|
|
we're in a different thread. */
|
|
discard_infcall_control_state (inf_status);
|
|
/* Keep the dummy frame record, if the user switches back to the
|
|
thread with the hand-call, we'll need it. */
|
|
if (stopped_by_random_signal)
|
|
error (_("\
|
|
The program received a signal in another thread while\n\
|
|
making a function call from GDB.\n\
|
|
Evaluation of the expression containing the function\n\
|
|
(%s) will be abandoned.\n\
|
|
When the function is done executing, GDB will silently stop."),
|
|
name);
|
|
else
|
|
error (_("\
|
|
The program stopped in another thread while making a function call from GDB.\n\
|
|
Evaluation of the expression containing the function\n\
|
|
(%s) will be abandoned.\n\
|
|
When the function is done executing, GDB will silently stop."),
|
|
name);
|
|
}
|
|
|
|
{
|
|
/* Make a copy as NAME may be in an objfile freed by dummy_frame_pop. */
|
|
std::string name = get_function_name (funaddr, name_buf,
|
|
sizeof (name_buf));
|
|
|
|
if (stopped_by_random_signal)
|
|
{
|
|
/* We stopped inside the FUNCTION because of a random
|
|
signal. Further execution of the FUNCTION is not
|
|
allowed. */
|
|
|
|
if (unwind_on_signal_p)
|
|
{
|
|
/* The user wants the context restored. */
|
|
|
|
/* We must get back to the frame we were before the
|
|
dummy call. */
|
|
dummy_frame_pop (dummy_id, call_thread_ptid);
|
|
|
|
/* We also need to restore inferior status to that before the
|
|
dummy call. */
|
|
restore_infcall_control_state (inf_status);
|
|
|
|
/* FIXME: Insert a bunch of wrap_here; name can be very
|
|
long if it's a C++ name with arguments and stuff. */
|
|
error (_("\
|
|
The program being debugged was signaled while in a function called from GDB.\n\
|
|
GDB has restored the context to what it was before the call.\n\
|
|
To change this behavior use \"set unwindonsignal off\".\n\
|
|
Evaluation of the expression containing the function\n\
|
|
(%s) will be abandoned."),
|
|
name.c_str ());
|
|
}
|
|
else
|
|
{
|
|
/* The user wants to stay in the frame where we stopped
|
|
(default).
|
|
Discard inferior status, we're not at the same point
|
|
we started at. */
|
|
discard_infcall_control_state (inf_status);
|
|
|
|
/* FIXME: Insert a bunch of wrap_here; name can be very
|
|
long if it's a C++ name with arguments and stuff. */
|
|
error (_("\
|
|
The program being debugged was signaled while in a function called from GDB.\n\
|
|
GDB remains in the frame where the signal was received.\n\
|
|
To change this behavior use \"set unwindonsignal on\".\n\
|
|
Evaluation of the expression containing the function\n\
|
|
(%s) will be abandoned.\n\
|
|
When the function is done executing, GDB will silently stop."),
|
|
name.c_str ());
|
|
}
|
|
}
|
|
|
|
if (stop_stack_dummy == STOP_STD_TERMINATE)
|
|
{
|
|
/* We must get back to the frame we were before the dummy
|
|
call. */
|
|
dummy_frame_pop (dummy_id, call_thread_ptid);
|
|
|
|
/* We also need to restore inferior status to that before
|
|
the dummy call. */
|
|
restore_infcall_control_state (inf_status);
|
|
|
|
error (_("\
|
|
The program being debugged entered a std::terminate call, most likely\n\
|
|
caused by an unhandled C++ exception. GDB blocked this call in order\n\
|
|
to prevent the program from being terminated, and has restored the\n\
|
|
context to its original state before the call.\n\
|
|
To change this behaviour use \"set unwind-on-terminating-exception off\".\n\
|
|
Evaluation of the expression containing the function (%s)\n\
|
|
will be abandoned."),
|
|
name.c_str ());
|
|
}
|
|
else if (stop_stack_dummy == STOP_NONE)
|
|
{
|
|
|
|
/* We hit a breakpoint inside the FUNCTION.
|
|
Keep the dummy frame, the user may want to examine its state.
|
|
Discard inferior status, we're not at the same point
|
|
we started at. */
|
|
discard_infcall_control_state (inf_status);
|
|
|
|
/* The following error message used to say "The expression
|
|
which contained the function call has been discarded."
|
|
It is a hard concept to explain in a few words. Ideally,
|
|
GDB would be able to resume evaluation of the expression
|
|
when the function finally is done executing. Perhaps
|
|
someday this will be implemented (it would not be easy). */
|
|
/* FIXME: Insert a bunch of wrap_here; name can be very long if it's
|
|
a C++ name with arguments and stuff. */
|
|
error (_("\
|
|
The program being debugged stopped while in a function called from GDB.\n\
|
|
Evaluation of the expression containing the function\n\
|
|
(%s) will be abandoned.\n\
|
|
When the function is done executing, GDB will silently stop."),
|
|
name.c_str ());
|
|
}
|
|
|
|
}
|
|
|
|
/* The above code errors out, so ... */
|
|
gdb_assert_not_reached ("... should not be here");
|
|
}
|
|
|
|
void
|
|
_initialize_infcall (void)
|
|
{
|
|
add_setshow_boolean_cmd ("coerce-float-to-double", class_obscure,
|
|
&coerce_float_to_double_p, _("\
|
|
Set coercion of floats to doubles when calling functions."), _("\
|
|
Show coercion of floats to doubles when calling functions"), _("\
|
|
Variables of type float should generally be converted to doubles before\n\
|
|
calling an unprototyped function, and left alone when calling a prototyped\n\
|
|
function. However, some older debug info formats do not provide enough\n\
|
|
information to determine that a function is prototyped. If this flag is\n\
|
|
set, GDB will perform the conversion for a function it considers\n\
|
|
unprototyped.\n\
|
|
The default is to perform the conversion.\n"),
|
|
NULL,
|
|
show_coerce_float_to_double_p,
|
|
&setlist, &showlist);
|
|
|
|
add_setshow_boolean_cmd ("unwindonsignal", no_class,
|
|
&unwind_on_signal_p, _("\
|
|
Set unwinding of stack if a signal is received while in a call dummy."), _("\
|
|
Show unwinding of stack if a signal is received while in a call dummy."), _("\
|
|
The unwindonsignal lets the user determine what gdb should do if a signal\n\
|
|
is received while in a function called from gdb (call dummy). If set, gdb\n\
|
|
unwinds the stack and restore the context to what as it was before the call.\n\
|
|
The default is to stop in the frame where the signal was received."),
|
|
NULL,
|
|
show_unwind_on_signal_p,
|
|
&setlist, &showlist);
|
|
|
|
add_setshow_boolean_cmd ("unwind-on-terminating-exception", no_class,
|
|
&unwind_on_terminating_exception_p, _("\
|
|
Set unwinding of stack if std::terminate is called while in call dummy."), _("\
|
|
Show unwinding of stack if std::terminate() is called while in a call dummy."),
|
|
_("\
|
|
The unwind on terminating exception flag lets the user determine\n\
|
|
what gdb should do if a std::terminate() call is made from the\n\
|
|
default exception handler. If set, gdb unwinds the stack and restores\n\
|
|
the context to what it was before the call. If unset, gdb allows the\n\
|
|
std::terminate call to proceed.\n\
|
|
The default is to unwind the frame."),
|
|
NULL,
|
|
show_unwind_on_terminating_exception_p,
|
|
&setlist, &showlist);
|
|
|
|
}
|