gdb: convert target debug macros to functions

Convert all the macros to static functions.  Some macros were unused,
and now that they are functions, got flagged by the compiler, so I
omitted them.

No behavior change expected.

Change-Id: Ia88e61d95e29a0378901c71aa50df7c37d16bebe
Approved-By: Tom Tromey <tom@tromey.com>
This commit is contained in:
Simon Marchi
2024-04-17 16:54:07 -04:00
committed by Simon Marchi
parent f74d62a1bc
commit ebb8507cee

View File

@@ -38,150 +38,273 @@
more simply done there, and target_xfer_partial additionally more simply done there, and target_xfer_partial additionally
bypasses the debug target. */ bypasses the debug target. */
#include "gdbarch.h"
#include "gdbsupport/x86-xstate.h" #include "gdbsupport/x86-xstate.h"
#include "progspace.h"
#include "target.h" #include "target.h"
#include "target/wait.h" #include "target/wait.h"
#include "target/waitstatus.h" #include "target/waitstatus.h"
/* Helper macro. */ /* The functions defined in this header file are not marked "inline", such
that any function not used by target-delegates.c (the only user of this file)
will be flagged as unused. */
#define target_debug_do_print(E) \ static void
gdb_puts ((E), gdb_stdlog); target_debug_do_print (const char *s)
{ gdb_puts (s, gdb_stdlog); }
#define target_debug_print_target_object(X) \ static void
target_debug_do_print (plongest (X)) target_debug_print_target_object (target_object object)
#define target_debug_print_CORE_ADDR(X) \ { target_debug_do_print (plongest (object)); }
target_debug_do_print (core_addr_to_string (X))
#define target_debug_print_const_char_p(X) \ static void
target_debug_do_print (((X) ? (X) : "(null)")) target_debug_print_CORE_ADDR (CORE_ADDR addr)
#define target_debug_print_char_p(X) \ { target_debug_do_print (core_addr_to_string (addr)); }
target_debug_do_print (((X) ? (X) : "(null)"))
#define target_debug_print_int(X) \ static void
target_debug_do_print (plongest (X)) target_debug_print_const_char_p (const char *s)
#define target_debug_print_bool(X) \ { target_debug_do_print (s != nullptr ? s : "(null)"); }
target_debug_do_print ((X) ? "true" : "false")
#define target_debug_print_long(X) \ static void
target_debug_do_print (plongest (X)) target_debug_print_int (int v)
#define target_debug_print_target_xfer_status(X) \ { target_debug_do_print (plongest (v)); }
target_debug_do_print (plongest (X))
#define target_debug_print_exec_direction_kind(X) \ static void
target_debug_do_print (plongest (X)) target_debug_print_bool (bool v)
#define target_debug_print_trace_find_type(X) \ { target_debug_do_print (v ? "true" : "false"); }
target_debug_do_print (plongest (X))
#define target_debug_print_btrace_read_type(X) \ static void
target_debug_do_print (plongest (X)) target_debug_print_long (long v)
#define target_debug_print_btrace_error(X) \ { target_debug_do_print (plongest (v)); }
target_debug_do_print (plongest (X))
#define target_debug_print_ptid_t(X) \ static void
target_debug_do_print (plongest (X.pid ())) target_debug_print_target_xfer_status (target_xfer_status status)
#define target_debug_print_gdbarch_p(X) \ { target_debug_do_print (plongest (status)); }
target_debug_do_print (gdbarch_bfd_arch_info (X)->printable_name)
#define target_debug_print_const_gdb_byte_p(X) \ static void
target_debug_do_print (host_address_to_string (X)) target_debug_print_exec_direction_kind (exec_direction_kind kind)
#define target_debug_print_gdb_byte_p(X) \ { target_debug_do_print (plongest (kind)); }
target_debug_do_print (host_address_to_string (X))
#define target_debug_print_const_gdb_byte_pp(X) \ static void
target_debug_do_print (host_address_to_string (*(X))) target_debug_print_trace_find_type (trace_find_type type)
#define target_debug_print_gdb_signal(X) \ { target_debug_do_print (plongest (type)); }
target_debug_do_print (gdb_signal_to_name (X))
#define target_debug_print_ULONGEST(X) \ static void
target_debug_do_print (hex_string (X)) target_debug_print_btrace_read_type (btrace_read_type type)
#define target_debug_print_ULONGEST_p(X) \ { target_debug_do_print (plongest (type)); }
target_debug_do_print (hex_string (*(X)))
#define target_debug_print_LONGEST(X) \ static void
target_debug_do_print (phex (X, 0)) target_debug_print_btrace_error (btrace_error error)
#define target_debug_print_LONGEST_p(X) \ { target_debug_do_print (plongest (error)); }
target_debug_do_print (phex (*(X), 0))
#define target_debug_print_address_space_p(X) \ static void
target_debug_do_print (plongest ((X)->num ())) target_debug_print_ptid_t (ptid_t ptid)
#define target_debug_print_bp_target_info_p(X) \ { target_debug_do_print (plongest (ptid.pid ())); }
target_debug_do_print (core_addr_to_string ((X)->placed_address))
#define target_debug_print_expression_p(X) \ static void
target_debug_do_print (host_address_to_string (X)) target_debug_print_gdbarch_p (gdbarch *arch)
#define target_debug_print_CORE_ADDR_p(X) \ { target_debug_do_print (gdbarch_bfd_arch_info (arch)->printable_name); }
target_debug_do_print (core_addr_to_string (*(X)))
#define target_debug_print_int_p(X) \ static void
target_debug_do_print (plongest (*(X))) target_debug_print_const_gdb_byte_p (const gdb_byte *p)
#define target_debug_print_regcache_p(X) \ { target_debug_do_print (host_address_to_string (p)); }
target_debug_do_print (host_address_to_string (X))
#define target_debug_print_thread_info_p(X) \ static void
target_debug_do_print (host_address_to_string (X)) target_debug_print_gdb_byte_p (gdb_byte *p)
#define target_debug_print_ui_file_p(X) \ { target_debug_do_print (host_address_to_string (p)); }
target_debug_do_print (host_address_to_string (X))
#define target_debug_print_const_std_vector_target_section_p(X) \ static void
target_debug_do_print (host_address_to_string (X->data ())) target_debug_print_const_gdb_byte_pp (const gdb_byte **p)
#define target_debug_print_void_p(X) \ { target_debug_do_print (host_address_to_string (*p)); }
target_debug_do_print (host_address_to_string (X))
#define target_debug_print_find_memory_region_ftype(X) \ static void
target_debug_do_print (host_address_to_string (X)) target_debug_print_gdb_signal (gdb_signal sig)
#define target_debug_print_bfd_p(X) \ { target_debug_do_print (gdb_signal_to_name (sig)); }
target_debug_do_print (host_address_to_string (X))
#define target_debug_print_std_vector_mem_region(X) \ static void
target_debug_do_print (host_address_to_string (X.data ())) target_debug_print_ULONGEST (ULONGEST v)
#define target_debug_print_std_vector_static_tracepoint_marker(X) \ { target_debug_do_print (hex_string (v)); }
target_debug_do_print (host_address_to_string (X.data ()))
#define target_debug_print_const_target_desc_p(X) \ static void
target_debug_do_print (host_address_to_string (X)) target_debug_print_ULONGEST_p (ULONGEST *p)
#define target_debug_print_bp_location_p(X) \ { target_debug_do_print (hex_string (*p)); }
target_debug_do_print (host_address_to_string (X))
#define target_debug_print_const_trace_state_variable_r(X) \ static void
target_debug_do_print (host_address_to_string (&X)) target_debug_print_LONGEST (LONGEST v)
#define target_debug_print_trace_status_p(X) \ { target_debug_do_print (phex (v, 0)); }
target_debug_do_print (host_address_to_string (X))
#define target_debug_print_breakpoint_p(X) \ static void
target_debug_do_print (host_address_to_string (X)) target_debug_print_LONGEST_p (LONGEST *p)
#define target_debug_print_tracepoint_p(X) \ { target_debug_do_print (phex (*p, 0)); }
target_debug_do_print (host_address_to_string (X))
#define target_debug_print_uploaded_tp_p(X) \ static void
target_debug_do_print (host_address_to_string (X)) target_debug_print_bp_target_info_p (bp_target_info *bp)
#define target_debug_print_uploaded_tp_pp(X) \ { target_debug_do_print (core_addr_to_string (bp->placed_address)); }
target_debug_do_print (host_address_to_string (X))
#define target_debug_print_uploaded_tsv_pp(X) \ static void
target_debug_do_print (host_address_to_string (X)) target_debug_print_expression_p (expression *exp)
#define target_debug_print_static_tracepoint_marker_p(X) \ { target_debug_do_print (host_address_to_string (exp)); }
target_debug_do_print (host_address_to_string (X))
#define target_debug_print_btrace_target_info_p(X) \ static void
target_debug_do_print (host_address_to_string (X)) target_debug_print_CORE_ADDR_p (CORE_ADDR *p)
#define target_debug_print_const_frame_unwind_p(X) \ { target_debug_do_print (core_addr_to_string (*p)); }
target_debug_do_print (host_address_to_string (X))
#define target_debug_print_btrace_data_p(X) \ static void
target_debug_do_print (host_address_to_string (X)) target_debug_print_int_p (int *p)
#define target_debug_print_record_method(X) \ { target_debug_do_print (plongest (*p)); }
target_debug_do_print (plongest (X))
#define target_debug_print_const_btrace_config_p(X) \ static void
target_debug_do_print (host_address_to_string (X)) target_debug_print_regcache_p (regcache *regcache)
#define target_debug_print_const_btrace_target_info_p(X) \ { target_debug_do_print (host_address_to_string (regcache)); }
target_debug_do_print (host_address_to_string (X))
#define target_debug_print_target_hw_bp_type(X) \ static void
target_debug_do_print (plongest (X)) target_debug_print_thread_info_p (thread_info *thread)
#define target_debug_print_bptype(X) \ { target_debug_do_print (host_address_to_string (thread)); }
target_debug_do_print (plongest (X))
#define target_debug_print_inferior_p(X) \ static void
target_debug_do_print (host_address_to_string (X)) target_debug_print_ui_file_p (ui_file *file)
#define target_debug_print_remove_bp_reason(X) \ { target_debug_do_print (host_address_to_string (file)); }
target_debug_do_print (plongest (X))
#define target_debug_print_gdb_disassembly_flags(X) \ static void
target_debug_do_print (plongest (X)) target_debug_print_const_std_vector_target_section_p
#define target_debug_print_traceframe_info_up(X) \ (const std::vector<target_section> *vec)
target_debug_do_print (host_address_to_string (X.get ())) { target_debug_do_print (host_address_to_string (vec->data ())); }
#define target_debug_print_gdb_array_view_const_int(X) \
target_debug_do_print (host_address_to_string (X.data ())) static void
#define target_debug_print_record_print_flags(X) \ target_debug_print_void_p (void *p)
target_debug_do_print (plongest (X)) { target_debug_do_print (host_address_to_string (p)); }
#define target_debug_print_thread_control_capabilities(X) \
target_debug_do_print (plongest (X)) static void
#define target_debug_print_thread_info_p(X) \ target_debug_print_find_memory_region_ftype (find_memory_region_ftype func)
target_debug_do_print (host_address_to_string (X)) { target_debug_do_print (host_address_to_string (func)); }
#define target_debug_print_std_string(X) \
target_debug_do_print ((X).c_str ()) static void
#define target_debug_print_gdb_byte_vector(X) \ target_debug_print_bfd_p (bfd *bfd)
target_debug_do_print (host_address_to_string (X.data ())) { target_debug_do_print (host_address_to_string (bfd)); }
#define target_debug_print_gdb_unique_xmalloc_ptr_char(X) \
target_debug_do_print (X.get ()) static void
#define target_debug_print_target_waitkind(X) \ target_debug_print_std_vector_mem_region (const std::vector<mem_region> &vec)
target_debug_do_print (pulongest (X)) { target_debug_do_print (host_address_to_string (vec.data ())); }
#define target_debug_print_gdb_thread_options(X) \
target_debug_do_print (to_string (X).c_str ()) static void
target_debug_print_std_vector_static_tracepoint_marker
(const std::vector<static_tracepoint_marker> &vec)
{ target_debug_do_print (host_address_to_string (vec.data ())); }
static void
target_debug_print_const_target_desc_p (const target_desc *tdesc)
{ target_debug_do_print (host_address_to_string (tdesc)); }
static void
target_debug_print_bp_location_p (bp_location *loc)
{ target_debug_do_print (host_address_to_string (loc)); }
static void
target_debug_print_const_trace_state_variable_r
(const trace_state_variable &tsv)
{ target_debug_do_print (host_address_to_string (&tsv)); }
static void
target_debug_print_trace_status_p (trace_status *status)
{ target_debug_do_print (host_address_to_string (status)); }
static void
target_debug_print_tracepoint_p (tracepoint *tp)
{ target_debug_do_print (host_address_to_string (tp)); }
static void
target_debug_print_uploaded_tp_p (uploaded_tp *tp)
{ target_debug_do_print (host_address_to_string (tp)); }
static void
target_debug_print_uploaded_tp_pp (uploaded_tp **v)
{ target_debug_do_print (host_address_to_string (*v)); }
static void
target_debug_print_uploaded_tsv_pp (uploaded_tsv **tsv)
{ target_debug_do_print (host_address_to_string (tsv)); }
static void
target_debug_print_static_tracepoint_marker_p (static_tracepoint_marker *marker)
{ target_debug_do_print (host_address_to_string (marker)); }
static void
target_debug_print_btrace_target_info_p (btrace_target_info *info)
{ target_debug_do_print (host_address_to_string (info)); }
static void
target_debug_print_const_frame_unwind_p (const frame_unwind *fu)
{ target_debug_do_print (host_address_to_string (fu)); }
static void
target_debug_print_btrace_data_p (btrace_data *data)
{ target_debug_do_print (host_address_to_string (data)); }
static void
target_debug_print_record_method (record_method method)
{ target_debug_do_print (plongest (method)); }
static void
target_debug_print_const_btrace_config_p (const btrace_config *config)
{ target_debug_do_print (host_address_to_string (config)); }
static void
target_debug_print_const_btrace_target_info_p (const btrace_target_info *info)
{ target_debug_do_print (host_address_to_string (info)); }
static void
target_debug_print_target_hw_bp_type (target_hw_bp_type type)
{ target_debug_do_print (plongest (type)); }
static void
target_debug_print_bptype (bptype type)
{ target_debug_do_print (plongest (type)); }
static void
target_debug_print_inferior_p (inferior *inf)
{ target_debug_do_print (host_address_to_string (inf)); }
static void
target_debug_print_remove_bp_reason (remove_bp_reason reason)
{ target_debug_do_print (plongest (reason)); }
static void
target_debug_print_gdb_disassembly_flags (gdb_disassembly_flags flags)
{ target_debug_do_print (plongest (flags)); }
static void
target_debug_print_traceframe_info_up (std::unique_ptr<traceframe_info> &info)
{ target_debug_do_print (host_address_to_string (info.get ())); }
static void
target_debug_print_gdb_array_view_const_int
(const gdb::array_view<const int> &view)
{ target_debug_do_print (host_address_to_string (view.data ())); }
static void
target_debug_print_record_print_flags (record_print_flags flags)
{ target_debug_do_print (plongest (flags)); }
static void
target_debug_print_thread_control_capabilities (thread_control_capabilities cap)
{ target_debug_do_print (plongest (cap)); }
static void
target_debug_print_std_string (const std::string &str)
{ target_debug_do_print (str.c_str ()); }
static void
target_debug_print_gdb_unique_xmalloc_ptr_char
(const gdb::unique_xmalloc_ptr<char> &p)
{ target_debug_do_print (p.get ()); }
static void
target_debug_print_target_waitkind (target_waitkind kind)
{ target_debug_do_print (pulongest (kind)); }
static void
target_debug_print_gdb_thread_options (gdb_thread_options options)
{ target_debug_do_print (to_string (options).c_str ()); }
static void static void
target_debug_print_target_waitstatus_p (struct target_waitstatus *status) target_debug_print_target_waitstatus_p (struct target_waitstatus *status)
@@ -189,12 +312,11 @@ target_debug_print_target_waitstatus_p (struct target_waitstatus *status)
gdb_puts (status->to_string ().c_str (), gdb_stdlog); gdb_puts (status->to_string ().c_str (), gdb_stdlog);
} }
/* Functions that are used via TARGET_DEBUG_PRINTER. */
/* Macros or functions that are used via TARGET_DEBUG_PRINTER. */ static void
target_debug_print_step (int step)
#define target_debug_print_step(X) \ { target_debug_do_print (step ? "step" : "continue"); }
target_debug_do_print ((X) ? "step" : "continue")
static void static void
target_debug_print_target_wait_flags (target_wait_flags options) target_debug_print_target_wait_flags (target_wait_flags options)