From patchwork Wed Apr 17 20:54:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 88621 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C7DDB385841E for ; Wed, 17 Apr 2024 20:55:27 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 5B6D93858D39 for ; Wed, 17 Apr 2024 20:54:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5B6D93858D39 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=polymtl.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=polymtl.ca ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5B6D93858D39 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=132.207.4.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713387282; cv=none; b=C84Zz7EK9q7Av6DygSKRo6kQz/+DbVi/wSjWiUNV/Itg0W58C2nob10K5u/38onaSt2N5x4obSENhPiKiaKqUV5/ITiBmtzb5v8gRmNNrF+hFYtDm+JZCxMmRSDI5H0sUzWuGMPJU3AdNdWDe6B1LoeFxdyPI/sg9mpx7FN9hMw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713387282; c=relaxed/simple; bh=dAcUefW58t2w3rAwtYM5HLF+ZF0L1jttge/KxfoHAqc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=HuVs1Djpc5Gfzu7u+Z1jr1QOIpLX8SVvYE3kLF931ZCl2zyY6TXr2zAspqbQyt5zJohtMnHozgvKngmUr3iSc++L1C7hoSTLhfU9IcIqm8LSC2hFvkikZHNZu+O7T6laNS0ja7n9skq0uTQPTS8x1KmQ6z7o/+2uU7wONJBsW8k= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 43HKsSp9036397 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Apr 2024 16:54:33 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 43HKsSp9036397 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1713387273; bh=IyGqJh0bu+9E62ib/CpAXx2SVoJlzdoO8QH7UBcNzok=; h=From:To:Cc:Subject:Date:In-Reply-To:From; b=GQdFFEzTxsEKLafinsIJBgP36d6tAQ+PS136Stuqf62f2vMdDaFHPpNEKttncDNga ycapm6VDYpqEQGIPD/5CvDTBFLBKAYQUSPzFvNALeqAza7VvfqGe8vBfTov1Xuqq73 3vYrKDY7JWE5Ykii26uXRqXIu3Xujty5fncITZjY= Received: from simark.localdomain (modemcable238.237-201-24.mc.videotron.ca [24.201.237.238]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 3EA2E1E0C0; Wed, 17 Apr 2024 16:54:28 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 3/6] gdb: make target debug functions return std::string Date: Wed, 17 Apr 2024 16:54:08 -0400 Message-ID: <20240417205426.2030615-3-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240417205426.2030615-1-simon.marchi@polymtl.ca> References: <20240417205426.2030615-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Wed, 17 Apr 2024 20:54:28 +0000 X-Spam-Status: No, score=-3188.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org From: Simon Marchi Change the functions in target-debug.h to return string representations in an std::string, such that they don't need to know how the printing part is done. This also helps the following patch that makes the debug prints in debug_target one-liners. Update target-delegates.c (through make-target-delegates.py) to do the printing. Add an overload of gdb_puts to avoid using `.c_str ()`. Change-Id: I55cbff1c1b03a3b24a81740e34c6ad41ac4f8453 --- gdb/make-target-delegates.py | 5 +- gdb/target-debug.h | 339 ++++++++++++++--------------- gdb/target-delegates.c | 404 +++++++++++++++++------------------ gdb/utils.c | 6 + gdb/utils.h | 2 + 5 files changed, 379 insertions(+), 377 deletions(-) diff --git a/gdb/make-target-delegates.py b/gdb/make-target-delegates.py index 1893fc63ca84..051efce94dab 100755 --- a/gdb/make-target-delegates.py +++ b/gdb/make-target-delegates.py @@ -301,7 +301,10 @@ def write_debugmethod( if i > 0: print(' gdb_puts (", ", gdb_stdlog);', file=f) printer = munge_type(argtypes[i]) - print(" " + printer + " (" + names[i] + ");", file=f) + print( + " gdb_puts (" + printer + " (" + names[i] + "), gdb_stdlog);", + file=f, + ) if return_type != "void": print(' gdb_puts (") = ", gdb_stdlog);', file=f) printer = munge_type(return_type) diff --git a/gdb/target-debug.h b/gdb/target-debug.h index 801b96298c5f..1ed4517f7ffc 100644 --- a/gdb/target-debug.h +++ b/gdb/target-debug.h @@ -49,337 +49,324 @@ that any function not used by target-delegates.c (the only user of this file) will be flagged as unused. */ -static void -target_debug_do_print (const char *s) -{ gdb_puts (s, gdb_stdlog); } - -static void +static std::string target_debug_print_target_object (target_object object) -{ target_debug_do_print (plongest (object)); } +{ return plongest (object); } -static void +static std::string target_debug_print_CORE_ADDR (CORE_ADDR addr) -{ target_debug_do_print (core_addr_to_string (addr)); } +{ return core_addr_to_string (addr); } -static void +static std::string target_debug_print_const_char_p (const char *s) -{ target_debug_do_print (s != nullptr ? s : "(null)"); } +{ return s != nullptr ? s : "(null)"; } -static void +static std::string target_debug_print_int (int v) -{ target_debug_do_print (plongest (v)); } +{ return plongest (v); } -static void +static std::string target_debug_print_bool (bool v) -{ target_debug_do_print (v ? "true" : "false"); } +{ return v ? "true" : "false"; } -static void +static std::string target_debug_print_long (long v) -{ target_debug_do_print (plongest (v)); } +{ return plongest (v); } -static void +static std::string target_debug_print_target_xfer_status (target_xfer_status status) -{ target_debug_do_print (plongest (status)); } +{ return plongest (status); } -static void +static std::string target_debug_print_exec_direction_kind (exec_direction_kind kind) -{ target_debug_do_print (plongest (kind)); } +{ return plongest (kind); } -static void +static std::string target_debug_print_trace_find_type (trace_find_type type) -{ target_debug_do_print (plongest (type)); } +{ return plongest (type); } -static void +static std::string target_debug_print_btrace_read_type (btrace_read_type type) -{ target_debug_do_print (plongest (type)); } +{ return plongest (type); } -static void +static std::string target_debug_print_btrace_error (btrace_error error) -{ target_debug_do_print (plongest (error)); } +{ return plongest (error); } -static void +static std::string target_debug_print_ptid_t (ptid_t ptid) -{ target_debug_do_print (plongest (ptid.pid ())); } +{ return plongest (ptid.pid ()); } -static void +static std::string target_debug_print_gdbarch_p (gdbarch *arch) -{ target_debug_do_print (gdbarch_bfd_arch_info (arch)->printable_name); } +{ return gdbarch_bfd_arch_info (arch)->printable_name; } -static void +static std::string target_debug_print_const_gdb_byte_p (const gdb_byte *p) -{ target_debug_do_print (host_address_to_string (p)); } +{ return host_address_to_string (p); } -static void +static std::string target_debug_print_gdb_byte_p (gdb_byte *p) -{ target_debug_do_print (host_address_to_string (p)); } +{ return host_address_to_string (p); } -static void +static std::string target_debug_print_const_gdb_byte_pp (const gdb_byte **p) -{ target_debug_do_print (host_address_to_string (*p)); } +{ return host_address_to_string (*p); } -static void +static std::string target_debug_print_gdb_signal (gdb_signal sig) -{ target_debug_do_print (gdb_signal_to_name (sig)); } +{ return gdb_signal_to_name (sig); } -static void +static std::string target_debug_print_ULONGEST (ULONGEST v) -{ target_debug_do_print (hex_string (v)); } +{ return hex_string (v); } -static void +static std::string target_debug_print_ULONGEST_p (ULONGEST *p) -{ target_debug_do_print (hex_string (*p)); } +{ return hex_string (*p); } -static void +static std::string target_debug_print_LONGEST (LONGEST v) -{ target_debug_do_print (phex (v, 0)); } +{ return phex (v, 0); } -static void +static std::string target_debug_print_LONGEST_p (LONGEST *p) -{ target_debug_do_print (phex (*p, 0)); } +{ return phex (*p, 0); } -static void +static std::string target_debug_print_bp_target_info_p (bp_target_info *bp) -{ target_debug_do_print (core_addr_to_string (bp->placed_address)); } +{ return core_addr_to_string (bp->placed_address); } -static void +static std::string target_debug_print_expression_p (expression *exp) -{ target_debug_do_print (host_address_to_string (exp)); } +{ return host_address_to_string (exp); } -static void +static std::string target_debug_print_CORE_ADDR_p (CORE_ADDR *p) -{ target_debug_do_print (core_addr_to_string (*p)); } +{ return core_addr_to_string (*p); } -static void +static std::string target_debug_print_int_p (int *p) -{ target_debug_do_print (plongest (*p)); } +{ return plongest (*p); } -static void +static std::string target_debug_print_regcache_p (regcache *regcache) -{ target_debug_do_print (host_address_to_string (regcache)); } +{ return host_address_to_string (regcache); } -static void +static std::string target_debug_print_thread_info_p (thread_info *thread) -{ target_debug_do_print (host_address_to_string (thread)); } +{ return host_address_to_string (thread); } -static void +static std::string target_debug_print_ui_file_p (ui_file *file) -{ target_debug_do_print (host_address_to_string (file)); } +{ return host_address_to_string (file); } -static void +static std::string target_debug_print_const_std_vector_target_section_p (const std::vector *vec) -{ target_debug_do_print (host_address_to_string (vec->data ())); } +{ return host_address_to_string (vec->data ()); } -static void +static std::string target_debug_print_void_p (void *p) -{ target_debug_do_print (host_address_to_string (p)); } +{ return host_address_to_string (p); } -static void +static std::string target_debug_print_find_memory_region_ftype (find_memory_region_ftype func) -{ target_debug_do_print (host_address_to_string (func)); } +{ return host_address_to_string (func); } -static void +static std::string target_debug_print_bfd_p (bfd *bfd) -{ target_debug_do_print (host_address_to_string (bfd)); } +{ return host_address_to_string (bfd); } -static void +static std::string target_debug_print_std_vector_mem_region (const std::vector &vec) -{ target_debug_do_print (host_address_to_string (vec.data ())); } +{ return host_address_to_string (vec.data ()); } -static void +static std::string target_debug_print_std_vector_static_tracepoint_marker (const std::vector &vec) -{ target_debug_do_print (host_address_to_string (vec.data ())); } +{ return host_address_to_string (vec.data ()); } -static void +static std::string target_debug_print_const_target_desc_p (const target_desc *tdesc) -{ target_debug_do_print (host_address_to_string (tdesc)); } +{ return host_address_to_string (tdesc); } -static void +static std::string target_debug_print_bp_location_p (bp_location *loc) -{ target_debug_do_print (host_address_to_string (loc)); } +{ return host_address_to_string (loc); } -static void +static std::string target_debug_print_const_trace_state_variable_r (const trace_state_variable &tsv) -{ target_debug_do_print (host_address_to_string (&tsv)); } +{ return host_address_to_string (&tsv); } -static void +static std::string target_debug_print_trace_status_p (trace_status *status) -{ target_debug_do_print (host_address_to_string (status)); } +{ return host_address_to_string (status); } -static void +static std::string target_debug_print_tracepoint_p (tracepoint *tp) -{ target_debug_do_print (host_address_to_string (tp)); } +{ return host_address_to_string (tp); } -static void +static std::string target_debug_print_uploaded_tp_p (uploaded_tp *tp) -{ target_debug_do_print (host_address_to_string (tp)); } +{ return host_address_to_string (tp); } -static void +static std::string target_debug_print_uploaded_tp_pp (uploaded_tp **v) -{ target_debug_do_print (host_address_to_string (*v)); } +{ return host_address_to_string (*v); } -static void +static std::string target_debug_print_uploaded_tsv_pp (uploaded_tsv **tsv) -{ target_debug_do_print (host_address_to_string (tsv)); } +{ return host_address_to_string (tsv); } -static void +static std::string target_debug_print_static_tracepoint_marker_p (static_tracepoint_marker *marker) -{ target_debug_do_print (host_address_to_string (marker)); } +{ return host_address_to_string (marker); } -static void +static std::string target_debug_print_btrace_target_info_p (btrace_target_info *info) -{ target_debug_do_print (host_address_to_string (info)); } +{ return host_address_to_string (info); } -static void +static std::string target_debug_print_const_frame_unwind_p (const frame_unwind *fu) -{ target_debug_do_print (host_address_to_string (fu)); } +{ return host_address_to_string (fu); } -static void +static std::string target_debug_print_btrace_data_p (btrace_data *data) -{ target_debug_do_print (host_address_to_string (data)); } +{ return host_address_to_string (data); } -static void +static std::string target_debug_print_record_method (record_method method) -{ target_debug_do_print (plongest (method)); } +{ return plongest (method); } -static void +static std::string target_debug_print_const_btrace_config_p (const btrace_config *config) -{ target_debug_do_print (host_address_to_string (config)); } +{ return host_address_to_string (config); } -static void +static std::string target_debug_print_const_btrace_target_info_p (const btrace_target_info *info) -{ target_debug_do_print (host_address_to_string (info)); } +{ return host_address_to_string (info); } -static void +static std::string target_debug_print_target_hw_bp_type (target_hw_bp_type type) -{ target_debug_do_print (plongest (type)); } +{ return plongest (type); } -static void +static std::string target_debug_print_bptype (bptype type) -{ target_debug_do_print (plongest (type)); } +{ return plongest (type); } -static void +static std::string target_debug_print_inferior_p (inferior *inf) -{ target_debug_do_print (host_address_to_string (inf)); } +{ return host_address_to_string (inf); } -static void +static std::string target_debug_print_remove_bp_reason (remove_bp_reason reason) -{ target_debug_do_print (plongest (reason)); } +{ return plongest (reason); } -static void +static std::string target_debug_print_gdb_disassembly_flags (gdb_disassembly_flags flags) -{ target_debug_do_print (plongest (flags)); } +{ return plongest (flags); } -static void +static std::string target_debug_print_traceframe_info_up (std::unique_ptr &info) -{ target_debug_do_print (host_address_to_string (info.get ())); } +{ return host_address_to_string (info.get ()); } -static void +static std::string target_debug_print_gdb_array_view_const_int (const gdb::array_view &view) -{ target_debug_do_print (host_address_to_string (view.data ())); } +{ return host_address_to_string (view.data ()); } -static void +static std::string target_debug_print_record_print_flags (record_print_flags flags) -{ target_debug_do_print (plongest (flags)); } +{ return plongest (flags); } -static void +static std::string target_debug_print_thread_control_capabilities (thread_control_capabilities cap) -{ target_debug_do_print (plongest (cap)); } +{ return plongest (cap); } -static void +static std::string target_debug_print_std_string (const std::string &str) -{ target_debug_do_print (str.c_str ()); } +{ return str.c_str (); } -static void +static std::string target_debug_print_gdb_unique_xmalloc_ptr_char (const gdb::unique_xmalloc_ptr &p) -{ target_debug_do_print (p.get ()); } +{ return p.get (); } -static void +static std::string target_debug_print_target_waitkind (target_waitkind kind) -{ target_debug_do_print (pulongest (kind)); } +{ return pulongest (kind); } -static void +static std::string target_debug_print_gdb_thread_options (gdb_thread_options options) -{ target_debug_do_print (to_string (options).c_str ()); } +{ return to_string (options); } -static void +static std::string target_debug_print_target_waitstatus_p (struct target_waitstatus *status) -{ - gdb_puts (status->to_string ().c_str (), gdb_stdlog); -} +{ return status->to_string (); } /* Functions that are used via TARGET_DEBUG_PRINTER. */ -static void +static const char * target_debug_print_step (int step) -{ target_debug_do_print (step ? "step" : "continue"); } +{ return step ? "step" : "continue"; } -static void +static std::string target_debug_print_target_wait_flags (target_wait_flags options) -{ - std::string str = target_options_to_string (options); - - gdb_puts (str.c_str (), gdb_stdlog); -} +{ return target_options_to_string (options); } -static void +static std::string target_debug_print_signals (gdb::array_view sigs) { - gdb_puts ("{", gdb_stdlog); + std::string s = "{"; for (size_t i = 0; i < sigs.size (); i++) if (sigs[i] != 0) - { - gdb_printf (gdb_stdlog, " %s", - gdb_signal_to_name ((enum gdb_signal) i)); - } - gdb_puts (" }", gdb_stdlog); + string_appendf (s, " %s", + gdb_signal_to_name (static_cast(i))); + + string_appendf (s, " }"); + + return s; } -static void +static const char * target_debug_print_size_t (size_t size) { - gdb_printf (gdb_stdlog, "%s", pulongest (size)); + return pulongest (size); } -static void +static std::string target_debug_print_gdb_array_view_const_gdb_byte (gdb::array_view vector) { - gdb_puts ("{", gdb_stdlog); - - for (size_t i = 0; i < vector.size (); i++) - { - gdb_printf (gdb_stdlog, " %s", - phex_nz (vector[i], 1)); - } - gdb_puts (" }", gdb_stdlog); + std::string s = "{"; + + for (const auto b : vector) + string_appendf (s, " %s", phex_nz (b, 1)); + + string_appendf (s, " }"); + + return s; } -static void +static std::string target_debug_print_const_gdb_byte_vector_r (const gdb::byte_vector &vector) -{ - target_debug_print_gdb_array_view_const_gdb_byte (vector); -} +{ return target_debug_print_gdb_array_view_const_gdb_byte (vector); } -static void +static std::string target_debug_print_gdb_byte_vector_r (gdb::byte_vector &vector) -{ - target_debug_print_const_gdb_byte_vector_r (vector); -} +{ return target_debug_print_const_gdb_byte_vector_r (vector); } -static void +static std::string target_debug_print_x86_xsave_layout (const x86_xsave_layout &layout) { - gdb_puts ("{", gdb_stdlog); - gdb_printf (gdb_stdlog, " sizeof_xsave=%d", layout.sizeof_xsave); -#define POFFS(region) \ - if (layout.region##_offset != 0) \ - gdb_printf (gdb_stdlog, ", %s_offset=%d", #region, \ - layout.region##_offset) + std::string s = string_printf ("{ sizeof_xsave=%d", layout.sizeof_xsave); + +#define POFFS(region) \ + if (layout.region##_offset != 0) \ + string_appendf (s, ", " #region "_offset=%d", layout.region##_offset); + POFFS(avx); POFFS(bndregs); POFFS(bndcfg); @@ -387,7 +374,11 @@ target_debug_print_x86_xsave_layout (const x86_xsave_layout &layout) POFFS(zmm_h); POFFS(zmm); POFFS(pkru); + #undef POFFS - gdb_puts (" }", gdb_stdlog); + + string_appendf (s, " }"); + + return s; } #endif /* TARGET_DEBUG_H */ diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index 59ea70458ad2..f6e71f32e67b 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -393,7 +393,7 @@ debug_target::post_attach (int arg0) gdb_printf (gdb_stdlog, "-> %s->post_attach (...)\n", this->beneath ()->shortname ()); this->beneath ()->post_attach (arg0); gdb_printf (gdb_stdlog, "<- %s->post_attach (", this->beneath ()->shortname ()); - target_debug_print_int (arg0); + gdb_puts (target_debug_print_int (arg0), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -414,9 +414,9 @@ debug_target::detach (inferior *arg0, int arg1) gdb_printf (gdb_stdlog, "-> %s->detach (...)\n", this->beneath ()->shortname ()); this->beneath ()->detach (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->detach (", this->beneath ()->shortname ()); - target_debug_print_inferior_p (arg0); + gdb_puts (target_debug_print_inferior_p (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg1); + gdb_puts (target_debug_print_int (arg1), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -438,9 +438,9 @@ debug_target::disconnect (const char *arg0, int arg1) gdb_printf (gdb_stdlog, "-> %s->disconnect (...)\n", this->beneath ()->shortname ()); this->beneath ()->disconnect (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->disconnect (", this->beneath ()->shortname ()); - target_debug_print_const_char_p (arg0); + gdb_puts (target_debug_print_const_char_p (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg1); + gdb_puts (target_debug_print_int (arg1), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -462,11 +462,11 @@ debug_target::resume (ptid_t arg0, int arg1, enum gdb_signal arg2) gdb_printf (gdb_stdlog, "-> %s->resume (...)\n", this->beneath ()->shortname ()); this->beneath ()->resume (arg0, arg1, arg2); gdb_printf (gdb_stdlog, "<- %s->resume (", this->beneath ()->shortname ()); - target_debug_print_ptid_t (arg0); + gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_step (arg1); + gdb_puts (target_debug_print_step (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_gdb_signal (arg2); + gdb_puts (target_debug_print_gdb_signal (arg2), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -509,11 +509,11 @@ debug_target::wait (ptid_t arg0, struct target_waitstatus *arg1, target_wait_fla ptid_t result = this->beneath ()->wait (arg0, arg1, arg2); gdb_printf (gdb_stdlog, "<- %s->wait (", this->beneath ()->shortname ()); - target_debug_print_ptid_t (arg0); + gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_target_waitstatus_p (arg1); + gdb_puts (target_debug_print_target_waitstatus_p (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_target_wait_flags (arg2); + gdb_puts (target_debug_print_target_wait_flags (arg2), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_ptid_t (result); gdb_puts ("\n", gdb_stdlog); @@ -537,9 +537,9 @@ debug_target::fetch_registers (struct regcache *arg0, int arg1) gdb_printf (gdb_stdlog, "-> %s->fetch_registers (...)\n", this->beneath ()->shortname ()); this->beneath ()->fetch_registers (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->fetch_registers (", this->beneath ()->shortname ()); - target_debug_print_regcache_p (arg0); + gdb_puts (target_debug_print_regcache_p (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg1); + gdb_puts (target_debug_print_int (arg1), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -561,9 +561,9 @@ debug_target::store_registers (struct regcache *arg0, int arg1) gdb_printf (gdb_stdlog, "-> %s->store_registers (...)\n", this->beneath ()->shortname ()); this->beneath ()->store_registers (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->store_registers (", this->beneath ()->shortname ()); - target_debug_print_regcache_p (arg0); + gdb_puts (target_debug_print_regcache_p (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg1); + gdb_puts (target_debug_print_int (arg1), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -585,7 +585,7 @@ debug_target::prepare_to_store (struct regcache *arg0) gdb_printf (gdb_stdlog, "-> %s->prepare_to_store (...)\n", this->beneath ()->shortname ()); this->beneath ()->prepare_to_store (arg0); gdb_printf (gdb_stdlog, "<- %s->prepare_to_store (", this->beneath ()->shortname ()); - target_debug_print_regcache_p (arg0); + gdb_puts (target_debug_print_regcache_p (arg0), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -628,9 +628,9 @@ debug_target::insert_breakpoint (struct gdbarch *arg0, struct bp_target_info *ar int result = this->beneath ()->insert_breakpoint (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->insert_breakpoint (", this->beneath ()->shortname ()); - target_debug_print_gdbarch_p (arg0); + gdb_puts (target_debug_print_gdbarch_p (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_bp_target_info_p (arg1); + gdb_puts (target_debug_print_bp_target_info_p (arg1), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -656,11 +656,11 @@ debug_target::remove_breakpoint (struct gdbarch *arg0, struct bp_target_info *ar int result = this->beneath ()->remove_breakpoint (arg0, arg1, arg2); gdb_printf (gdb_stdlog, "<- %s->remove_breakpoint (", this->beneath ()->shortname ()); - target_debug_print_gdbarch_p (arg0); + gdb_puts (target_debug_print_gdbarch_p (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_bp_target_info_p (arg1); + gdb_puts (target_debug_print_bp_target_info_p (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_remove_bp_reason (arg2); + gdb_puts (target_debug_print_remove_bp_reason (arg2), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -786,11 +786,11 @@ debug_target::can_use_hw_breakpoint (enum bptype arg0, int arg1, int arg2) int result = this->beneath ()->can_use_hw_breakpoint (arg0, arg1, arg2); gdb_printf (gdb_stdlog, "<- %s->can_use_hw_breakpoint (", this->beneath ()->shortname ()); - target_debug_print_bptype (arg0); + gdb_puts (target_debug_print_bptype (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg1); + gdb_puts (target_debug_print_int (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg2); + gdb_puts (target_debug_print_int (arg2), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -841,9 +841,9 @@ debug_target::insert_hw_breakpoint (struct gdbarch *arg0, struct bp_target_info int result = this->beneath ()->insert_hw_breakpoint (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->insert_hw_breakpoint (", this->beneath ()->shortname ()); - target_debug_print_gdbarch_p (arg0); + gdb_puts (target_debug_print_gdbarch_p (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_bp_target_info_p (arg1); + gdb_puts (target_debug_print_bp_target_info_p (arg1), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -869,9 +869,9 @@ debug_target::remove_hw_breakpoint (struct gdbarch *arg0, struct bp_target_info int result = this->beneath ()->remove_hw_breakpoint (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->remove_hw_breakpoint (", this->beneath ()->shortname ()); - target_debug_print_gdbarch_p (arg0); + gdb_puts (target_debug_print_gdbarch_p (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_bp_target_info_p (arg1); + gdb_puts (target_debug_print_bp_target_info_p (arg1), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -897,13 +897,13 @@ debug_target::remove_watchpoint (CORE_ADDR arg0, int arg1, enum target_hw_bp_typ int result = this->beneath ()->remove_watchpoint (arg0, arg1, arg2, arg3); gdb_printf (gdb_stdlog, "<- %s->remove_watchpoint (", this->beneath ()->shortname ()); - target_debug_print_CORE_ADDR (arg0); + gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg1); + gdb_puts (target_debug_print_int (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_target_hw_bp_type (arg2); + gdb_puts (target_debug_print_target_hw_bp_type (arg2), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_expression_p (arg3); + gdb_puts (target_debug_print_expression_p (arg3), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -929,13 +929,13 @@ debug_target::insert_watchpoint (CORE_ADDR arg0, int arg1, enum target_hw_bp_typ int result = this->beneath ()->insert_watchpoint (arg0, arg1, arg2, arg3); gdb_printf (gdb_stdlog, "<- %s->insert_watchpoint (", this->beneath ()->shortname ()); - target_debug_print_CORE_ADDR (arg0); + gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg1); + gdb_puts (target_debug_print_int (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_target_hw_bp_type (arg2); + gdb_puts (target_debug_print_target_hw_bp_type (arg2), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_expression_p (arg3); + gdb_puts (target_debug_print_expression_p (arg3), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -961,11 +961,11 @@ debug_target::insert_mask_watchpoint (CORE_ADDR arg0, CORE_ADDR arg1, enum targe int result = this->beneath ()->insert_mask_watchpoint (arg0, arg1, arg2); gdb_printf (gdb_stdlog, "<- %s->insert_mask_watchpoint (", this->beneath ()->shortname ()); - target_debug_print_CORE_ADDR (arg0); + gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_CORE_ADDR (arg1); + gdb_puts (target_debug_print_CORE_ADDR (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_target_hw_bp_type (arg2); + gdb_puts (target_debug_print_target_hw_bp_type (arg2), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -991,11 +991,11 @@ debug_target::remove_mask_watchpoint (CORE_ADDR arg0, CORE_ADDR arg1, enum targe int result = this->beneath ()->remove_mask_watchpoint (arg0, arg1, arg2); gdb_printf (gdb_stdlog, "<- %s->remove_mask_watchpoint (", this->beneath ()->shortname ()); - target_debug_print_CORE_ADDR (arg0); + gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_CORE_ADDR (arg1); + gdb_puts (target_debug_print_CORE_ADDR (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_target_hw_bp_type (arg2); + gdb_puts (target_debug_print_target_hw_bp_type (arg2), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -1071,7 +1071,7 @@ debug_target::stopped_data_address (CORE_ADDR *arg0) bool result = this->beneath ()->stopped_data_address (arg0); gdb_printf (gdb_stdlog, "<- %s->stopped_data_address (", this->beneath ()->shortname ()); - target_debug_print_CORE_ADDR_p (arg0); + gdb_puts (target_debug_print_CORE_ADDR_p (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_bool (result); gdb_puts ("\n", gdb_stdlog); @@ -1097,11 +1097,11 @@ debug_target::watchpoint_addr_within_range (CORE_ADDR arg0, CORE_ADDR arg1, int bool result = this->beneath ()->watchpoint_addr_within_range (arg0, arg1, arg2); gdb_printf (gdb_stdlog, "<- %s->watchpoint_addr_within_range (", this->beneath ()->shortname ()); - target_debug_print_CORE_ADDR (arg0); + gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_CORE_ADDR (arg1); + gdb_puts (target_debug_print_CORE_ADDR (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg2); + gdb_puts (target_debug_print_int (arg2), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_bool (result); gdb_puts ("\n", gdb_stdlog); @@ -1127,9 +1127,9 @@ debug_target::region_ok_for_hw_watchpoint (CORE_ADDR arg0, int arg1) int result = this->beneath ()->region_ok_for_hw_watchpoint (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->region_ok_for_hw_watchpoint (", this->beneath ()->shortname ()); - target_debug_print_CORE_ADDR (arg0); + gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg1); + gdb_puts (target_debug_print_int (arg1), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -1155,13 +1155,13 @@ debug_target::can_accel_watchpoint_condition (CORE_ADDR arg0, int arg1, int arg2 bool result = this->beneath ()->can_accel_watchpoint_condition (arg0, arg1, arg2, arg3); gdb_printf (gdb_stdlog, "<- %s->can_accel_watchpoint_condition (", this->beneath ()->shortname ()); - target_debug_print_CORE_ADDR (arg0); + gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg1); + gdb_puts (target_debug_print_int (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg2); + gdb_puts (target_debug_print_int (arg2), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_expression_p (arg3); + gdb_puts (target_debug_print_expression_p (arg3), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_bool (result); gdb_puts ("\n", gdb_stdlog); @@ -1187,9 +1187,9 @@ debug_target::masked_watch_num_registers (CORE_ADDR arg0, CORE_ADDR arg1) int result = this->beneath ()->masked_watch_num_registers (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->masked_watch_num_registers (", this->beneath ()->shortname ()); - target_debug_print_CORE_ADDR (arg0); + gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_CORE_ADDR (arg1); + gdb_puts (target_debug_print_CORE_ADDR (arg1), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -1364,9 +1364,9 @@ debug_target::terminal_info (const char *arg0, int arg1) gdb_printf (gdb_stdlog, "-> %s->terminal_info (...)\n", this->beneath ()->shortname ()); this->beneath ()->terminal_info (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->terminal_info (", this->beneath ()->shortname ()); - target_debug_print_const_char_p (arg0); + gdb_puts (target_debug_print_const_char_p (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg1); + gdb_puts (target_debug_print_int (arg1), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -1409,9 +1409,9 @@ debug_target::load (const char *arg0, int arg1) gdb_printf (gdb_stdlog, "-> %s->load (...)\n", this->beneath ()->shortname ()); this->beneath ()->load (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->load (", this->beneath ()->shortname ()); - target_debug_print_const_char_p (arg0); + gdb_puts (target_debug_print_const_char_p (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg1); + gdb_puts (target_debug_print_int (arg1), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -1434,7 +1434,7 @@ debug_target::insert_fork_catchpoint (int arg0) int result = this->beneath ()->insert_fork_catchpoint (arg0); gdb_printf (gdb_stdlog, "<- %s->insert_fork_catchpoint (", this->beneath ()->shortname ()); - target_debug_print_int (arg0); + gdb_puts (target_debug_print_int (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -1460,7 +1460,7 @@ debug_target::remove_fork_catchpoint (int arg0) int result = this->beneath ()->remove_fork_catchpoint (arg0); gdb_printf (gdb_stdlog, "<- %s->remove_fork_catchpoint (", this->beneath ()->shortname ()); - target_debug_print_int (arg0); + gdb_puts (target_debug_print_int (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -1486,7 +1486,7 @@ debug_target::insert_vfork_catchpoint (int arg0) int result = this->beneath ()->insert_vfork_catchpoint (arg0); gdb_printf (gdb_stdlog, "<- %s->insert_vfork_catchpoint (", this->beneath ()->shortname ()); - target_debug_print_int (arg0); + gdb_puts (target_debug_print_int (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -1512,7 +1512,7 @@ debug_target::remove_vfork_catchpoint (int arg0) int result = this->beneath ()->remove_vfork_catchpoint (arg0); gdb_printf (gdb_stdlog, "<- %s->remove_vfork_catchpoint (", this->beneath ()->shortname ()); - target_debug_print_int (arg0); + gdb_puts (target_debug_print_int (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -1537,15 +1537,15 @@ debug_target::follow_fork (inferior *arg0, ptid_t arg1, target_waitkind arg2, bo gdb_printf (gdb_stdlog, "-> %s->follow_fork (...)\n", this->beneath ()->shortname ()); this->beneath ()->follow_fork (arg0, arg1, arg2, arg3, arg4); gdb_printf (gdb_stdlog, "<- %s->follow_fork (", this->beneath ()->shortname ()); - target_debug_print_inferior_p (arg0); + gdb_puts (target_debug_print_inferior_p (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_ptid_t (arg1); + gdb_puts (target_debug_print_ptid_t (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_target_waitkind (arg2); + gdb_puts (target_debug_print_target_waitkind (arg2), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_bool (arg3); + gdb_puts (target_debug_print_bool (arg3), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_bool (arg4); + gdb_puts (target_debug_print_bool (arg4), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -1567,7 +1567,7 @@ debug_target::follow_clone (ptid_t arg0) gdb_printf (gdb_stdlog, "-> %s->follow_clone (...)\n", this->beneath ()->shortname ()); this->beneath ()->follow_clone (arg0); gdb_printf (gdb_stdlog, "<- %s->follow_clone (", this->beneath ()->shortname ()); - target_debug_print_ptid_t (arg0); + gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -1590,7 +1590,7 @@ debug_target::insert_exec_catchpoint (int arg0) int result = this->beneath ()->insert_exec_catchpoint (arg0); gdb_printf (gdb_stdlog, "<- %s->insert_exec_catchpoint (", this->beneath ()->shortname ()); - target_debug_print_int (arg0); + gdb_puts (target_debug_print_int (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -1616,7 +1616,7 @@ debug_target::remove_exec_catchpoint (int arg0) int result = this->beneath ()->remove_exec_catchpoint (arg0); gdb_printf (gdb_stdlog, "<- %s->remove_exec_catchpoint (", this->beneath ()->shortname ()); - target_debug_print_int (arg0); + gdb_puts (target_debug_print_int (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -1640,11 +1640,11 @@ debug_target::follow_exec (inferior *arg0, ptid_t arg1, const char *arg2) gdb_printf (gdb_stdlog, "-> %s->follow_exec (...)\n", this->beneath ()->shortname ()); this->beneath ()->follow_exec (arg0, arg1, arg2); gdb_printf (gdb_stdlog, "<- %s->follow_exec (", this->beneath ()->shortname ()); - target_debug_print_inferior_p (arg0); + gdb_puts (target_debug_print_inferior_p (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_ptid_t (arg1); + gdb_puts (target_debug_print_ptid_t (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_const_char_p (arg2); + gdb_puts (target_debug_print_const_char_p (arg2), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -1667,13 +1667,13 @@ debug_target::set_syscall_catchpoint (int arg0, bool arg1, int arg2, gdb::array_ int result = this->beneath ()->set_syscall_catchpoint (arg0, arg1, arg2, arg3); gdb_printf (gdb_stdlog, "<- %s->set_syscall_catchpoint (", this->beneath ()->shortname ()); - target_debug_print_int (arg0); + gdb_puts (target_debug_print_int (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_bool (arg1); + gdb_puts (target_debug_print_bool (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg2); + gdb_puts (target_debug_print_int (arg2), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_gdb_array_view_const_int (arg3); + gdb_puts (target_debug_print_gdb_array_view_const_int (arg3), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -1718,7 +1718,7 @@ debug_target::pass_signals (gdb::array_view arg0) gdb_printf (gdb_stdlog, "-> %s->pass_signals (...)\n", this->beneath ()->shortname ()); this->beneath ()->pass_signals (arg0); gdb_printf (gdb_stdlog, "<- %s->pass_signals (", this->beneath ()->shortname ()); - target_debug_print_signals (arg0); + gdb_puts (target_debug_print_signals (arg0), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -1739,7 +1739,7 @@ debug_target::program_signals (gdb::array_view arg0) gdb_printf (gdb_stdlog, "-> %s->program_signals (...)\n", this->beneath ()->shortname ()); this->beneath ()->program_signals (arg0); gdb_printf (gdb_stdlog, "<- %s->program_signals (", this->beneath ()->shortname ()); - target_debug_print_signals (arg0); + gdb_puts (target_debug_print_signals (arg0), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -1762,7 +1762,7 @@ debug_target::thread_alive (ptid_t arg0) bool result = this->beneath ()->thread_alive (arg0); gdb_printf (gdb_stdlog, "<- %s->thread_alive (", this->beneath ()->shortname ()); - target_debug_print_ptid_t (arg0); + gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_bool (result); gdb_puts ("\n", gdb_stdlog); @@ -1808,7 +1808,7 @@ debug_target::pid_to_str (ptid_t arg0) std::string result = this->beneath ()->pid_to_str (arg0); gdb_printf (gdb_stdlog, "<- %s->pid_to_str (", this->beneath ()->shortname ()); - target_debug_print_ptid_t (arg0); + gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_std_string (result); gdb_puts ("\n", gdb_stdlog); @@ -1834,7 +1834,7 @@ debug_target::extra_thread_info (thread_info *arg0) const char * result = this->beneath ()->extra_thread_info (arg0); gdb_printf (gdb_stdlog, "<- %s->extra_thread_info (", this->beneath ()->shortname ()); - target_debug_print_thread_info_p (arg0); + gdb_puts (target_debug_print_thread_info_p (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_const_char_p (result); gdb_puts ("\n", gdb_stdlog); @@ -1860,7 +1860,7 @@ debug_target::thread_name (thread_info *arg0) const char * result = this->beneath ()->thread_name (arg0); gdb_printf (gdb_stdlog, "<- %s->thread_name (", this->beneath ()->shortname ()); - target_debug_print_thread_info_p (arg0); + gdb_puts (target_debug_print_thread_info_p (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_const_char_p (result); gdb_puts ("\n", gdb_stdlog); @@ -1886,11 +1886,11 @@ debug_target::thread_handle_to_thread_info (const gdb_byte *arg0, int arg1, infe thread_info * result = this->beneath ()->thread_handle_to_thread_info (arg0, arg1, arg2); gdb_printf (gdb_stdlog, "<- %s->thread_handle_to_thread_info (", this->beneath ()->shortname ()); - target_debug_print_const_gdb_byte_p (arg0); + gdb_puts (target_debug_print_const_gdb_byte_p (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg1); + gdb_puts (target_debug_print_int (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_inferior_p (arg2); + gdb_puts (target_debug_print_inferior_p (arg2), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_thread_info_p (result); gdb_puts ("\n", gdb_stdlog); @@ -1916,7 +1916,7 @@ debug_target::thread_info_to_thread_handle (struct thread_info *arg0) gdb::array_view result = this->beneath ()->thread_info_to_thread_handle (arg0); gdb_printf (gdb_stdlog, "<- %s->thread_info_to_thread_handle (", this->beneath ()->shortname ()); - target_debug_print_thread_info_p (arg0); + gdb_puts (target_debug_print_thread_info_p (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_gdb_array_view_const_gdb_byte (result); gdb_puts ("\n", gdb_stdlog); @@ -1940,7 +1940,7 @@ debug_target::stop (ptid_t arg0) gdb_printf (gdb_stdlog, "-> %s->stop (...)\n", this->beneath ()->shortname ()); this->beneath ()->stop (arg0); gdb_printf (gdb_stdlog, "<- %s->stop (", this->beneath ()->shortname ()); - target_debug_print_ptid_t (arg0); + gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -2003,9 +2003,9 @@ debug_target::rcmd (const char *arg0, struct ui_file *arg1) gdb_printf (gdb_stdlog, "-> %s->rcmd (...)\n", this->beneath ()->shortname ()); this->beneath ()->rcmd (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->rcmd (", this->beneath ()->shortname ()); - target_debug_print_const_char_p (arg0); + gdb_puts (target_debug_print_const_char_p (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_ui_file_p (arg1); + gdb_puts (target_debug_print_ui_file_p (arg1), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -2028,7 +2028,7 @@ debug_target::pid_to_exec_file (int arg0) const char * result = this->beneath ()->pid_to_exec_file (arg0); gdb_printf (gdb_stdlog, "<- %s->pid_to_exec_file (", this->beneath ()->shortname ()); - target_debug_print_int (arg0); + gdb_puts (target_debug_print_int (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_const_char_p (result); gdb_puts ("\n", gdb_stdlog); @@ -2052,7 +2052,7 @@ debug_target::log_command (const char *arg0) gdb_printf (gdb_stdlog, "-> %s->log_command (...)\n", this->beneath ()->shortname ()); this->beneath ()->log_command (arg0); gdb_printf (gdb_stdlog, "<- %s->log_command (", this->beneath ()->shortname ()); - target_debug_print_const_char_p (arg0); + gdb_puts (target_debug_print_const_char_p (arg0), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -2199,7 +2199,7 @@ debug_target::async (bool arg0) gdb_printf (gdb_stdlog, "-> %s->async (...)\n", this->beneath ()->shortname ()); this->beneath ()->async (arg0); gdb_printf (gdb_stdlog, "<- %s->async (", this->beneath ()->shortname ()); - target_debug_print_bool (arg0); + gdb_puts (target_debug_print_bool (arg0), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -2270,7 +2270,7 @@ debug_target::thread_events (int arg0) gdb_printf (gdb_stdlog, "-> %s->thread_events (...)\n", this->beneath ()->shortname ()); this->beneath ()->thread_events (arg0); gdb_printf (gdb_stdlog, "<- %s->thread_events (", this->beneath ()->shortname ()); - target_debug_print_int (arg0); + gdb_puts (target_debug_print_int (arg0), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -2293,7 +2293,7 @@ debug_target::supports_set_thread_options (gdb_thread_options arg0) bool result = this->beneath ()->supports_set_thread_options (arg0); gdb_printf (gdb_stdlog, "<- %s->supports_set_thread_options (", this->beneath ()->shortname ()); - target_debug_print_gdb_thread_options (arg0); + gdb_puts (target_debug_print_gdb_thread_options (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_bool (result); gdb_puts ("\n", gdb_stdlog); @@ -2369,9 +2369,9 @@ debug_target::find_memory_regions (find_memory_region_ftype arg0, void *arg1) int result = this->beneath ()->find_memory_regions (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->find_memory_regions (", this->beneath ()->shortname ()); - target_debug_print_find_memory_region_ftype (arg0); + gdb_puts (target_debug_print_find_memory_region_ftype (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_void_p (arg1); + gdb_puts (target_debug_print_void_p (arg1), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -2397,9 +2397,9 @@ debug_target::make_corefile_notes (bfd *arg0, int *arg1) gdb::unique_xmalloc_ptr result = this->beneath ()->make_corefile_notes (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->make_corefile_notes (", this->beneath ()->shortname ()); - target_debug_print_bfd_p (arg0); + gdb_puts (target_debug_print_bfd_p (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int_p (arg1); + gdb_puts (target_debug_print_int_p (arg1), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_gdb_unique_xmalloc_ptr_char (result); gdb_puts ("\n", gdb_stdlog); @@ -2425,9 +2425,9 @@ debug_target::get_bookmark (const char *arg0, int arg1) gdb_byte * result = this->beneath ()->get_bookmark (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->get_bookmark (", this->beneath ()->shortname ()); - target_debug_print_const_char_p (arg0); + gdb_puts (target_debug_print_const_char_p (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg1); + gdb_puts (target_debug_print_int (arg1), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_gdb_byte_p (result); gdb_puts ("\n", gdb_stdlog); @@ -2452,9 +2452,9 @@ debug_target::goto_bookmark (const gdb_byte *arg0, int arg1) gdb_printf (gdb_stdlog, "-> %s->goto_bookmark (...)\n", this->beneath ()->shortname ()); this->beneath ()->goto_bookmark (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->goto_bookmark (", this->beneath ()->shortname ()); - target_debug_print_const_gdb_byte_p (arg0); + gdb_puts (target_debug_print_const_gdb_byte_p (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg1); + gdb_puts (target_debug_print_int (arg1), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -2477,11 +2477,11 @@ debug_target::get_thread_local_address (ptid_t arg0, CORE_ADDR arg1, CORE_ADDR a CORE_ADDR result = this->beneath ()->get_thread_local_address (arg0, arg1, arg2); gdb_printf (gdb_stdlog, "<- %s->get_thread_local_address (", this->beneath ()->shortname ()); - target_debug_print_ptid_t (arg0); + gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_CORE_ADDR (arg1); + gdb_puts (target_debug_print_CORE_ADDR (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_CORE_ADDR (arg2); + gdb_puts (target_debug_print_CORE_ADDR (arg2), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_CORE_ADDR (result); gdb_puts ("\n", gdb_stdlog); @@ -2507,19 +2507,19 @@ debug_target::xfer_partial (enum target_object arg0, const char *arg1, gdb_byte enum target_xfer_status result = this->beneath ()->xfer_partial (arg0, arg1, arg2, arg3, arg4, arg5, arg6); gdb_printf (gdb_stdlog, "<- %s->xfer_partial (", this->beneath ()->shortname ()); - target_debug_print_target_object (arg0); + gdb_puts (target_debug_print_target_object (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_const_char_p (arg1); + gdb_puts (target_debug_print_const_char_p (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_gdb_byte_p (arg2); + gdb_puts (target_debug_print_gdb_byte_p (arg2), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_const_gdb_byte_p (arg3); + gdb_puts (target_debug_print_const_gdb_byte_p (arg3), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_ULONGEST (arg4); + gdb_puts (target_debug_print_ULONGEST (arg4), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_ULONGEST (arg5); + gdb_puts (target_debug_print_ULONGEST (arg5), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_ULONGEST_p (arg6); + gdb_puts (target_debug_print_ULONGEST_p (arg6), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_target_xfer_status (result); gdb_puts ("\n", gdb_stdlog); @@ -2594,9 +2594,9 @@ debug_target::flash_erase (ULONGEST arg0, LONGEST arg1) gdb_printf (gdb_stdlog, "-> %s->flash_erase (...)\n", this->beneath ()->shortname ()); this->beneath ()->flash_erase (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->flash_erase (", this->beneath ()->shortname ()); - target_debug_print_ULONGEST (arg0); + gdb_puts (target_debug_print_ULONGEST (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_LONGEST (arg1); + gdb_puts (target_debug_print_LONGEST (arg1), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -2665,9 +2665,9 @@ debug_target::get_ada_task_ptid (long arg0, ULONGEST arg1) ptid_t result = this->beneath ()->get_ada_task_ptid (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->get_ada_task_ptid (", this->beneath ()->shortname ()); - target_debug_print_long (arg0); + gdb_puts (target_debug_print_long (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_ULONGEST (arg1); + gdb_puts (target_debug_print_ULONGEST (arg1), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_ptid_t (result); gdb_puts ("\n", gdb_stdlog); @@ -2693,13 +2693,13 @@ debug_target::auxv_parse (const gdb_byte **arg0, const gdb_byte *arg1, CORE_ADDR int result = this->beneath ()->auxv_parse (arg0, arg1, arg2, arg3); gdb_printf (gdb_stdlog, "<- %s->auxv_parse (", this->beneath ()->shortname ()); - target_debug_print_const_gdb_byte_pp (arg0); + gdb_puts (target_debug_print_const_gdb_byte_pp (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_const_gdb_byte_p (arg1); + gdb_puts (target_debug_print_const_gdb_byte_p (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_CORE_ADDR_p (arg2); + gdb_puts (target_debug_print_CORE_ADDR_p (arg2), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_CORE_ADDR_p (arg3); + gdb_puts (target_debug_print_CORE_ADDR_p (arg3), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -2725,15 +2725,15 @@ debug_target::search_memory (CORE_ADDR arg0, ULONGEST arg1, const gdb_byte *arg2 int result = this->beneath ()->search_memory (arg0, arg1, arg2, arg3, arg4); gdb_printf (gdb_stdlog, "<- %s->search_memory (", this->beneath ()->shortname ()); - target_debug_print_CORE_ADDR (arg0); + gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_ULONGEST (arg1); + gdb_puts (target_debug_print_ULONGEST (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_const_gdb_byte_p (arg2); + gdb_puts (target_debug_print_const_gdb_byte_p (arg2), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_ULONGEST (arg3); + gdb_puts (target_debug_print_ULONGEST (arg3), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_CORE_ADDR_p (arg4); + gdb_puts (target_debug_print_CORE_ADDR_p (arg4), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -2957,7 +2957,7 @@ debug_target::dumpcore (const char *arg0) gdb_printf (gdb_stdlog, "-> %s->dumpcore (...)\n", this->beneath ()->shortname ()); this->beneath ()->dumpcore (arg0); gdb_printf (gdb_stdlog, "<- %s->dumpcore (", this->beneath ()->shortname ()); - target_debug_print_const_char_p (arg0); + gdb_puts (target_debug_print_const_char_p (arg0), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -3005,7 +3005,7 @@ debug_target::thread_architecture (ptid_t arg0) struct gdbarch * result = this->beneath ()->thread_architecture (arg0); gdb_printf (gdb_stdlog, "<- %s->thread_architecture (", this->beneath ()->shortname ()); - target_debug_print_ptid_t (arg0); + gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_gdbarch_p (result); gdb_puts ("\n", gdb_stdlog); @@ -3076,7 +3076,7 @@ debug_target::download_tracepoint (struct bp_location *arg0) gdb_printf (gdb_stdlog, "-> %s->download_tracepoint (...)\n", this->beneath ()->shortname ()); this->beneath ()->download_tracepoint (arg0); gdb_printf (gdb_stdlog, "<- %s->download_tracepoint (", this->beneath ()->shortname ()); - target_debug_print_bp_location_p (arg0); + gdb_puts (target_debug_print_bp_location_p (arg0), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -3123,7 +3123,7 @@ debug_target::download_trace_state_variable (const trace_state_variable &arg0) gdb_printf (gdb_stdlog, "-> %s->download_trace_state_variable (...)\n", this->beneath ()->shortname ()); this->beneath ()->download_trace_state_variable (arg0); gdb_printf (gdb_stdlog, "<- %s->download_trace_state_variable (", this->beneath ()->shortname ()); - target_debug_print_const_trace_state_variable_r (arg0); + gdb_puts (target_debug_print_const_trace_state_variable_r (arg0), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -3145,7 +3145,7 @@ debug_target::enable_tracepoint (struct bp_location *arg0) gdb_printf (gdb_stdlog, "-> %s->enable_tracepoint (...)\n", this->beneath ()->shortname ()); this->beneath ()->enable_tracepoint (arg0); gdb_printf (gdb_stdlog, "<- %s->enable_tracepoint (", this->beneath ()->shortname ()); - target_debug_print_bp_location_p (arg0); + gdb_puts (target_debug_print_bp_location_p (arg0), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -3167,7 +3167,7 @@ debug_target::disable_tracepoint (struct bp_location *arg0) gdb_printf (gdb_stdlog, "-> %s->disable_tracepoint (...)\n", this->beneath ()->shortname ()); this->beneath ()->disable_tracepoint (arg0); gdb_printf (gdb_stdlog, "<- %s->disable_tracepoint (", this->beneath ()->shortname ()); - target_debug_print_bp_location_p (arg0); + gdb_puts (target_debug_print_bp_location_p (arg0), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -3232,7 +3232,7 @@ debug_target::get_trace_status (struct trace_status *arg0) int result = this->beneath ()->get_trace_status (arg0); gdb_printf (gdb_stdlog, "<- %s->get_trace_status (", this->beneath ()->shortname ()); - target_debug_print_trace_status_p (arg0); + gdb_puts (target_debug_print_trace_status_p (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -3257,9 +3257,9 @@ debug_target::get_tracepoint_status (tracepoint *arg0, struct uploaded_tp *arg1) gdb_printf (gdb_stdlog, "-> %s->get_tracepoint_status (...)\n", this->beneath ()->shortname ()); this->beneath ()->get_tracepoint_status (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->get_tracepoint_status (", this->beneath ()->shortname ()); - target_debug_print_tracepoint_p (arg0); + gdb_puts (target_debug_print_tracepoint_p (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_uploaded_tp_p (arg1); + gdb_puts (target_debug_print_uploaded_tp_p (arg1), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -3303,15 +3303,15 @@ debug_target::trace_find (enum trace_find_type arg0, int arg1, CORE_ADDR arg2, C int result = this->beneath ()->trace_find (arg0, arg1, arg2, arg3, arg4); gdb_printf (gdb_stdlog, "<- %s->trace_find (", this->beneath ()->shortname ()); - target_debug_print_trace_find_type (arg0); + gdb_puts (target_debug_print_trace_find_type (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg1); + gdb_puts (target_debug_print_int (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_CORE_ADDR (arg2); + gdb_puts (target_debug_print_CORE_ADDR (arg2), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_CORE_ADDR (arg3); + gdb_puts (target_debug_print_CORE_ADDR (arg3), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int_p (arg4); + gdb_puts (target_debug_print_int_p (arg4), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -3337,9 +3337,9 @@ debug_target::get_trace_state_variable_value (int arg0, LONGEST *arg1) bool result = this->beneath ()->get_trace_state_variable_value (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->get_trace_state_variable_value (", this->beneath ()->shortname ()); - target_debug_print_int (arg0); + gdb_puts (target_debug_print_int (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_LONGEST_p (arg1); + gdb_puts (target_debug_print_LONGEST_p (arg1), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_bool (result); gdb_puts ("\n", gdb_stdlog); @@ -3365,7 +3365,7 @@ debug_target::save_trace_data (const char *arg0) int result = this->beneath ()->save_trace_data (arg0); gdb_printf (gdb_stdlog, "<- %s->save_trace_data (", this->beneath ()->shortname ()); - target_debug_print_const_char_p (arg0); + gdb_puts (target_debug_print_const_char_p (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -3391,7 +3391,7 @@ debug_target::upload_tracepoints (struct uploaded_tp **arg0) int result = this->beneath ()->upload_tracepoints (arg0); gdb_printf (gdb_stdlog, "<- %s->upload_tracepoints (", this->beneath ()->shortname ()); - target_debug_print_uploaded_tp_pp (arg0); + gdb_puts (target_debug_print_uploaded_tp_pp (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -3417,7 +3417,7 @@ debug_target::upload_trace_state_variables (struct uploaded_tsv **arg0) int result = this->beneath ()->upload_trace_state_variables (arg0); gdb_printf (gdb_stdlog, "<- %s->upload_trace_state_variables (", this->beneath ()->shortname ()); - target_debug_print_uploaded_tsv_pp (arg0); + gdb_puts (target_debug_print_uploaded_tsv_pp (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -3443,11 +3443,11 @@ debug_target::get_raw_trace_data (gdb_byte *arg0, ULONGEST arg1, LONGEST arg2) LONGEST result = this->beneath ()->get_raw_trace_data (arg0, arg1, arg2); gdb_printf (gdb_stdlog, "<- %s->get_raw_trace_data (", this->beneath ()->shortname ()); - target_debug_print_gdb_byte_p (arg0); + gdb_puts (target_debug_print_gdb_byte_p (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_ULONGEST (arg1); + gdb_puts (target_debug_print_ULONGEST (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_LONGEST (arg2); + gdb_puts (target_debug_print_LONGEST (arg2), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_LONGEST (result); gdb_puts ("\n", gdb_stdlog); @@ -3496,7 +3496,7 @@ debug_target::set_disconnected_tracing (int arg0) gdb_printf (gdb_stdlog, "-> %s->set_disconnected_tracing (...)\n", this->beneath ()->shortname ()); this->beneath ()->set_disconnected_tracing (arg0); gdb_printf (gdb_stdlog, "<- %s->set_disconnected_tracing (", this->beneath ()->shortname ()); - target_debug_print_int (arg0); + gdb_puts (target_debug_print_int (arg0), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -3517,7 +3517,7 @@ debug_target::set_circular_trace_buffer (int arg0) gdb_printf (gdb_stdlog, "-> %s->set_circular_trace_buffer (...)\n", this->beneath ()->shortname ()); this->beneath ()->set_circular_trace_buffer (arg0); gdb_printf (gdb_stdlog, "<- %s->set_circular_trace_buffer (", this->beneath ()->shortname ()); - target_debug_print_int (arg0); + gdb_puts (target_debug_print_int (arg0), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -3538,7 +3538,7 @@ debug_target::set_trace_buffer_size (LONGEST arg0) gdb_printf (gdb_stdlog, "-> %s->set_trace_buffer_size (...)\n", this->beneath ()->shortname ()); this->beneath ()->set_trace_buffer_size (arg0); gdb_printf (gdb_stdlog, "<- %s->set_trace_buffer_size (", this->beneath ()->shortname ()); - target_debug_print_LONGEST (arg0); + gdb_puts (target_debug_print_LONGEST (arg0), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -3561,11 +3561,11 @@ debug_target::set_trace_notes (const char *arg0, const char *arg1, const char *a bool result = this->beneath ()->set_trace_notes (arg0, arg1, arg2); gdb_printf (gdb_stdlog, "<- %s->set_trace_notes (", this->beneath ()->shortname ()); - target_debug_print_const_char_p (arg0); + gdb_puts (target_debug_print_const_char_p (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_const_char_p (arg1); + gdb_puts (target_debug_print_const_char_p (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_const_char_p (arg2); + gdb_puts (target_debug_print_const_char_p (arg2), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_bool (result); gdb_puts ("\n", gdb_stdlog); @@ -3591,7 +3591,7 @@ debug_target::core_of_thread (ptid_t arg0) int result = this->beneath ()->core_of_thread (arg0); gdb_printf (gdb_stdlog, "<- %s->core_of_thread (", this->beneath ()->shortname ()); - target_debug_print_ptid_t (arg0); + gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -3617,11 +3617,11 @@ debug_target::verify_memory (const gdb_byte *arg0, CORE_ADDR arg1, ULONGEST arg2 int result = this->beneath ()->verify_memory (arg0, arg1, arg2); gdb_printf (gdb_stdlog, "<- %s->verify_memory (", this->beneath ()->shortname ()); - target_debug_print_const_gdb_byte_p (arg0); + gdb_puts (target_debug_print_const_gdb_byte_p (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_CORE_ADDR (arg1); + gdb_puts (target_debug_print_CORE_ADDR (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_ULONGEST (arg2); + gdb_puts (target_debug_print_ULONGEST (arg2), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_int (result); gdb_puts ("\n", gdb_stdlog); @@ -3647,9 +3647,9 @@ debug_target::get_tib_address (ptid_t arg0, CORE_ADDR *arg1) bool result = this->beneath ()->get_tib_address (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->get_tib_address (", this->beneath ()->shortname ()); - target_debug_print_ptid_t (arg0); + gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_CORE_ADDR_p (arg1); + gdb_puts (target_debug_print_CORE_ADDR_p (arg1), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_bool (result); gdb_puts ("\n", gdb_stdlog); @@ -3695,9 +3695,9 @@ debug_target::static_tracepoint_marker_at (CORE_ADDR arg0, static_tracepoint_mar bool result = this->beneath ()->static_tracepoint_marker_at (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->static_tracepoint_marker_at (", this->beneath ()->shortname ()); - target_debug_print_CORE_ADDR (arg0); + gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_static_tracepoint_marker_p (arg1); + gdb_puts (target_debug_print_static_tracepoint_marker_p (arg1), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_bool (result); gdb_puts ("\n", gdb_stdlog); @@ -3723,7 +3723,7 @@ debug_target::static_tracepoint_markers_by_strid (const char *arg0) std::vector result = this->beneath ()->static_tracepoint_markers_by_strid (arg0); gdb_printf (gdb_stdlog, "<- %s->static_tracepoint_markers_by_strid (", this->beneath ()->shortname ()); - target_debug_print_const_char_p (arg0); + gdb_puts (target_debug_print_const_char_p (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_std_vector_static_tracepoint_marker (result); gdb_puts ("\n", gdb_stdlog); @@ -3774,7 +3774,7 @@ debug_target::use_agent (bool arg0) bool result = this->beneath ()->use_agent (arg0); gdb_printf (gdb_stdlog, "<- %s->use_agent (", this->beneath ()->shortname ()); - target_debug_print_bool (arg0); + gdb_puts (target_debug_print_bool (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_bool (result); gdb_puts ("\n", gdb_stdlog); @@ -3825,9 +3825,9 @@ debug_target::enable_btrace (thread_info *arg0, const struct btrace_config *arg1 struct btrace_target_info * result = this->beneath ()->enable_btrace (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->enable_btrace (", this->beneath ()->shortname ()); - target_debug_print_thread_info_p (arg0); + gdb_puts (target_debug_print_thread_info_p (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_const_btrace_config_p (arg1); + gdb_puts (target_debug_print_const_btrace_config_p (arg1), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_btrace_target_info_p (result); gdb_puts ("\n", gdb_stdlog); @@ -3852,7 +3852,7 @@ debug_target::disable_btrace (struct btrace_target_info *arg0) gdb_printf (gdb_stdlog, "-> %s->disable_btrace (...)\n", this->beneath ()->shortname ()); this->beneath ()->disable_btrace (arg0); gdb_printf (gdb_stdlog, "<- %s->disable_btrace (", this->beneath ()->shortname ()); - target_debug_print_btrace_target_info_p (arg0); + gdb_puts (target_debug_print_btrace_target_info_p (arg0), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -3874,7 +3874,7 @@ debug_target::teardown_btrace (struct btrace_target_info *arg0) gdb_printf (gdb_stdlog, "-> %s->teardown_btrace (...)\n", this->beneath ()->shortname ()); this->beneath ()->teardown_btrace (arg0); gdb_printf (gdb_stdlog, "<- %s->teardown_btrace (", this->beneath ()->shortname ()); - target_debug_print_btrace_target_info_p (arg0); + gdb_puts (target_debug_print_btrace_target_info_p (arg0), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -3897,11 +3897,11 @@ debug_target::read_btrace (struct btrace_data *arg0, struct btrace_target_info * enum btrace_error result = this->beneath ()->read_btrace (arg0, arg1, arg2); gdb_printf (gdb_stdlog, "<- %s->read_btrace (", this->beneath ()->shortname ()); - target_debug_print_btrace_data_p (arg0); + gdb_puts (target_debug_print_btrace_data_p (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_btrace_target_info_p (arg1); + gdb_puts (target_debug_print_btrace_target_info_p (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_btrace_read_type (arg2); + gdb_puts (target_debug_print_btrace_read_type (arg2), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_btrace_error (result); gdb_puts ("\n", gdb_stdlog); @@ -3927,7 +3927,7 @@ debug_target::btrace_conf (const struct btrace_target_info *arg0) const struct btrace_config * result = this->beneath ()->btrace_conf (arg0); gdb_printf (gdb_stdlog, "<- %s->btrace_conf (", this->beneath ()->shortname ()); - target_debug_print_const_btrace_target_info_p (arg0); + gdb_puts (target_debug_print_const_btrace_target_info_p (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_const_btrace_config_p (result); gdb_puts ("\n", gdb_stdlog); @@ -3953,7 +3953,7 @@ debug_target::record_method (ptid_t arg0) enum record_method result = this->beneath ()->record_method (arg0); gdb_printf (gdb_stdlog, "<- %s->record_method (", this->beneath ()->shortname ()); - target_debug_print_ptid_t (arg0); + gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_record_method (result); gdb_puts ("\n", gdb_stdlog); @@ -4018,7 +4018,7 @@ debug_target::save_record (const char *arg0) gdb_printf (gdb_stdlog, "-> %s->save_record (...)\n", this->beneath ()->shortname ()); this->beneath ()->save_record (arg0); gdb_printf (gdb_stdlog, "<- %s->save_record (", this->beneath ()->shortname ()); - target_debug_print_const_char_p (arg0); + gdb_puts (target_debug_print_const_char_p (arg0), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -4087,7 +4087,7 @@ debug_target::record_is_replaying (ptid_t arg0) bool result = this->beneath ()->record_is_replaying (arg0); gdb_printf (gdb_stdlog, "<- %s->record_is_replaying (", this->beneath ()->shortname ()); - target_debug_print_ptid_t (arg0); + gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_bool (result); gdb_puts ("\n", gdb_stdlog); @@ -4113,9 +4113,9 @@ debug_target::record_will_replay (ptid_t arg0, int arg1) bool result = this->beneath ()->record_will_replay (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->record_will_replay (", this->beneath ()->shortname ()); - target_debug_print_ptid_t (arg0); + gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg1); + gdb_puts (target_debug_print_int (arg1), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_bool (result); gdb_puts ("\n", gdb_stdlog); @@ -4202,7 +4202,7 @@ debug_target::goto_record (ULONGEST arg0) gdb_printf (gdb_stdlog, "-> %s->goto_record (...)\n", this->beneath ()->shortname ()); this->beneath ()->goto_record (arg0); gdb_printf (gdb_stdlog, "<- %s->goto_record (", this->beneath ()->shortname ()); - target_debug_print_ULONGEST (arg0); + gdb_puts (target_debug_print_ULONGEST (arg0), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -4224,9 +4224,9 @@ debug_target::insn_history (int arg0, gdb_disassembly_flags arg1) gdb_printf (gdb_stdlog, "-> %s->insn_history (...)\n", this->beneath ()->shortname ()); this->beneath ()->insn_history (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->insn_history (", this->beneath ()->shortname ()); - target_debug_print_int (arg0); + gdb_puts (target_debug_print_int (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_gdb_disassembly_flags (arg1); + gdb_puts (target_debug_print_gdb_disassembly_flags (arg1), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -4248,11 +4248,11 @@ debug_target::insn_history_from (ULONGEST arg0, int arg1, gdb_disassembly_flags gdb_printf (gdb_stdlog, "-> %s->insn_history_from (...)\n", this->beneath ()->shortname ()); this->beneath ()->insn_history_from (arg0, arg1, arg2); gdb_printf (gdb_stdlog, "<- %s->insn_history_from (", this->beneath ()->shortname ()); - target_debug_print_ULONGEST (arg0); + gdb_puts (target_debug_print_ULONGEST (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg1); + gdb_puts (target_debug_print_int (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_gdb_disassembly_flags (arg2); + gdb_puts (target_debug_print_gdb_disassembly_flags (arg2), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -4274,11 +4274,11 @@ debug_target::insn_history_range (ULONGEST arg0, ULONGEST arg1, gdb_disassembly_ gdb_printf (gdb_stdlog, "-> %s->insn_history_range (...)\n", this->beneath ()->shortname ()); this->beneath ()->insn_history_range (arg0, arg1, arg2); gdb_printf (gdb_stdlog, "<- %s->insn_history_range (", this->beneath ()->shortname ()); - target_debug_print_ULONGEST (arg0); + gdb_puts (target_debug_print_ULONGEST (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_ULONGEST (arg1); + gdb_puts (target_debug_print_ULONGEST (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_gdb_disassembly_flags (arg2); + gdb_puts (target_debug_print_gdb_disassembly_flags (arg2), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -4300,9 +4300,9 @@ debug_target::call_history (int arg0, record_print_flags arg1) gdb_printf (gdb_stdlog, "-> %s->call_history (...)\n", this->beneath ()->shortname ()); this->beneath ()->call_history (arg0, arg1); gdb_printf (gdb_stdlog, "<- %s->call_history (", this->beneath ()->shortname ()); - target_debug_print_int (arg0); + gdb_puts (target_debug_print_int (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_record_print_flags (arg1); + gdb_puts (target_debug_print_record_print_flags (arg1), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -4324,11 +4324,11 @@ debug_target::call_history_from (ULONGEST arg0, int arg1, record_print_flags arg gdb_printf (gdb_stdlog, "-> %s->call_history_from (...)\n", this->beneath ()->shortname ()); this->beneath ()->call_history_from (arg0, arg1, arg2); gdb_printf (gdb_stdlog, "<- %s->call_history_from (", this->beneath ()->shortname ()); - target_debug_print_ULONGEST (arg0); + gdb_puts (target_debug_print_ULONGEST (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg1); + gdb_puts (target_debug_print_int (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_record_print_flags (arg2); + gdb_puts (target_debug_print_record_print_flags (arg2), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -4350,11 +4350,11 @@ debug_target::call_history_range (ULONGEST arg0, ULONGEST arg1, record_print_fla gdb_printf (gdb_stdlog, "-> %s->call_history_range (...)\n", this->beneath ()->shortname ()); this->beneath ()->call_history_range (arg0, arg1, arg2); gdb_printf (gdb_stdlog, "<- %s->call_history_range (", this->beneath ()->shortname ()); - target_debug_print_ULONGEST (arg0); + gdb_puts (target_debug_print_ULONGEST (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_ULONGEST (arg1); + gdb_puts (target_debug_print_ULONGEST (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_record_print_flags (arg2); + gdb_puts (target_debug_print_record_print_flags (arg2), gdb_stdlog); gdb_puts (")\n", gdb_stdlog); } @@ -4517,13 +4517,13 @@ debug_target::fetch_memtags (CORE_ADDR arg0, size_t arg1, gdb::byte_vector &arg2 bool result = this->beneath ()->fetch_memtags (arg0, arg1, arg2, arg3); gdb_printf (gdb_stdlog, "<- %s->fetch_memtags (", this->beneath ()->shortname ()); - target_debug_print_CORE_ADDR (arg0); + gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_size_t (arg1); + gdb_puts (target_debug_print_size_t (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_gdb_byte_vector_r (arg2); + gdb_puts (target_debug_print_gdb_byte_vector_r (arg2), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg3); + gdb_puts (target_debug_print_int (arg3), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_bool (result); gdb_puts ("\n", gdb_stdlog); @@ -4549,13 +4549,13 @@ debug_target::store_memtags (CORE_ADDR arg0, size_t arg1, const gdb::byte_vector bool result = this->beneath ()->store_memtags (arg0, arg1, arg2, arg3); gdb_printf (gdb_stdlog, "<- %s->store_memtags (", this->beneath ()->shortname ()); - target_debug_print_CORE_ADDR (arg0); + gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_size_t (arg1); + gdb_puts (target_debug_print_size_t (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_const_gdb_byte_vector_r (arg2); + gdb_puts (target_debug_print_const_gdb_byte_vector_r (arg2), gdb_stdlog); gdb_puts (", ", gdb_stdlog); - target_debug_print_int (arg3); + gdb_puts (target_debug_print_int (arg3), gdb_stdlog); gdb_puts (") = ", gdb_stdlog); target_debug_print_bool (result); gdb_puts ("\n", gdb_stdlog); diff --git a/gdb/utils.c b/gdb/utils.c index 6a77f6be713a..04f2d909cd29 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1838,6 +1838,12 @@ gdb_puts (const char *linebuffer, struct ui_file *stream) stream->puts (linebuffer); } +void +gdb_puts (const std::string &s, ui_file *stream) +{ + gdb_puts (s.c_str (), stream); +} + /* See utils.h. */ void diff --git a/gdb/utils.h b/gdb/utils.h index 96350890a975..f0189c7d723d 100644 --- a/gdb/utils.h +++ b/gdb/utils.h @@ -205,6 +205,8 @@ extern void set_screen_width_and_height (int width, int height); extern void gdb_puts (const char *, struct ui_file *); +extern void gdb_puts (const std::string &s, ui_file *stream); + extern void gdb_putc (int c, struct ui_file *); extern void gdb_putc (int c);