auto-generate most target debug methods
The target debug methods are inconsistently maintained. Most to_*
methods have some kind of targetdebug awareness, but not all of them
do. The ones that do vary in the quantity and quality of output they
generate.
This patch changes most of the target debug methods to be
automatically generated. All the arguments are printed, and separate
lines are printed for entering and existing the outermost call to the
target stack.
For example now you'd see:
-> multi-thread->to_terminal_ours (...)
-> multi-thread->to_is_async_p (...)
<- multi-thread->to_is_async_p (0x1ebb580) = 1
<- multi-thread->to_terminal_ours (0x1ebb580)
-> multi-thread->to_thread_address_space (...)
<- multi-thread->to_thread_address_space (0x1ebb580, 26802) = 1
In this case you can see nested calls. The "multi-thread" on the left
hand side is the topmost target's shortname.
There are some oddities with this patch. I'm on the fence about it
all, I really just wrote it on a whim.
It's not simple to convert every possible method, since a few don't
participate in target delegation.
Printing is done by type, so I introduced some new
debug-printing-specific typedefs to handle cases where it is nicer to
do something else.
On the plus side, this lays the groundwork for making targetdebug
affect every layer of the target stack. The idea would be to wrap
each target_ops in the stack with its own debug_target, and then you
could see calls propagate down the stack and back up; I suppose with
indentation to make it prettier. (That said there are some gotchas
lurking in this idea due to target stack introspection.)
Regtested on x86-64 Fedora 20.
2014-07-24 Tom Tromey <tromey@redhat.com>
* make-target-delegates (munge_type, write_debugmethod): New
functions.
(debug_names): New global.
($TARGET_DEBUG_PRINTER): New global.
(write_function_header): Strip TARGET_DEBUG_PRINTER from the type
name.
Write debug methods. Generate init_debug_target.
* target-debug.h: New file.
* target-delegates.c: Rebuild.
* target.c: Include target-debug.h.
(debug_target): Hoist definition.
(target_kill, target_get_section_table, target_memory_map)
(target_flash_erase, target_flash_done, target_detach)
(target_disconnect, target_wait, target_resume)
(target_pass_signals, target_program_signals, target_follow_fork)
(target_mourn_inferior, target_search_memory)
(target_thread_address_space, target_close)
(target_find_new_threads, target_core_of_thread)
(target_verify_memory, target_insert_mask_watchpoint)
(target_remove_mask_watchpoint): Remove targetdebug code.
(debug_to_post_attach, debug_to_prepare_to_store)
(debug_to_files_info, debug_to_insert_breakpoint)
(debug_to_remove_breakpoint, debug_to_can_use_hw_breakpoint)
(debug_to_region_ok_for_hw_watchpoint)
(debug_to_can_accel_watchpoint_condition)
(debug_to_stopped_by_watchpoint, debug_to_stopped_data_address)
(debug_to_watchpoint_addr_within_range)
(debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint)
(debug_to_insert_watchpoint, debug_to_remove_watchpoint)
(debug_to_terminal_init, debug_to_terminal_inferior)
(debug_to_terminal_ours_for_output, debug_to_terminal_ours)
(debug_to_terminal_save_ours, debug_to_terminal_info)
(debug_to_load, debug_to_post_startup_inferior)
(debug_to_insert_fork_catchpoint)
(debug_to_remove_fork_catchpoint)
(debug_to_insert_vfork_catchpoint)
(debug_to_remove_vfork_catchpoint)
(debug_to_insert_exec_catchpoint)
(debug_to_remove_exec_catchpoint, debug_to_has_exited)
(debug_to_can_run, debug_to_thread_architecture, debug_to_stop)
(debug_to_rcmd, debug_to_pid_to_exec_file): Remove.
(setup_target_debug): Call init_debug_target.
* target.h (TARGET_DEBUG_PRINTER): New macro.
(struct target_ops) <to_resume, to_wait, to_pass_signals,
to_program_signals>: Use TARGET_DEBUG_PRINTER.
2014-06-16 11:28:57 +08:00
|
|
|
|
/* GDB target debugging macros
|
|
|
|
|
|
2016-01-01 12:33:14 +08:00
|
|
|
|
Copyright (C) 2014-2016 Free Software Foundation, Inc.
|
auto-generate most target debug methods
The target debug methods are inconsistently maintained. Most to_*
methods have some kind of targetdebug awareness, but not all of them
do. The ones that do vary in the quantity and quality of output they
generate.
This patch changes most of the target debug methods to be
automatically generated. All the arguments are printed, and separate
lines are printed for entering and existing the outermost call to the
target stack.
For example now you'd see:
-> multi-thread->to_terminal_ours (...)
-> multi-thread->to_is_async_p (...)
<- multi-thread->to_is_async_p (0x1ebb580) = 1
<- multi-thread->to_terminal_ours (0x1ebb580)
-> multi-thread->to_thread_address_space (...)
<- multi-thread->to_thread_address_space (0x1ebb580, 26802) = 1
In this case you can see nested calls. The "multi-thread" on the left
hand side is the topmost target's shortname.
There are some oddities with this patch. I'm on the fence about it
all, I really just wrote it on a whim.
It's not simple to convert every possible method, since a few don't
participate in target delegation.
Printing is done by type, so I introduced some new
debug-printing-specific typedefs to handle cases where it is nicer to
do something else.
On the plus side, this lays the groundwork for making targetdebug
affect every layer of the target stack. The idea would be to wrap
each target_ops in the stack with its own debug_target, and then you
could see calls propagate down the stack and back up; I suppose with
indentation to make it prettier. (That said there are some gotchas
lurking in this idea due to target stack introspection.)
Regtested on x86-64 Fedora 20.
2014-07-24 Tom Tromey <tromey@redhat.com>
* make-target-delegates (munge_type, write_debugmethod): New
functions.
(debug_names): New global.
($TARGET_DEBUG_PRINTER): New global.
(write_function_header): Strip TARGET_DEBUG_PRINTER from the type
name.
Write debug methods. Generate init_debug_target.
* target-debug.h: New file.
* target-delegates.c: Rebuild.
* target.c: Include target-debug.h.
(debug_target): Hoist definition.
(target_kill, target_get_section_table, target_memory_map)
(target_flash_erase, target_flash_done, target_detach)
(target_disconnect, target_wait, target_resume)
(target_pass_signals, target_program_signals, target_follow_fork)
(target_mourn_inferior, target_search_memory)
(target_thread_address_space, target_close)
(target_find_new_threads, target_core_of_thread)
(target_verify_memory, target_insert_mask_watchpoint)
(target_remove_mask_watchpoint): Remove targetdebug code.
(debug_to_post_attach, debug_to_prepare_to_store)
(debug_to_files_info, debug_to_insert_breakpoint)
(debug_to_remove_breakpoint, debug_to_can_use_hw_breakpoint)
(debug_to_region_ok_for_hw_watchpoint)
(debug_to_can_accel_watchpoint_condition)
(debug_to_stopped_by_watchpoint, debug_to_stopped_data_address)
(debug_to_watchpoint_addr_within_range)
(debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint)
(debug_to_insert_watchpoint, debug_to_remove_watchpoint)
(debug_to_terminal_init, debug_to_terminal_inferior)
(debug_to_terminal_ours_for_output, debug_to_terminal_ours)
(debug_to_terminal_save_ours, debug_to_terminal_info)
(debug_to_load, debug_to_post_startup_inferior)
(debug_to_insert_fork_catchpoint)
(debug_to_remove_fork_catchpoint)
(debug_to_insert_vfork_catchpoint)
(debug_to_remove_vfork_catchpoint)
(debug_to_insert_exec_catchpoint)
(debug_to_remove_exec_catchpoint, debug_to_has_exited)
(debug_to_can_run, debug_to_thread_architecture, debug_to_stop)
(debug_to_rcmd, debug_to_pid_to_exec_file): Remove.
(setup_target_debug): Call init_debug_target.
* target.h (TARGET_DEBUG_PRINTER): New macro.
(struct target_ops) <to_resume, to_wait, to_pass_signals,
to_program_signals>: Use TARGET_DEBUG_PRINTER.
2014-06-16 11:28:57 +08:00
|
|
|
|
|
|
|
|
|
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/>. */
|
|
|
|
|
|
|
|
|
|
#ifndef TARGET_DEBUG_H
|
|
|
|
|
#define TARGET_DEBUG_H
|
|
|
|
|
|
|
|
|
|
/* Printers for the debug target. Each prints an object of a given
|
|
|
|
|
type to a string that needn't be freed. Most printers are macros,
|
|
|
|
|
for brevity, but a few are static functions where more complicated
|
|
|
|
|
behavior is needed.
|
|
|
|
|
|
|
|
|
|
References to these printers are automatically generated by
|
|
|
|
|
make-target-delegates. See the generated file target-delegates.c.
|
|
|
|
|
|
|
|
|
|
In a couple cases, a special printing function is defined and then
|
|
|
|
|
used via the TARGET_DEBUG_PRINTER macro. See target.h.
|
|
|
|
|
|
|
|
|
|
A few methods still have some explicit targetdebug code in
|
|
|
|
|
target.c. In most cases this is because target delegation hasn't
|
|
|
|
|
been done for the method; but individual cases vary. For instance,
|
|
|
|
|
target_store_registers does some special register printing that is
|
|
|
|
|
more simply done there, and target_xfer_partial additionally
|
|
|
|
|
bypasses the debug target. */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Helper macro. */
|
|
|
|
|
|
|
|
|
|
#define target_debug_do_print(E) \
|
|
|
|
|
fputs_unfiltered ((E), gdb_stdlog);
|
|
|
|
|
|
|
|
|
|
#define target_debug_print_struct_target_ops_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_enum_target_object(X) \
|
|
|
|
|
target_debug_do_print (plongest (X))
|
|
|
|
|
#define target_debug_print_CORE_ADDR(X) \
|
|
|
|
|
target_debug_do_print (core_addr_to_string (X))
|
|
|
|
|
#define target_debug_print_const_char_p(X) \
|
|
|
|
|
target_debug_do_print (((X) ? (X) : "(null)"))
|
|
|
|
|
#define target_debug_print_char_p(X) \
|
|
|
|
|
target_debug_do_print (((X) ? (X) : "(null)"))
|
|
|
|
|
#define target_debug_print_int(X) \
|
|
|
|
|
target_debug_do_print (plongest (X))
|
|
|
|
|
#define target_debug_print_long(X) \
|
|
|
|
|
target_debug_do_print (plongest (X))
|
|
|
|
|
#define target_debug_print_enum_target_xfer_status(X) \
|
|
|
|
|
target_debug_do_print (plongest (X))
|
|
|
|
|
#define target_debug_print_enum_exec_direction_kind(X) \
|
|
|
|
|
target_debug_do_print (plongest (X))
|
|
|
|
|
#define target_debug_print_enum_trace_find_type(X) \
|
|
|
|
|
target_debug_do_print (plongest (X))
|
|
|
|
|
#define target_debug_print_enum_btrace_read_type(X) \
|
|
|
|
|
target_debug_do_print (plongest (X))
|
|
|
|
|
#define target_debug_print_enum_btrace_error(X) \
|
|
|
|
|
target_debug_do_print (plongest (X))
|
|
|
|
|
#define target_debug_print_ptid_t(X) \
|
|
|
|
|
target_debug_do_print (plongest (ptid_get_pid (X)))
|
|
|
|
|
#define target_debug_print_struct_gdbarch_p(X) \
|
|
|
|
|
target_debug_do_print (gdbarch_bfd_arch_info (X)->printable_name)
|
|
|
|
|
#define target_debug_print_const_gdb_byte_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_gdb_byte_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_gdb_byte_pp(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (*(X)))
|
|
|
|
|
#define target_debug_print_enum_gdb_signal(X) \
|
|
|
|
|
target_debug_do_print (gdb_signal_to_name (X))
|
|
|
|
|
#define target_debug_print_ULONGEST(X) \
|
|
|
|
|
target_debug_do_print (hex_string (X))
|
|
|
|
|
#define target_debug_print_ULONGEST_p(X) \
|
|
|
|
|
target_debug_do_print (hex_string (*(X)))
|
|
|
|
|
#define target_debug_print_LONGEST(X) \
|
|
|
|
|
target_debug_do_print (phex (X, 0))
|
|
|
|
|
#define target_debug_print_LONGEST_p(X) \
|
|
|
|
|
target_debug_do_print (phex (*(X), 0))
|
|
|
|
|
#define target_debug_print_struct_address_space_p(X) \
|
|
|
|
|
target_debug_do_print (plongest (address_space_num (X)))
|
|
|
|
|
#define target_debug_print_struct_bp_target_info_p(X) \
|
|
|
|
|
target_debug_do_print (core_addr_to_string ((X)->placed_address))
|
|
|
|
|
#define target_debug_print_struct_expression_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_CORE_ADDR_p(X) \
|
|
|
|
|
target_debug_do_print (core_addr_to_string (*(X)))
|
|
|
|
|
#define target_debug_print_int_p(X) \
|
|
|
|
|
target_debug_do_print (plongest (*(X)))
|
|
|
|
|
#define target_debug_print_struct_regcache_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_struct_thread_info_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_struct_ui_file_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_struct_target_section_table_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_async_callback_ftype_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_void_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_find_memory_region_ftype(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_bfd_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_VEC_mem_region_s__p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_VEC_static_tracepoint_marker_p__p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_const_struct_target_desc_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_struct_bp_location_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_struct_trace_state_variable_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_struct_trace_status_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_struct_breakpoint_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_struct_uploaded_tp_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_struct_uploaded_tp_pp(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_struct_uploaded_tsv_pp(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_struct_static_tracepoint_marker_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_struct_traceframe_info_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_struct_btrace_target_info_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_VEC__btrace_block_s__pp(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_const_struct_frame_unwind_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
2013-11-13 22:31:07 +08:00
|
|
|
|
#define target_debug_print_struct_btrace_data_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
2014-01-17 20:29:19 +08:00
|
|
|
|
#define target_debug_print_enum_btrace_format(X) \
|
|
|
|
|
target_debug_do_print (plongest (X))
|
2013-11-28 22:44:13 +08:00
|
|
|
|
#define target_debug_print_const_struct_btrace_config_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
|
|
|
|
#define target_debug_print_const_struct_btrace_target_info_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
2015-08-01 01:19:53 +08:00
|
|
|
|
#define target_debug_print_enum_target_hw_bp_type(X) \
|
|
|
|
|
target_debug_do_print (plongest (X))
|
|
|
|
|
#define target_debug_print_enum_bptype(X) \
|
|
|
|
|
target_debug_do_print (plongest (X))
|
Extended-remote follow-exec
This patch implements support for exec events on extended-remote Linux
targets. Follow-exec-mode and rerun behave as expected. Catchpoints and
test updates are implemented in subsequent patches.
This patch was derived from a patch posted last October:
https://sourceware.org/ml/gdb-patches/2014-10/msg00877.html.
It was originally based on some work done by Luis Machado in 2013.
IMPLEMENTATION
----------------
Exec events are enabled via ptrace options.
When an exec event is detected by gdbserver, the existing process
data, along with all its associated lwp and thread data, is deleted
and replaced by data for a new single-threaded process. The new
process data is initialized with the appropriate parts of the state
of the execing process. This approach takes care of several potential
pitfalls, including:
* deleting the data for an execing non-leader thread before any
wait/sigsuspend occurs
* correctly initializing the architecture of the execed process
We then report the exec event using a new RSP stop reason, "exec".
When GDB receives an "exec" event, it saves the status in the event
structure's target_waitstatus field, like what is done for remote fork
events. Because the original and execed programs may have different
architectures, we skip parsing the section of the stop reply packet
that contains register data. The register data will be retrieved
later after the inferior's architecture has been set up by
infrun.c:follow_exec.
At that point the exec event is handled by the existing event handling
in GDB. However, a few changes were necessary so that
infrun.c:follow_exec could accommodate the remote target.
* Where follow-exec-mode "new" is handled, we now call
add_inferior_with_spaces instead of add_inferior with separate calls
to set up the program and address spaces. The motivation for this
is that add_inferior_with_spaces also sets up the initial architecture
for the inferior, which is needed later by target_find_description
when it calls target_gdbarch.
* We call a new target function, target_follow_exec. This function
allows us to store the execd_pathname in the inferior, instead of
using the static string remote_exec_file from remote.c. The static
string didn't work for follow-exec-mode "new", since once you switched
to the execed program, the original remote exec-file was lost. The
execd_pathname is now stored in the inferior's program space as a
REGISTRY field. All of the requisite mechanisms for this are
defined in remote.c.
gdb/gdbserver/ChangeLog:
* linux-low.c (linux_mourn): Static declaration.
(linux_arch_setup): Move in front of
handle_extended_wait.
(linux_arch_setup_thread): New function.
(handle_extended_wait): Handle exec events. Call
linux_arch_setup_thread. Make event_lwp argument a
pointer-to-a-pointer.
(check_zombie_leaders): Do not check stopped threads.
(linux_low_ptrace_options): Add PTRACE_O_TRACEEXEC.
(linux_low_filter_event): Add lwp and thread for exec'ing
non-leader thread if leader thread has been deleted.
Refactor code into linux_arch_setup_thread and call it.
Pass child lwp pointer by reference to handle_extended_wait.
(linux_wait_for_event_filtered): Update comment.
(linux_wait_1): Prevent clobbering exec event status.
(linux_supports_exec_events): New function.
(linux_target_ops) <supports_exec_events>: Initialize new member.
* lynx-low.c (lynx_target_ops) <supports_exec_events>: Initialize
new member.
* remote-utils.c (prepare_resume_reply): New stop reason 'exec'.
* server.c (report_exec_events): New global variable.
(handle_query): Handle qSupported query for exec-events feature.
(captured_main): Initialize report_exec_events.
* server.h (report_exec_events): Declare new global variable.
* target.h (struct target_ops) <supports_exec_events>: New
member.
(target_supports_exec_events): New macro.
* win32-low.c (win32_target_ops) <supports_exec_events>:
Initialize new member.
gdb/ChangeLog:
* infrun.c (follow_exec): Use process-style ptid for
exec message. Call add_inferior_with_spaces and
target_follow_exec.
* nat/linux-ptrace.c (linux_supports_traceexec): New function.
* nat/linux-ptrace.h (linux_supports_traceexec): Declare.
* remote.c (remote_pspace_data): New static variable.
(remote_pspace_data_cleanup): New function.
(get_remote_exec_file): New function.
(set_remote_exec_file_1): New function.
(set_remote_exec_file): New function.
(show_remote_exec_file): New function.
(remote_exec_file): Delete static variable.
(anonymous enum) <PACKET_exec_event_feature> New
enumeration constant.
(remote_protocol_features): Add entry for exec-events feature.
(remote_query_supported): Add client side of qSupported query
for exec-events feature.
(remote_follow_exec): New function.
(remote_parse_stop_reply): Handle 'exec' stop reason.
(extended_remote_run, extended_remote_create_inferior): Call
get_remote_exec_file and set_remote_exec_file_1.
(init_extended_remote_ops) <to_follow_exec>: Initialize new
member.
(_initialize_remote): Call
register_program_space_data_with_cleanup. Call
add_packet_config_cmd for remote exec-events feature.
Modify call to add_setshow_string_noescape_cmd for exec-file
to use new functions set_remote_exec_file and
show_remote_exec_file.
* target-debug.h, target-delegates.c: Regenerated.
* target.c (target_follow_exec): New function.
* target.h (struct target_ops) <to_follow_exec>: New member.
(target_follow_exec): Declare new function.
2015-09-12 02:06:02 +08:00
|
|
|
|
#define target_debug_print_struct_inferior_p(X) \
|
|
|
|
|
target_debug_do_print (host_address_to_string (X))
|
auto-generate most target debug methods
The target debug methods are inconsistently maintained. Most to_*
methods have some kind of targetdebug awareness, but not all of them
do. The ones that do vary in the quantity and quality of output they
generate.
This patch changes most of the target debug methods to be
automatically generated. All the arguments are printed, and separate
lines are printed for entering and existing the outermost call to the
target stack.
For example now you'd see:
-> multi-thread->to_terminal_ours (...)
-> multi-thread->to_is_async_p (...)
<- multi-thread->to_is_async_p (0x1ebb580) = 1
<- multi-thread->to_terminal_ours (0x1ebb580)
-> multi-thread->to_thread_address_space (...)
<- multi-thread->to_thread_address_space (0x1ebb580, 26802) = 1
In this case you can see nested calls. The "multi-thread" on the left
hand side is the topmost target's shortname.
There are some oddities with this patch. I'm on the fence about it
all, I really just wrote it on a whim.
It's not simple to convert every possible method, since a few don't
participate in target delegation.
Printing is done by type, so I introduced some new
debug-printing-specific typedefs to handle cases where it is nicer to
do something else.
On the plus side, this lays the groundwork for making targetdebug
affect every layer of the target stack. The idea would be to wrap
each target_ops in the stack with its own debug_target, and then you
could see calls propagate down the stack and back up; I suppose with
indentation to make it prettier. (That said there are some gotchas
lurking in this idea due to target stack introspection.)
Regtested on x86-64 Fedora 20.
2014-07-24 Tom Tromey <tromey@redhat.com>
* make-target-delegates (munge_type, write_debugmethod): New
functions.
(debug_names): New global.
($TARGET_DEBUG_PRINTER): New global.
(write_function_header): Strip TARGET_DEBUG_PRINTER from the type
name.
Write debug methods. Generate init_debug_target.
* target-debug.h: New file.
* target-delegates.c: Rebuild.
* target.c: Include target-debug.h.
(debug_target): Hoist definition.
(target_kill, target_get_section_table, target_memory_map)
(target_flash_erase, target_flash_done, target_detach)
(target_disconnect, target_wait, target_resume)
(target_pass_signals, target_program_signals, target_follow_fork)
(target_mourn_inferior, target_search_memory)
(target_thread_address_space, target_close)
(target_find_new_threads, target_core_of_thread)
(target_verify_memory, target_insert_mask_watchpoint)
(target_remove_mask_watchpoint): Remove targetdebug code.
(debug_to_post_attach, debug_to_prepare_to_store)
(debug_to_files_info, debug_to_insert_breakpoint)
(debug_to_remove_breakpoint, debug_to_can_use_hw_breakpoint)
(debug_to_region_ok_for_hw_watchpoint)
(debug_to_can_accel_watchpoint_condition)
(debug_to_stopped_by_watchpoint, debug_to_stopped_data_address)
(debug_to_watchpoint_addr_within_range)
(debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint)
(debug_to_insert_watchpoint, debug_to_remove_watchpoint)
(debug_to_terminal_init, debug_to_terminal_inferior)
(debug_to_terminal_ours_for_output, debug_to_terminal_ours)
(debug_to_terminal_save_ours, debug_to_terminal_info)
(debug_to_load, debug_to_post_startup_inferior)
(debug_to_insert_fork_catchpoint)
(debug_to_remove_fork_catchpoint)
(debug_to_insert_vfork_catchpoint)
(debug_to_remove_vfork_catchpoint)
(debug_to_insert_exec_catchpoint)
(debug_to_remove_exec_catchpoint, debug_to_has_exited)
(debug_to_can_run, debug_to_thread_architecture, debug_to_stop)
(debug_to_rcmd, debug_to_pid_to_exec_file): Remove.
(setup_target_debug): Call init_debug_target.
* target.h (TARGET_DEBUG_PRINTER): New macro.
(struct target_ops) <to_resume, to_wait, to_pass_signals,
to_program_signals>: Use TARGET_DEBUG_PRINTER.
2014-06-16 11:28:57 +08:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
target_debug_print_struct_target_waitstatus_p (struct target_waitstatus *status)
|
|
|
|
|
{
|
|
|
|
|
char *str = target_waitstatus_to_string (status);
|
|
|
|
|
|
|
|
|
|
fputs_unfiltered (str, gdb_stdlog);
|
|
|
|
|
xfree (str);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Macros or functions that are used via TARGET_DEBUG_PRINTER. */
|
|
|
|
|
|
|
|
|
|
#define target_debug_print_step(X) \
|
|
|
|
|
target_debug_do_print ((X) ? "step" : "continue")
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
target_debug_print_options (int options)
|
|
|
|
|
{
|
|
|
|
|
char *str = target_options_to_string (options);
|
|
|
|
|
|
|
|
|
|
fputs_unfiltered (str, gdb_stdlog);
|
|
|
|
|
xfree (str);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
target_debug_print_signals (unsigned char *sigs)
|
|
|
|
|
{
|
|
|
|
|
fputs_unfiltered ("{", gdb_stdlog);
|
|
|
|
|
if (sigs != NULL)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < GDB_SIGNAL_LAST; i++)
|
|
|
|
|
if (sigs[i])
|
2015-08-07 05:21:41 +08:00
|
|
|
|
{
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog, " %s",
|
|
|
|
|
gdb_signal_to_name ((enum gdb_signal) i));
|
|
|
|
|
}
|
auto-generate most target debug methods
The target debug methods are inconsistently maintained. Most to_*
methods have some kind of targetdebug awareness, but not all of them
do. The ones that do vary in the quantity and quality of output they
generate.
This patch changes most of the target debug methods to be
automatically generated. All the arguments are printed, and separate
lines are printed for entering and existing the outermost call to the
target stack.
For example now you'd see:
-> multi-thread->to_terminal_ours (...)
-> multi-thread->to_is_async_p (...)
<- multi-thread->to_is_async_p (0x1ebb580) = 1
<- multi-thread->to_terminal_ours (0x1ebb580)
-> multi-thread->to_thread_address_space (...)
<- multi-thread->to_thread_address_space (0x1ebb580, 26802) = 1
In this case you can see nested calls. The "multi-thread" on the left
hand side is the topmost target's shortname.
There are some oddities with this patch. I'm on the fence about it
all, I really just wrote it on a whim.
It's not simple to convert every possible method, since a few don't
participate in target delegation.
Printing is done by type, so I introduced some new
debug-printing-specific typedefs to handle cases where it is nicer to
do something else.
On the plus side, this lays the groundwork for making targetdebug
affect every layer of the target stack. The idea would be to wrap
each target_ops in the stack with its own debug_target, and then you
could see calls propagate down the stack and back up; I suppose with
indentation to make it prettier. (That said there are some gotchas
lurking in this idea due to target stack introspection.)
Regtested on x86-64 Fedora 20.
2014-07-24 Tom Tromey <tromey@redhat.com>
* make-target-delegates (munge_type, write_debugmethod): New
functions.
(debug_names): New global.
($TARGET_DEBUG_PRINTER): New global.
(write_function_header): Strip TARGET_DEBUG_PRINTER from the type
name.
Write debug methods. Generate init_debug_target.
* target-debug.h: New file.
* target-delegates.c: Rebuild.
* target.c: Include target-debug.h.
(debug_target): Hoist definition.
(target_kill, target_get_section_table, target_memory_map)
(target_flash_erase, target_flash_done, target_detach)
(target_disconnect, target_wait, target_resume)
(target_pass_signals, target_program_signals, target_follow_fork)
(target_mourn_inferior, target_search_memory)
(target_thread_address_space, target_close)
(target_find_new_threads, target_core_of_thread)
(target_verify_memory, target_insert_mask_watchpoint)
(target_remove_mask_watchpoint): Remove targetdebug code.
(debug_to_post_attach, debug_to_prepare_to_store)
(debug_to_files_info, debug_to_insert_breakpoint)
(debug_to_remove_breakpoint, debug_to_can_use_hw_breakpoint)
(debug_to_region_ok_for_hw_watchpoint)
(debug_to_can_accel_watchpoint_condition)
(debug_to_stopped_by_watchpoint, debug_to_stopped_data_address)
(debug_to_watchpoint_addr_within_range)
(debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint)
(debug_to_insert_watchpoint, debug_to_remove_watchpoint)
(debug_to_terminal_init, debug_to_terminal_inferior)
(debug_to_terminal_ours_for_output, debug_to_terminal_ours)
(debug_to_terminal_save_ours, debug_to_terminal_info)
(debug_to_load, debug_to_post_startup_inferior)
(debug_to_insert_fork_catchpoint)
(debug_to_remove_fork_catchpoint)
(debug_to_insert_vfork_catchpoint)
(debug_to_remove_vfork_catchpoint)
(debug_to_insert_exec_catchpoint)
(debug_to_remove_exec_catchpoint, debug_to_has_exited)
(debug_to_can_run, debug_to_thread_architecture, debug_to_stop)
(debug_to_rcmd, debug_to_pid_to_exec_file): Remove.
(setup_target_debug): Call init_debug_target.
* target.h (TARGET_DEBUG_PRINTER): New macro.
(struct target_ops) <to_resume, to_wait, to_pass_signals,
to_program_signals>: Use TARGET_DEBUG_PRINTER.
2014-06-16 11:28:57 +08:00
|
|
|
|
}
|
|
|
|
|
fputs_unfiltered (" }", gdb_stdlog);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif /* TARGET_DEBUG_H */
|