From patchwork Wed Apr 17 20:54:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 88618 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 CCAB3384AB41 for ; Wed, 17 Apr 2024 20:55:12 +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 581F53858D37 for ; Wed, 17 Apr 2024 20:54:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 581F53858D37 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 581F53858D37 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=1713387276; cv=none; b=s7V18MlxpkS3/yQ9JRUO+4Uz8mJInDG4Yx1rkuD7QpSgibgaDrXXlAQ2A7MnynTwYYRO8rzAkpyQgGad1Gy0DJhGUzgC+mVd1QtWHpoUzVaHho+DAVPvNK3+tmZoAJCCa9ty+h23y0u7Dv560nmGxJ/WqKf+LXINnWyLugFAl9I= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713387276; c=relaxed/simple; bh=tNobSXJvdCaQr7+yJj4fYEtY9Rj6r5VwdbDWeV4T21o=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=tJc4eZeD9DdG8s6JS6NzirbqbHgDI5wvqBtP6TQll2SQSj8wMuT49WNBWLbPECYi2O2+Yt0OEg4ycxxTYOkLk/twhhTtire6XHAWlm9f/SUdREQxAyNgP4JfsbwkcMSiYU2jiQenQNLmz1vgwitvt54CNmdggDcWi+x1twMed08= 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 43HKsSNA036388 (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 43HKsSNA036388 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1713387273; bh=ZAjlbGvGJ84BuwE2VcvpkSk3QhZSFszn4t787XtF/UM=; h=From:To:Cc:Subject:Date:From; b=ot47sQ7C2B2MvSm2svz5sjblMPYrKPDL56R40HruLHxzU3VoWsyPuCknRmCpjhlfj Q8wXFVdwEF1DEALXrxvjhti7cCA3tUYjQi3QWvhtknS0myC+ZJeKauNIwt/xq/RRZB iVIsGVshD/w8PLXG8J0iEtMZtodblIQU3oceGQO0= 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 CE0471E030; Wed, 17 Apr 2024 16:54:27 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 1/6] gdb: add includes in target-debug.h Date: Wed, 17 Apr 2024 16:54:06 -0400 Message-ID: <20240417205426.2030615-1-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.44.0 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 Editing target-debug.h with clangd shows a bunch of errors. Add some includes to fix that (make target-debug.h include what it uses). Change-Id: I49075a171e6875fa516d6b2ce56b4a03ac7b3376 --- gdb/target-debug.h | 4 ++++ 1 file changed, 4 insertions(+) base-commit: 56f4dea207d690fff70a3ccb6fe10ebe1e4697c0 diff --git a/gdb/target-debug.h b/gdb/target-debug.h index 20ba1f73ac53..7f1b6d0bed02 100644 --- a/gdb/target-debug.h +++ b/gdb/target-debug.h @@ -38,6 +38,10 @@ more simply done there, and target_xfer_partial additionally bypasses the debug target. */ +#include "gdbsupport/x86-xstate.h" +#include "target.h" +#include "target/wait.h" +#include "target/waitstatus.h" /* Helper macro. */ From patchwork Wed Apr 17 20:54:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 88619 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 3260B384640E for ; Wed, 17 Apr 2024 20:55:13 +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 57D343858D20 for ; Wed, 17 Apr 2024 20:54:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 57D343858D20 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 57D343858D20 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=1713387278; cv=none; b=sw0TJtkLMpQOOBz3IL8rxQAUylTL+rFUz9kgAhS77WwHqFAeHzwaUFtaoUup6U5pZDzdG7QuLSzhxdwj7IEgL98PiD0X1SbbrTsiBnoNYNQWoxptftHCrFi74DTebe5qEEVtI8kVTbwnxHg+rFcMmaprjgKVWLUPkqllICKz6Kw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713387278; c=relaxed/simple; bh=WdanYNhPUQjaJHJFwsRGNXm/AYiviVJXtxNYZd9HkRI=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=mWX0tGgnBZrc/t94CbmEBySXsqF3PUe7lmtQNgjsI9/6W9UC/vEEdywXuxsEZVeiSH+zYkvGEaxV2hZ7CDMyreh3BSlw4/m7XhZ2Q+HdQZu3GUJxKeGsi1/0Yuv+IsE74/X188Qs9mBLFkqU+MGnjQpbg81+JOu0EuCj8hONnbo= 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 43HKsSng036389 (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 43HKsSng036389 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1713387273; bh=8ExoPDPBW3AbWtLkFIQER/lsz7mLb9Hf0XHLLI+/P44=; h=From:To:Cc:Subject:Date:In-Reply-To:From; b=OvSFwgHDRr2PcfO2RL/ZmD7ZUleumXFWAr7Rzoatp9NCgjEk0dmQHG2ZHCuoFE4Go 3z8JaJVl1uEY3plRya1rlnMi9tdmin8yEJYEAIXRJqRZtKnC52isavdFMpy7LYlpor ByrVaymtz6g8RhLIkhpWatXjIoxdUa8w2SFbXIeo= 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 ED2E81E0AC; Wed, 17 Apr 2024 16:54:27 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 2/6] gdb: convert target debug macros to functions Date: Wed, 17 Apr 2024 16:54:07 -0400 Message-ID: <20240417205426.2030615-2-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 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 --- gdb/target-debug.h | 410 +++++++++++++++++++++++++++++---------------- 1 file changed, 266 insertions(+), 144 deletions(-) diff --git a/gdb/target-debug.h b/gdb/target-debug.h index 7f1b6d0bed02..801b96298c5f 100644 --- a/gdb/target-debug.h +++ b/gdb/target-debug.h @@ -38,150 +38,273 @@ more simply done there, and target_xfer_partial additionally bypasses the debug target. */ +#include "gdbarch.h" #include "gdbsupport/x86-xstate.h" +#include "progspace.h" #include "target.h" #include "target/wait.h" #include "target/waitstatus.h" -/* Helper macro. */ - -#define target_debug_do_print(E) \ - gdb_puts ((E), gdb_stdlog); - -#define target_debug_print_target_object(X) \ - target_debug_do_print (plongest (X)) -#define target_debug_print_CORE_ADDR(X) \ - target_debug_do_print (core_addr_to_string (X)) -#define target_debug_print_const_char_p(X) \ - target_debug_do_print (((X) ? (X) : "(null)")) -#define target_debug_print_char_p(X) \ - target_debug_do_print (((X) ? (X) : "(null)")) -#define target_debug_print_int(X) \ - target_debug_do_print (plongest (X)) -#define target_debug_print_bool(X) \ - target_debug_do_print ((X) ? "true" : "false") -#define target_debug_print_long(X) \ - target_debug_do_print (plongest (X)) -#define target_debug_print_target_xfer_status(X) \ - target_debug_do_print (plongest (X)) -#define target_debug_print_exec_direction_kind(X) \ - target_debug_do_print (plongest (X)) -#define target_debug_print_trace_find_type(X) \ - target_debug_do_print (plongest (X)) -#define target_debug_print_btrace_read_type(X) \ - target_debug_do_print (plongest (X)) -#define target_debug_print_btrace_error(X) \ - target_debug_do_print (plongest (X)) -#define target_debug_print_ptid_t(X) \ - target_debug_do_print (plongest (X.pid ())) -#define target_debug_print_gdbarch_p(X) \ - target_debug_do_print (gdbarch_bfd_arch_info (X)->printable_name) -#define target_debug_print_const_gdb_byte_p(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_gdb_byte_p(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_const_gdb_byte_pp(X) \ - target_debug_do_print (host_address_to_string (*(X))) -#define target_debug_print_gdb_signal(X) \ - target_debug_do_print (gdb_signal_to_name (X)) -#define target_debug_print_ULONGEST(X) \ - target_debug_do_print (hex_string (X)) -#define target_debug_print_ULONGEST_p(X) \ - target_debug_do_print (hex_string (*(X))) -#define target_debug_print_LONGEST(X) \ - target_debug_do_print (phex (X, 0)) -#define target_debug_print_LONGEST_p(X) \ - target_debug_do_print (phex (*(X), 0)) -#define target_debug_print_address_space_p(X) \ - target_debug_do_print (plongest ((X)->num ())) -#define target_debug_print_bp_target_info_p(X) \ - target_debug_do_print (core_addr_to_string ((X)->placed_address)) -#define target_debug_print_expression_p(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_CORE_ADDR_p(X) \ - target_debug_do_print (core_addr_to_string (*(X))) -#define target_debug_print_int_p(X) \ - target_debug_do_print (plongest (*(X))) -#define target_debug_print_regcache_p(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_thread_info_p(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_ui_file_p(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_const_std_vector_target_section_p(X) \ - target_debug_do_print (host_address_to_string (X->data ())) -#define target_debug_print_void_p(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_find_memory_region_ftype(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_bfd_p(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_std_vector_mem_region(X) \ - target_debug_do_print (host_address_to_string (X.data ())) -#define target_debug_print_std_vector_static_tracepoint_marker(X) \ - target_debug_do_print (host_address_to_string (X.data ())) -#define target_debug_print_const_target_desc_p(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_bp_location_p(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_const_trace_state_variable_r(X) \ - target_debug_do_print (host_address_to_string (&X)) -#define target_debug_print_trace_status_p(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_breakpoint_p(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_tracepoint_p(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_uploaded_tp_p(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_uploaded_tp_pp(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_uploaded_tsv_pp(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_static_tracepoint_marker_p(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_btrace_target_info_p(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_const_frame_unwind_p(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_btrace_data_p(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_record_method(X) \ - target_debug_do_print (plongest (X)) -#define target_debug_print_const_btrace_config_p(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_const_btrace_target_info_p(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_target_hw_bp_type(X) \ - target_debug_do_print (plongest (X)) -#define target_debug_print_bptype(X) \ - target_debug_do_print (plongest (X)) -#define target_debug_print_inferior_p(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_remove_bp_reason(X) \ - target_debug_do_print (plongest (X)) -#define target_debug_print_gdb_disassembly_flags(X) \ - target_debug_do_print (plongest (X)) -#define target_debug_print_traceframe_info_up(X) \ - target_debug_do_print (host_address_to_string (X.get ())) -#define target_debug_print_gdb_array_view_const_int(X) \ - target_debug_do_print (host_address_to_string (X.data ())) -#define target_debug_print_record_print_flags(X) \ - target_debug_do_print (plongest (X)) -#define target_debug_print_thread_control_capabilities(X) \ - target_debug_do_print (plongest (X)) -#define target_debug_print_thread_info_p(X) \ - target_debug_do_print (host_address_to_string (X)) -#define target_debug_print_std_string(X) \ - target_debug_do_print ((X).c_str ()) -#define target_debug_print_gdb_byte_vector(X) \ - target_debug_do_print (host_address_to_string (X.data ())) -#define target_debug_print_gdb_unique_xmalloc_ptr_char(X) \ - target_debug_do_print (X.get ()) -#define target_debug_print_target_waitkind(X) \ - target_debug_do_print (pulongest (X)) -#define target_debug_print_gdb_thread_options(X) \ - target_debug_do_print (to_string (X).c_str ()) +/* 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. */ + +static void +target_debug_do_print (const char *s) +{ gdb_puts (s, gdb_stdlog); } + +static void +target_debug_print_target_object (target_object object) +{ target_debug_do_print (plongest (object)); } + +static void +target_debug_print_CORE_ADDR (CORE_ADDR addr) +{ target_debug_do_print (core_addr_to_string (addr)); } + +static void +target_debug_print_const_char_p (const char *s) +{ target_debug_do_print (s != nullptr ? s : "(null)"); } + +static void +target_debug_print_int (int v) +{ target_debug_do_print (plongest (v)); } + +static void +target_debug_print_bool (bool v) +{ target_debug_do_print (v ? "true" : "false"); } + +static void +target_debug_print_long (long v) +{ target_debug_do_print (plongest (v)); } + +static void +target_debug_print_target_xfer_status (target_xfer_status status) +{ target_debug_do_print (plongest (status)); } + +static void +target_debug_print_exec_direction_kind (exec_direction_kind kind) +{ target_debug_do_print (plongest (kind)); } + +static void +target_debug_print_trace_find_type (trace_find_type type) +{ target_debug_do_print (plongest (type)); } + +static void +target_debug_print_btrace_read_type (btrace_read_type type) +{ target_debug_do_print (plongest (type)); } + +static void +target_debug_print_btrace_error (btrace_error error) +{ target_debug_do_print (plongest (error)); } + +static void +target_debug_print_ptid_t (ptid_t ptid) +{ target_debug_do_print (plongest (ptid.pid ())); } + +static void +target_debug_print_gdbarch_p (gdbarch *arch) +{ target_debug_do_print (gdbarch_bfd_arch_info (arch)->printable_name); } + +static void +target_debug_print_const_gdb_byte_p (const gdb_byte *p) +{ target_debug_do_print (host_address_to_string (p)); } + +static void +target_debug_print_gdb_byte_p (gdb_byte *p) +{ target_debug_do_print (host_address_to_string (p)); } + +static void +target_debug_print_const_gdb_byte_pp (const gdb_byte **p) +{ target_debug_do_print (host_address_to_string (*p)); } + +static void +target_debug_print_gdb_signal (gdb_signal sig) +{ target_debug_do_print (gdb_signal_to_name (sig)); } + +static void +target_debug_print_ULONGEST (ULONGEST v) +{ target_debug_do_print (hex_string (v)); } + +static void +target_debug_print_ULONGEST_p (ULONGEST *p) +{ target_debug_do_print (hex_string (*p)); } + +static void +target_debug_print_LONGEST (LONGEST v) +{ target_debug_do_print (phex (v, 0)); } + +static void +target_debug_print_LONGEST_p (LONGEST *p) +{ target_debug_do_print (phex (*p, 0)); } + +static void +target_debug_print_bp_target_info_p (bp_target_info *bp) +{ target_debug_do_print (core_addr_to_string (bp->placed_address)); } + +static void +target_debug_print_expression_p (expression *exp) +{ target_debug_do_print (host_address_to_string (exp)); } + +static void +target_debug_print_CORE_ADDR_p (CORE_ADDR *p) +{ target_debug_do_print (core_addr_to_string (*p)); } + +static void +target_debug_print_int_p (int *p) +{ target_debug_do_print (plongest (*p)); } + +static void +target_debug_print_regcache_p (regcache *regcache) +{ target_debug_do_print (host_address_to_string (regcache)); } + +static void +target_debug_print_thread_info_p (thread_info *thread) +{ target_debug_do_print (host_address_to_string (thread)); } + +static void +target_debug_print_ui_file_p (ui_file *file) +{ target_debug_do_print (host_address_to_string (file)); } + +static void +target_debug_print_const_std_vector_target_section_p + (const std::vector *vec) +{ target_debug_do_print (host_address_to_string (vec->data ())); } + +static void +target_debug_print_void_p (void *p) +{ target_debug_do_print (host_address_to_string (p)); } + +static void +target_debug_print_find_memory_region_ftype (find_memory_region_ftype func) +{ target_debug_do_print (host_address_to_string (func)); } + +static void +target_debug_print_bfd_p (bfd *bfd) +{ target_debug_do_print (host_address_to_string (bfd)); } + +static void +target_debug_print_std_vector_mem_region (const std::vector &vec) +{ target_debug_do_print (host_address_to_string (vec.data ())); } + +static void +target_debug_print_std_vector_static_tracepoint_marker + (const std::vector &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 &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 &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 &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 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); } - +/* Functions that are used via TARGET_DEBUG_PRINTER. */ -/* Macros or functions that are used via TARGET_DEBUG_PRINTER. */ - -#define target_debug_print_step(X) \ - target_debug_do_print ((X) ? "step" : "continue") +static void +target_debug_print_step (int step) +{ target_debug_do_print (step ? "step" : "continue"); } static void target_debug_print_target_wait_flags (target_wait_flags options) 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); From patchwork Wed Apr 17 20:54:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 88620 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 748F7384DD04 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 725573858D3C for ; Wed, 17 Apr 2024 20:54:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 725573858D3C 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 725573858D3C 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=MrmBWnJJ37FG0+o+AmJrfbdMpvUbs3U9HaKNoupx0/1FAoVfZ1EHA/wXbX6eMg0siTA9rDU3mLOc8DTEaOdPhRQAiqZ3eW+oesOQv1TxzhJMDth6VcnIkOWJ4d4iWbC8VoodxcEKKefBJRDyYvCPD7K1gQ/XfvI1iI8b8s4ew00= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713387282; c=relaxed/simple; bh=0FncnQe77Br9bWO4PaE9XiVtrR0PtEqy9yQe8+eZYuw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=bD1wF0WSu8KhSYCoU1e/G3vnXnIe4Q+bMsUBnguBpSpntHuSxLLIqTLDLvUuz6+24LYQPe04aNJtUpBzcy9wxj2P5Sk734miXC75ZI/Sy1NoKBllZoGKbdgB1qWmHmf1ar1Pi2pVg5auTYaIBwBXbsvWNeUyBQhLqHSh2jKGvdA= 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 43HKsSYs036400 (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 43HKsSYs036400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1713387274; bh=3THqwZj8SmAASgR3sbuUjLj+nG13k64wGuka+L4++WE=; h=From:To:Cc:Subject:Date:In-Reply-To:From; b=OfQXbZv+trVqJO5LstqxGX34Ypd7tU8oO2G6pAX/pC4VwwT5qdH+94DQJY9IEhN2G 0f8bQ+BcKEP5vLF+yP4NGL8qD5hl97TFTwFCnHtjnxCA5/+vi0uM/pcFlCzxwXHHU+ PRXPp8X/CQSziGvplpe0ftHOZjjtOJN7xnx0uETQ= 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 8022B1E0C1; Wed, 17 Apr 2024 16:54:28 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 4/6] gdb: make debug_target use one-liners Date: Wed, 17 Apr 2024 16:54:09 -0400 Message-ID: <20240417205426.2030615-4-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 Turn the debug prints in debug_target's method to be one liners. For instance, change this: gdb_printf (gdb_stdlog, "<- %s->wait (", this->beneath ()->shortname ()); gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); gdb_puts (", ", gdb_stdlog); gdb_puts (target_debug_print_target_waitstatus_p (arg1), gdb_stdlog); gdb_puts (", ", gdb_stdlog); 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); into this: gdb_printf (gdb_stdlog, "<- %s->wait (%s, %s, %s) = %s\n", this->beneath ()->shortname (), target_debug_print_ptid_t (arg0).c_str (), target_debug_print_target_waitstatus_p (arg1).c_str (), target_debug_print_target_wait_flags (arg2).c_str (), target_debug_print_ptid_t (result).c_str ()); This makes it possible for a subsequent patch to turn this gdb_printf call into a `target_debug_printf` call. Change-Id: I808202438972fac1bba2f8ccb63e66a4fcef20c9 --- gdb/make-target-delegates.py | 44 +- gdb/target-debug.h | 4 +- gdb/target-delegates.c | 1651 +++++++++++++++++----------------- 3 files changed, 835 insertions(+), 864 deletions(-) diff --git a/gdb/make-target-delegates.py b/gdb/make-target-delegates.py index 051efce94dab..f6f2bf004ff5 100755 --- a/gdb/make-target-delegates.py +++ b/gdb/make-target-delegates.py @@ -290,28 +290,34 @@ def write_debugmethod( print(", ".join(names), file=f, end="") print(");", file=f) - # Now print the arguments. - print( - ' gdb_printf (gdb_stdlog, "<- %s->' - + name - + ' (", this->beneath ()->shortname ());', - file=f, + # Generate the debug printf call. + args_fmt = ", ".join(["%s"] * len(argtypes)) + args = "".join( + [ + (",\n\t {printer} (arg{i}).c_str ()").format( + printer=munge_type(t), i=i + ) + for i, t in enumerate(argtypes) + ] ) - for i in range(len(argtypes)): - if i > 0: - print(' gdb_puts (", ", gdb_stdlog);', file=f) - printer = munge_type(argtypes[i]) - 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) - print(" " + printer + " (result);", file=f) - print(' gdb_puts ("\\n", gdb_stdlog);', file=f) + ret_fmt = " = %s" + ret = ",\n\t {printer} (result).c_str ()".format( + printer=munge_type(return_type) + ) else: - print(' gdb_puts (")\\n", gdb_stdlog);', file=f) + ret_fmt = "" + ret = "" + + print( + ( + " gdb_printf (gdb_stdlog,\n" + '\t "<- %s->{name} ({args_fmt}){ret_fmt}\\n",\n' + "\t this->beneath ()->shortname (){args}{ret});" + ).format(name=name, args_fmt=args_fmt, args=args, ret_fmt=ret_fmt, ret=ret), + file=f, + ) if return_type != "void": print(" return result;", file=f) diff --git a/gdb/target-debug.h b/gdb/target-debug.h index 1ed4517f7ffc..c52a71aa439e 100644 --- a/gdb/target-debug.h +++ b/gdb/target-debug.h @@ -308,7 +308,7 @@ target_debug_print_target_waitstatus_p (struct target_waitstatus *status) /* Functions that are used via TARGET_DEBUG_PRINTER. */ -static const char * +static std::string target_debug_print_step (int step) { return step ? "step" : "continue"; } @@ -331,7 +331,7 @@ target_debug_print_signals (gdb::array_view sigs) return s; } -static const char * +static std::string target_debug_print_size_t (size_t size) { return pulongest (size); diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index f6e71f32e67b..f4f88a952157 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -392,9 +392,10 @@ 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 ()); - gdb_puts (target_debug_print_int (arg0), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->post_attach (%s)\n", + this->beneath ()->shortname (), + target_debug_print_int (arg0).c_str ()); } void @@ -413,11 +414,11 @@ 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 ()); - gdb_puts (target_debug_print_inferior_p (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int (arg1), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->detach (%s, %s)\n", + this->beneath ()->shortname (), + target_debug_print_inferior_p (arg0).c_str (), + target_debug_print_int (arg1).c_str ()); } void @@ -437,11 +438,11 @@ 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 ()); - gdb_puts (target_debug_print_const_char_p (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int (arg1), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->disconnect (%s, %s)\n", + this->beneath ()->shortname (), + target_debug_print_const_char_p (arg0).c_str (), + target_debug_print_int (arg1).c_str ()); } void @@ -461,13 +462,12 @@ 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 ()); - gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_step (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_gdb_signal (arg2), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->resume (%s, %s, %s)\n", + this->beneath ()->shortname (), + target_debug_print_ptid_t (arg0).c_str (), + target_debug_print_step (arg1).c_str (), + target_debug_print_gdb_signal (arg2).c_str ()); } void @@ -486,8 +486,9 @@ debug_target::commit_resumed () { gdb_printf (gdb_stdlog, "-> %s->commit_resumed (...)\n", this->beneath ()->shortname ()); this->beneath ()->commit_resumed (); - gdb_printf (gdb_stdlog, "<- %s->commit_resumed (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->commit_resumed ()\n", + this->beneath ()->shortname ()); } ptid_t @@ -508,15 +509,13 @@ debug_target::wait (ptid_t arg0, struct target_waitstatus *arg1, target_wait_fla gdb_printf (gdb_stdlog, "-> %s->wait (...)\n", this->beneath ()->shortname ()); ptid_t result = this->beneath ()->wait (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, "<- %s->wait (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_target_waitstatus_p (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - 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); + gdb_printf (gdb_stdlog, + "<- %s->wait (%s, %s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_ptid_t (arg0).c_str (), + target_debug_print_target_waitstatus_p (arg1).c_str (), + target_debug_print_target_wait_flags (arg2).c_str (), + target_debug_print_ptid_t (result).c_str ()); return result; } @@ -536,11 +535,11 @@ 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 ()); - gdb_puts (target_debug_print_regcache_p (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int (arg1), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->fetch_registers (%s, %s)\n", + this->beneath ()->shortname (), + target_debug_print_regcache_p (arg0).c_str (), + target_debug_print_int (arg1).c_str ()); } void @@ -560,11 +559,11 @@ 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 ()); - gdb_puts (target_debug_print_regcache_p (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int (arg1), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->store_registers (%s, %s)\n", + this->beneath ()->shortname (), + target_debug_print_regcache_p (arg0).c_str (), + target_debug_print_int (arg1).c_str ()); } void @@ -584,9 +583,10 @@ 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 ()); - gdb_puts (target_debug_print_regcache_p (arg0), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->prepare_to_store (%s)\n", + this->beneath ()->shortname (), + target_debug_print_regcache_p (arg0).c_str ()); } void @@ -605,8 +605,9 @@ debug_target::files_info () { gdb_printf (gdb_stdlog, "-> %s->files_info (...)\n", this->beneath ()->shortname ()); this->beneath ()->files_info (); - gdb_printf (gdb_stdlog, "<- %s->files_info (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->files_info ()\n", + this->beneath ()->shortname ()); } int @@ -627,13 +628,12 @@ debug_target::insert_breakpoint (struct gdbarch *arg0, struct bp_target_info *ar gdb_printf (gdb_stdlog, "-> %s->insert_breakpoint (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->insert_breakpoint (arg0, arg1); - gdb_printf (gdb_stdlog, "<- %s->insert_breakpoint (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_gdbarch_p (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - 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); + gdb_printf (gdb_stdlog, + "<- %s->insert_breakpoint (%s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_gdbarch_p (arg0).c_str (), + target_debug_print_bp_target_info_p (arg1).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -655,15 +655,13 @@ debug_target::remove_breakpoint (struct gdbarch *arg0, struct bp_target_info *ar gdb_printf (gdb_stdlog, "-> %s->remove_breakpoint (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->remove_breakpoint (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, "<- %s->remove_breakpoint (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_gdbarch_p (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_bp_target_info_p (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - 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); + gdb_printf (gdb_stdlog, + "<- %s->remove_breakpoint (%s, %s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_gdbarch_p (arg0).c_str (), + target_debug_print_bp_target_info_p (arg1).c_str (), + target_debug_print_remove_bp_reason (arg2).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -685,10 +683,10 @@ debug_target::stopped_by_sw_breakpoint () gdb_printf (gdb_stdlog, "-> %s->stopped_by_sw_breakpoint (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->stopped_by_sw_breakpoint (); - gdb_printf (gdb_stdlog, "<- %s->stopped_by_sw_breakpoint (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->stopped_by_sw_breakpoint () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -710,10 +708,10 @@ debug_target::supports_stopped_by_sw_breakpoint () gdb_printf (gdb_stdlog, "-> %s->supports_stopped_by_sw_breakpoint (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_stopped_by_sw_breakpoint (); - gdb_printf (gdb_stdlog, "<- %s->supports_stopped_by_sw_breakpoint (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->supports_stopped_by_sw_breakpoint () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -735,10 +733,10 @@ debug_target::stopped_by_hw_breakpoint () gdb_printf (gdb_stdlog, "-> %s->stopped_by_hw_breakpoint (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->stopped_by_hw_breakpoint (); - gdb_printf (gdb_stdlog, "<- %s->stopped_by_hw_breakpoint (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->stopped_by_hw_breakpoint () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -760,10 +758,10 @@ debug_target::supports_stopped_by_hw_breakpoint () gdb_printf (gdb_stdlog, "-> %s->supports_stopped_by_hw_breakpoint (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_stopped_by_hw_breakpoint (); - gdb_printf (gdb_stdlog, "<- %s->supports_stopped_by_hw_breakpoint (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->supports_stopped_by_hw_breakpoint () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -785,15 +783,13 @@ debug_target::can_use_hw_breakpoint (enum bptype arg0, int arg1, int arg2) gdb_printf (gdb_stdlog, "-> %s->can_use_hw_breakpoint (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->can_use_hw_breakpoint (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, "<- %s->can_use_hw_breakpoint (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_bptype (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int (arg2), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_int (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->can_use_hw_breakpoint (%s, %s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_bptype (arg0).c_str (), + target_debug_print_int (arg1).c_str (), + target_debug_print_int (arg2).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -815,10 +811,10 @@ debug_target::ranged_break_num_registers () gdb_printf (gdb_stdlog, "-> %s->ranged_break_num_registers (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->ranged_break_num_registers (); - gdb_printf (gdb_stdlog, "<- %s->ranged_break_num_registers (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_int (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->ranged_break_num_registers () = %s\n", + this->beneath ()->shortname (), + target_debug_print_int (result).c_str ()); return result; } @@ -840,13 +836,12 @@ debug_target::insert_hw_breakpoint (struct gdbarch *arg0, struct bp_target_info gdb_printf (gdb_stdlog, "-> %s->insert_hw_breakpoint (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->insert_hw_breakpoint (arg0, arg1); - gdb_printf (gdb_stdlog, "<- %s->insert_hw_breakpoint (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_gdbarch_p (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - 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); + gdb_printf (gdb_stdlog, + "<- %s->insert_hw_breakpoint (%s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_gdbarch_p (arg0).c_str (), + target_debug_print_bp_target_info_p (arg1).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -868,13 +863,12 @@ debug_target::remove_hw_breakpoint (struct gdbarch *arg0, struct bp_target_info gdb_printf (gdb_stdlog, "-> %s->remove_hw_breakpoint (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->remove_hw_breakpoint (arg0, arg1); - gdb_printf (gdb_stdlog, "<- %s->remove_hw_breakpoint (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_gdbarch_p (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - 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); + gdb_printf (gdb_stdlog, + "<- %s->remove_hw_breakpoint (%s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_gdbarch_p (arg0).c_str (), + target_debug_print_bp_target_info_p (arg1).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -896,17 +890,14 @@ debug_target::remove_watchpoint (CORE_ADDR arg0, int arg1, enum target_hw_bp_typ gdb_printf (gdb_stdlog, "-> %s->remove_watchpoint (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->remove_watchpoint (arg0, arg1, arg2, arg3); - gdb_printf (gdb_stdlog, "<- %s->remove_watchpoint (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_target_hw_bp_type (arg2), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_expression_p (arg3), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_int (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->remove_watchpoint (%s, %s, %s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_CORE_ADDR (arg0).c_str (), + target_debug_print_int (arg1).c_str (), + target_debug_print_target_hw_bp_type (arg2).c_str (), + target_debug_print_expression_p (arg3).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -928,17 +919,14 @@ debug_target::insert_watchpoint (CORE_ADDR arg0, int arg1, enum target_hw_bp_typ gdb_printf (gdb_stdlog, "-> %s->insert_watchpoint (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->insert_watchpoint (arg0, arg1, arg2, arg3); - gdb_printf (gdb_stdlog, "<- %s->insert_watchpoint (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_target_hw_bp_type (arg2), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_expression_p (arg3), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_int (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->insert_watchpoint (%s, %s, %s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_CORE_ADDR (arg0).c_str (), + target_debug_print_int (arg1).c_str (), + target_debug_print_target_hw_bp_type (arg2).c_str (), + target_debug_print_expression_p (arg3).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -960,15 +948,13 @@ debug_target::insert_mask_watchpoint (CORE_ADDR arg0, CORE_ADDR arg1, enum targe gdb_printf (gdb_stdlog, "-> %s->insert_mask_watchpoint (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->insert_mask_watchpoint (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, "<- %s->insert_mask_watchpoint (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_CORE_ADDR (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - 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); + gdb_printf (gdb_stdlog, + "<- %s->insert_mask_watchpoint (%s, %s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_CORE_ADDR (arg0).c_str (), + target_debug_print_CORE_ADDR (arg1).c_str (), + target_debug_print_target_hw_bp_type (arg2).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -990,15 +976,13 @@ debug_target::remove_mask_watchpoint (CORE_ADDR arg0, CORE_ADDR arg1, enum targe gdb_printf (gdb_stdlog, "-> %s->remove_mask_watchpoint (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->remove_mask_watchpoint (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, "<- %s->remove_mask_watchpoint (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_CORE_ADDR (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - 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); + gdb_printf (gdb_stdlog, + "<- %s->remove_mask_watchpoint (%s, %s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_CORE_ADDR (arg0).c_str (), + target_debug_print_CORE_ADDR (arg1).c_str (), + target_debug_print_target_hw_bp_type (arg2).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -1020,10 +1004,10 @@ debug_target::stopped_by_watchpoint () gdb_printf (gdb_stdlog, "-> %s->stopped_by_watchpoint (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->stopped_by_watchpoint (); - gdb_printf (gdb_stdlog, "<- %s->stopped_by_watchpoint (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->stopped_by_watchpoint () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -1045,10 +1029,10 @@ debug_target::have_steppable_watchpoint () gdb_printf (gdb_stdlog, "-> %s->have_steppable_watchpoint (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->have_steppable_watchpoint (); - gdb_printf (gdb_stdlog, "<- %s->have_steppable_watchpoint (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->have_steppable_watchpoint () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -1070,11 +1054,11 @@ debug_target::stopped_data_address (CORE_ADDR *arg0) gdb_printf (gdb_stdlog, "-> %s->stopped_data_address (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->stopped_data_address (arg0); - gdb_printf (gdb_stdlog, "<- %s->stopped_data_address (", this->beneath ()->shortname ()); - 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); + gdb_printf (gdb_stdlog, + "<- %s->stopped_data_address (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_CORE_ADDR_p (arg0).c_str (), + target_debug_print_bool (result).c_str ()); return result; } @@ -1096,15 +1080,13 @@ debug_target::watchpoint_addr_within_range (CORE_ADDR arg0, CORE_ADDR arg1, int gdb_printf (gdb_stdlog, "-> %s->watchpoint_addr_within_range (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->watchpoint_addr_within_range (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, "<- %s->watchpoint_addr_within_range (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_CORE_ADDR (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int (arg2), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->watchpoint_addr_within_range (%s, %s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_CORE_ADDR (arg0).c_str (), + target_debug_print_CORE_ADDR (arg1).c_str (), + target_debug_print_int (arg2).c_str (), + target_debug_print_bool (result).c_str ()); return result; } @@ -1126,13 +1108,12 @@ debug_target::region_ok_for_hw_watchpoint (CORE_ADDR arg0, int arg1) gdb_printf (gdb_stdlog, "-> %s->region_ok_for_hw_watchpoint (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->region_ok_for_hw_watchpoint (arg0, arg1); - gdb_printf (gdb_stdlog, "<- %s->region_ok_for_hw_watchpoint (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int (arg1), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_int (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->region_ok_for_hw_watchpoint (%s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_CORE_ADDR (arg0).c_str (), + target_debug_print_int (arg1).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -1154,17 +1135,14 @@ debug_target::can_accel_watchpoint_condition (CORE_ADDR arg0, int arg1, int arg2 gdb_printf (gdb_stdlog, "-> %s->can_accel_watchpoint_condition (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->can_accel_watchpoint_condition (arg0, arg1, arg2, arg3); - gdb_printf (gdb_stdlog, "<- %s->can_accel_watchpoint_condition (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int (arg2), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_expression_p (arg3), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->can_accel_watchpoint_condition (%s, %s, %s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_CORE_ADDR (arg0).c_str (), + target_debug_print_int (arg1).c_str (), + target_debug_print_int (arg2).c_str (), + target_debug_print_expression_p (arg3).c_str (), + target_debug_print_bool (result).c_str ()); return result; } @@ -1186,13 +1164,12 @@ debug_target::masked_watch_num_registers (CORE_ADDR arg0, CORE_ADDR arg1) gdb_printf (gdb_stdlog, "-> %s->masked_watch_num_registers (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->masked_watch_num_registers (arg0, arg1); - gdb_printf (gdb_stdlog, "<- %s->masked_watch_num_registers (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_CORE_ADDR (arg1), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_int (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->masked_watch_num_registers (%s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_CORE_ADDR (arg0).c_str (), + target_debug_print_CORE_ADDR (arg1).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -1214,10 +1191,10 @@ debug_target::can_do_single_step () gdb_printf (gdb_stdlog, "-> %s->can_do_single_step (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->can_do_single_step (); - gdb_printf (gdb_stdlog, "<- %s->can_do_single_step (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_int (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->can_do_single_step () = %s\n", + this->beneath ()->shortname (), + target_debug_print_int (result).c_str ()); return result; } @@ -1239,10 +1216,10 @@ debug_target::supports_terminal_ours () gdb_printf (gdb_stdlog, "-> %s->supports_terminal_ours (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_terminal_ours (); - gdb_printf (gdb_stdlog, "<- %s->supports_terminal_ours (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->supports_terminal_ours () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -1262,8 +1239,9 @@ debug_target::terminal_init () { gdb_printf (gdb_stdlog, "-> %s->terminal_init (...)\n", this->beneath ()->shortname ()); this->beneath ()->terminal_init (); - gdb_printf (gdb_stdlog, "<- %s->terminal_init (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->terminal_init ()\n", + this->beneath ()->shortname ()); } void @@ -1282,8 +1260,9 @@ debug_target::terminal_inferior () { gdb_printf (gdb_stdlog, "-> %s->terminal_inferior (...)\n", this->beneath ()->shortname ()); this->beneath ()->terminal_inferior (); - gdb_printf (gdb_stdlog, "<- %s->terminal_inferior (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->terminal_inferior ()\n", + this->beneath ()->shortname ()); } void @@ -1302,8 +1281,9 @@ debug_target::terminal_save_inferior () { gdb_printf (gdb_stdlog, "-> %s->terminal_save_inferior (...)\n", this->beneath ()->shortname ()); this->beneath ()->terminal_save_inferior (); - gdb_printf (gdb_stdlog, "<- %s->terminal_save_inferior (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->terminal_save_inferior ()\n", + this->beneath ()->shortname ()); } void @@ -1322,8 +1302,9 @@ debug_target::terminal_ours_for_output () { gdb_printf (gdb_stdlog, "-> %s->terminal_ours_for_output (...)\n", this->beneath ()->shortname ()); this->beneath ()->terminal_ours_for_output (); - gdb_printf (gdb_stdlog, "<- %s->terminal_ours_for_output (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->terminal_ours_for_output ()\n", + this->beneath ()->shortname ()); } void @@ -1342,8 +1323,9 @@ debug_target::terminal_ours () { gdb_printf (gdb_stdlog, "-> %s->terminal_ours (...)\n", this->beneath ()->shortname ()); this->beneath ()->terminal_ours (); - gdb_printf (gdb_stdlog, "<- %s->terminal_ours (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->terminal_ours ()\n", + this->beneath ()->shortname ()); } void @@ -1363,11 +1345,11 @@ 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 ()); - gdb_puts (target_debug_print_const_char_p (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int (arg1), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->terminal_info (%s, %s)\n", + this->beneath ()->shortname (), + target_debug_print_const_char_p (arg0).c_str (), + target_debug_print_int (arg1).c_str ()); } void @@ -1387,8 +1369,9 @@ debug_target::kill () { gdb_printf (gdb_stdlog, "-> %s->kill (...)\n", this->beneath ()->shortname ()); this->beneath ()->kill (); - gdb_printf (gdb_stdlog, "<- %s->kill (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->kill ()\n", + this->beneath ()->shortname ()); } void @@ -1408,11 +1391,11 @@ 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 ()); - gdb_puts (target_debug_print_const_char_p (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int (arg1), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->load (%s, %s)\n", + this->beneath ()->shortname (), + target_debug_print_const_char_p (arg0).c_str (), + target_debug_print_int (arg1).c_str ()); } int @@ -1433,11 +1416,11 @@ debug_target::insert_fork_catchpoint (int arg0) gdb_printf (gdb_stdlog, "-> %s->insert_fork_catchpoint (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->insert_fork_catchpoint (arg0); - gdb_printf (gdb_stdlog, "<- %s->insert_fork_catchpoint (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_int (arg0), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_int (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->insert_fork_catchpoint (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_int (arg0).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -1459,11 +1442,11 @@ debug_target::remove_fork_catchpoint (int arg0) gdb_printf (gdb_stdlog, "-> %s->remove_fork_catchpoint (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->remove_fork_catchpoint (arg0); - gdb_printf (gdb_stdlog, "<- %s->remove_fork_catchpoint (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_int (arg0), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_int (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->remove_fork_catchpoint (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_int (arg0).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -1485,11 +1468,11 @@ debug_target::insert_vfork_catchpoint (int arg0) gdb_printf (gdb_stdlog, "-> %s->insert_vfork_catchpoint (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->insert_vfork_catchpoint (arg0); - gdb_printf (gdb_stdlog, "<- %s->insert_vfork_catchpoint (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_int (arg0), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_int (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->insert_vfork_catchpoint (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_int (arg0).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -1511,11 +1494,11 @@ debug_target::remove_vfork_catchpoint (int arg0) gdb_printf (gdb_stdlog, "-> %s->remove_vfork_catchpoint (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->remove_vfork_catchpoint (arg0); - gdb_printf (gdb_stdlog, "<- %s->remove_vfork_catchpoint (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_int (arg0), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_int (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->remove_vfork_catchpoint (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_int (arg0).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -1536,17 +1519,14 @@ 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 ()); - gdb_puts (target_debug_print_inferior_p (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_ptid_t (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_target_waitkind (arg2), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_bool (arg3), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_bool (arg4), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->follow_fork (%s, %s, %s, %s, %s)\n", + this->beneath ()->shortname (), + target_debug_print_inferior_p (arg0).c_str (), + target_debug_print_ptid_t (arg1).c_str (), + target_debug_print_target_waitkind (arg2).c_str (), + target_debug_print_bool (arg3).c_str (), + target_debug_print_bool (arg4).c_str ()); } void @@ -1566,9 +1546,10 @@ 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 ()); - gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->follow_clone (%s)\n", + this->beneath ()->shortname (), + target_debug_print_ptid_t (arg0).c_str ()); } int @@ -1589,11 +1570,11 @@ debug_target::insert_exec_catchpoint (int arg0) gdb_printf (gdb_stdlog, "-> %s->insert_exec_catchpoint (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->insert_exec_catchpoint (arg0); - gdb_printf (gdb_stdlog, "<- %s->insert_exec_catchpoint (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_int (arg0), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_int (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->insert_exec_catchpoint (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_int (arg0).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -1615,11 +1596,11 @@ debug_target::remove_exec_catchpoint (int arg0) gdb_printf (gdb_stdlog, "-> %s->remove_exec_catchpoint (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->remove_exec_catchpoint (arg0); - gdb_printf (gdb_stdlog, "<- %s->remove_exec_catchpoint (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_int (arg0), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_int (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->remove_exec_catchpoint (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_int (arg0).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -1639,13 +1620,12 @@ 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 ()); - gdb_puts (target_debug_print_inferior_p (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_ptid_t (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_const_char_p (arg2), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->follow_exec (%s, %s, %s)\n", + this->beneath ()->shortname (), + target_debug_print_inferior_p (arg0).c_str (), + target_debug_print_ptid_t (arg1).c_str (), + target_debug_print_const_char_p (arg2).c_str ()); } int @@ -1666,17 +1646,14 @@ debug_target::set_syscall_catchpoint (int arg0, bool arg1, int arg2, gdb::array_ gdb_printf (gdb_stdlog, "-> %s->set_syscall_catchpoint (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->set_syscall_catchpoint (arg0, arg1, arg2, arg3); - gdb_printf (gdb_stdlog, "<- %s->set_syscall_catchpoint (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_int (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_bool (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int (arg2), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - 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); + gdb_printf (gdb_stdlog, + "<- %s->set_syscall_catchpoint (%s, %s, %s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_int (arg0).c_str (), + target_debug_print_bool (arg1).c_str (), + target_debug_print_int (arg2).c_str (), + target_debug_print_gdb_array_view_const_int (arg3).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -1697,8 +1674,9 @@ debug_target::mourn_inferior () { gdb_printf (gdb_stdlog, "-> %s->mourn_inferior (...)\n", this->beneath ()->shortname ()); this->beneath ()->mourn_inferior (); - gdb_printf (gdb_stdlog, "<- %s->mourn_inferior (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->mourn_inferior ()\n", + this->beneath ()->shortname ()); } void @@ -1717,9 +1695,10 @@ 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 ()); - gdb_puts (target_debug_print_signals (arg0), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->pass_signals (%s)\n", + this->beneath ()->shortname (), + target_debug_print_signals (arg0).c_str ()); } void @@ -1738,9 +1717,10 @@ 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 ()); - gdb_puts (target_debug_print_signals (arg0), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->program_signals (%s)\n", + this->beneath ()->shortname (), + target_debug_print_signals (arg0).c_str ()); } bool @@ -1761,11 +1741,11 @@ debug_target::thread_alive (ptid_t arg0) gdb_printf (gdb_stdlog, "-> %s->thread_alive (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->thread_alive (arg0); - gdb_printf (gdb_stdlog, "<- %s->thread_alive (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->thread_alive (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_ptid_t (arg0).c_str (), + target_debug_print_bool (result).c_str ()); return result; } @@ -1785,8 +1765,9 @@ debug_target::update_thread_list () { gdb_printf (gdb_stdlog, "-> %s->update_thread_list (...)\n", this->beneath ()->shortname ()); this->beneath ()->update_thread_list (); - gdb_printf (gdb_stdlog, "<- %s->update_thread_list (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->update_thread_list ()\n", + this->beneath ()->shortname ()); } std::string @@ -1807,11 +1788,11 @@ debug_target::pid_to_str (ptid_t arg0) gdb_printf (gdb_stdlog, "-> %s->pid_to_str (...)\n", this->beneath ()->shortname ()); std::string result = this->beneath ()->pid_to_str (arg0); - gdb_printf (gdb_stdlog, "<- %s->pid_to_str (", this->beneath ()->shortname ()); - 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); + gdb_printf (gdb_stdlog, + "<- %s->pid_to_str (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_ptid_t (arg0).c_str (), + target_debug_print_std_string (result).c_str ()); return result; } @@ -1833,11 +1814,11 @@ debug_target::extra_thread_info (thread_info *arg0) gdb_printf (gdb_stdlog, "-> %s->extra_thread_info (...)\n", this->beneath ()->shortname ()); const char * result = this->beneath ()->extra_thread_info (arg0); - gdb_printf (gdb_stdlog, "<- %s->extra_thread_info (", this->beneath ()->shortname ()); - 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); + gdb_printf (gdb_stdlog, + "<- %s->extra_thread_info (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_thread_info_p (arg0).c_str (), + target_debug_print_const_char_p (result).c_str ()); return result; } @@ -1859,11 +1840,11 @@ debug_target::thread_name (thread_info *arg0) gdb_printf (gdb_stdlog, "-> %s->thread_name (...)\n", this->beneath ()->shortname ()); const char * result = this->beneath ()->thread_name (arg0); - gdb_printf (gdb_stdlog, "<- %s->thread_name (", this->beneath ()->shortname ()); - 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); + gdb_printf (gdb_stdlog, + "<- %s->thread_name (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_thread_info_p (arg0).c_str (), + target_debug_print_const_char_p (result).c_str ()); return result; } @@ -1885,15 +1866,13 @@ debug_target::thread_handle_to_thread_info (const gdb_byte *arg0, int arg1, infe gdb_printf (gdb_stdlog, "-> %s->thread_handle_to_thread_info (...)\n", this->beneath ()->shortname ()); 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 ()); - gdb_puts (target_debug_print_const_gdb_byte_p (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - 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); + gdb_printf (gdb_stdlog, + "<- %s->thread_handle_to_thread_info (%s, %s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_const_gdb_byte_p (arg0).c_str (), + target_debug_print_int (arg1).c_str (), + target_debug_print_inferior_p (arg2).c_str (), + target_debug_print_thread_info_p (result).c_str ()); return result; } @@ -1915,11 +1894,11 @@ debug_target::thread_info_to_thread_handle (struct thread_info *arg0) gdb_printf (gdb_stdlog, "-> %s->thread_info_to_thread_handle (...)\n", this->beneath ()->shortname ()); 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 ()); - 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); + gdb_printf (gdb_stdlog, + "<- %s->thread_info_to_thread_handle (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_thread_info_p (arg0).c_str (), + target_debug_print_gdb_array_view_const_gdb_byte (result).c_str ()); return result; } @@ -1939,9 +1918,10 @@ 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 ()); - gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->stop (%s)\n", + this->beneath ()->shortname (), + target_debug_print_ptid_t (arg0).c_str ()); } void @@ -1960,8 +1940,9 @@ debug_target::interrupt () { gdb_printf (gdb_stdlog, "-> %s->interrupt (...)\n", this->beneath ()->shortname ()); this->beneath ()->interrupt (); - gdb_printf (gdb_stdlog, "<- %s->interrupt (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->interrupt ()\n", + this->beneath ()->shortname ()); } void @@ -1981,8 +1962,9 @@ debug_target::pass_ctrlc () { gdb_printf (gdb_stdlog, "-> %s->pass_ctrlc (...)\n", this->beneath ()->shortname ()); this->beneath ()->pass_ctrlc (); - gdb_printf (gdb_stdlog, "<- %s->pass_ctrlc (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->pass_ctrlc ()\n", + this->beneath ()->shortname ()); } void @@ -2002,11 +1984,11 @@ 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 ()); - gdb_puts (target_debug_print_const_char_p (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_ui_file_p (arg1), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->rcmd (%s, %s)\n", + this->beneath ()->shortname (), + target_debug_print_const_char_p (arg0).c_str (), + target_debug_print_ui_file_p (arg1).c_str ()); } const char * @@ -2027,11 +2009,11 @@ debug_target::pid_to_exec_file (int arg0) gdb_printf (gdb_stdlog, "-> %s->pid_to_exec_file (...)\n", this->beneath ()->shortname ()); const char * result = this->beneath ()->pid_to_exec_file (arg0); - gdb_printf (gdb_stdlog, "<- %s->pid_to_exec_file (", this->beneath ()->shortname ()); - 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); + gdb_printf (gdb_stdlog, + "<- %s->pid_to_exec_file (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_int (arg0).c_str (), + target_debug_print_const_char_p (result).c_str ()); return result; } @@ -2051,9 +2033,10 @@ 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 ()); - gdb_puts (target_debug_print_const_char_p (arg0), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->log_command (%s)\n", + this->beneath ()->shortname (), + target_debug_print_const_char_p (arg0).c_str ()); } const std::vector * @@ -2074,10 +2057,10 @@ debug_target::get_section_table () gdb_printf (gdb_stdlog, "-> %s->get_section_table (...)\n", this->beneath ()->shortname ()); const std::vector * result = this->beneath ()->get_section_table (); - gdb_printf (gdb_stdlog, "<- %s->get_section_table (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_const_std_vector_target_section_p (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->get_section_table () = %s\n", + this->beneath ()->shortname (), + target_debug_print_const_std_vector_target_section_p (result).c_str ()); return result; } @@ -2099,10 +2082,10 @@ debug_target::get_thread_control_capabilities () gdb_printf (gdb_stdlog, "-> %s->get_thread_control_capabilities (...)\n", this->beneath ()->shortname ()); thread_control_capabilities result = this->beneath ()->get_thread_control_capabilities (); - gdb_printf (gdb_stdlog, "<- %s->get_thread_control_capabilities (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_thread_control_capabilities (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->get_thread_control_capabilities () = %s\n", + this->beneath ()->shortname (), + target_debug_print_thread_control_capabilities (result).c_str ()); return result; } @@ -2124,10 +2107,10 @@ debug_target::attach_no_wait () gdb_printf (gdb_stdlog, "-> %s->attach_no_wait (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->attach_no_wait (); - gdb_printf (gdb_stdlog, "<- %s->attach_no_wait (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->attach_no_wait () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -2149,10 +2132,10 @@ debug_target::can_async_p () gdb_printf (gdb_stdlog, "-> %s->can_async_p (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->can_async_p (); - gdb_printf (gdb_stdlog, "<- %s->can_async_p (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->can_async_p () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -2174,10 +2157,10 @@ debug_target::is_async_p () gdb_printf (gdb_stdlog, "-> %s->is_async_p (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->is_async_p (); - gdb_printf (gdb_stdlog, "<- %s->is_async_p (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->is_async_p () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -2198,9 +2181,10 @@ 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 ()); - gdb_puts (target_debug_print_bool (arg0), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->async (%s)\n", + this->beneath ()->shortname (), + target_debug_print_bool (arg0).c_str ()); } int @@ -2221,10 +2205,10 @@ debug_target::async_wait_fd () gdb_printf (gdb_stdlog, "-> %s->async_wait_fd (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->async_wait_fd (); - gdb_printf (gdb_stdlog, "<- %s->async_wait_fd (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_int (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->async_wait_fd () = %s\n", + this->beneath ()->shortname (), + target_debug_print_int (result).c_str ()); return result; } @@ -2246,10 +2230,10 @@ debug_target::has_pending_events () gdb_printf (gdb_stdlog, "-> %s->has_pending_events (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->has_pending_events (); - gdb_printf (gdb_stdlog, "<- %s->has_pending_events (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->has_pending_events () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -2269,9 +2253,10 @@ 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 ()); - gdb_puts (target_debug_print_int (arg0), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->thread_events (%s)\n", + this->beneath ()->shortname (), + target_debug_print_int (arg0).c_str ()); } bool @@ -2292,11 +2277,11 @@ debug_target::supports_set_thread_options (gdb_thread_options arg0) gdb_printf (gdb_stdlog, "-> %s->supports_set_thread_options (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_set_thread_options (arg0); - gdb_printf (gdb_stdlog, "<- %s->supports_set_thread_options (", this->beneath ()->shortname ()); - 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); + gdb_printf (gdb_stdlog, + "<- %s->supports_set_thread_options (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_gdb_thread_options (arg0).c_str (), + target_debug_print_bool (result).c_str ()); return result; } @@ -2318,10 +2303,10 @@ debug_target::supports_non_stop () gdb_printf (gdb_stdlog, "-> %s->supports_non_stop (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_non_stop (); - gdb_printf (gdb_stdlog, "<- %s->supports_non_stop (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->supports_non_stop () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -2343,10 +2328,10 @@ debug_target::always_non_stop_p () gdb_printf (gdb_stdlog, "-> %s->always_non_stop_p (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->always_non_stop_p (); - gdb_printf (gdb_stdlog, "<- %s->always_non_stop_p (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->always_non_stop_p () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -2368,13 +2353,12 @@ debug_target::find_memory_regions (find_memory_region_ftype arg0, void *arg1) gdb_printf (gdb_stdlog, "-> %s->find_memory_regions (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->find_memory_regions (arg0, arg1); - gdb_printf (gdb_stdlog, "<- %s->find_memory_regions (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_find_memory_region_ftype (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_void_p (arg1), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_int (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->find_memory_regions (%s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_find_memory_region_ftype (arg0).c_str (), + target_debug_print_void_p (arg1).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -2396,13 +2380,12 @@ debug_target::make_corefile_notes (bfd *arg0, int *arg1) gdb_printf (gdb_stdlog, "-> %s->make_corefile_notes (...)\n", this->beneath ()->shortname ()); gdb::unique_xmalloc_ptr result = this->beneath ()->make_corefile_notes (arg0, arg1); - gdb_printf (gdb_stdlog, "<- %s->make_corefile_notes (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_bfd_p (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - 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); + gdb_printf (gdb_stdlog, + "<- %s->make_corefile_notes (%s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_bfd_p (arg0).c_str (), + target_debug_print_int_p (arg1).c_str (), + target_debug_print_gdb_unique_xmalloc_ptr_char (result).c_str ()); return result; } @@ -2424,13 +2407,12 @@ debug_target::get_bookmark (const char *arg0, int arg1) gdb_printf (gdb_stdlog, "-> %s->get_bookmark (...)\n", this->beneath ()->shortname ()); gdb_byte * result = this->beneath ()->get_bookmark (arg0, arg1); - gdb_printf (gdb_stdlog, "<- %s->get_bookmark (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_const_char_p (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - 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); + gdb_printf (gdb_stdlog, + "<- %s->get_bookmark (%s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_const_char_p (arg0).c_str (), + target_debug_print_int (arg1).c_str (), + target_debug_print_gdb_byte_p (result).c_str ()); return result; } @@ -2451,11 +2433,11 @@ 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 ()); - gdb_puts (target_debug_print_const_gdb_byte_p (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int (arg1), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->goto_bookmark (%s, %s)\n", + this->beneath ()->shortname (), + target_debug_print_const_gdb_byte_p (arg0).c_str (), + target_debug_print_int (arg1).c_str ()); } CORE_ADDR @@ -2476,15 +2458,13 @@ debug_target::get_thread_local_address (ptid_t arg0, CORE_ADDR arg1, CORE_ADDR a gdb_printf (gdb_stdlog, "-> %s->get_thread_local_address (...)\n", this->beneath ()->shortname ()); CORE_ADDR result = this->beneath ()->get_thread_local_address (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, "<- %s->get_thread_local_address (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_CORE_ADDR (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - 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); + gdb_printf (gdb_stdlog, + "<- %s->get_thread_local_address (%s, %s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_ptid_t (arg0).c_str (), + target_debug_print_CORE_ADDR (arg1).c_str (), + target_debug_print_CORE_ADDR (arg2).c_str (), + target_debug_print_CORE_ADDR (result).c_str ()); return result; } @@ -2506,23 +2486,17 @@ debug_target::xfer_partial (enum target_object arg0, const char *arg1, gdb_byte gdb_printf (gdb_stdlog, "-> %s->xfer_partial (...)\n", this->beneath ()->shortname ()); 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 ()); - gdb_puts (target_debug_print_target_object (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_const_char_p (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_gdb_byte_p (arg2), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_const_gdb_byte_p (arg3), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_ULONGEST (arg4), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_ULONGEST (arg5), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - 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); + gdb_printf (gdb_stdlog, + "<- %s->xfer_partial (%s, %s, %s, %s, %s, %s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_target_object (arg0).c_str (), + target_debug_print_const_char_p (arg1).c_str (), + target_debug_print_gdb_byte_p (arg2).c_str (), + target_debug_print_const_gdb_byte_p (arg3).c_str (), + target_debug_print_ULONGEST (arg4).c_str (), + target_debug_print_ULONGEST (arg5).c_str (), + target_debug_print_ULONGEST_p (arg6).c_str (), + target_debug_print_target_xfer_status (result).c_str ()); return result; } @@ -2544,10 +2518,10 @@ debug_target::get_memory_xfer_limit () gdb_printf (gdb_stdlog, "-> %s->get_memory_xfer_limit (...)\n", this->beneath ()->shortname ()); ULONGEST result = this->beneath ()->get_memory_xfer_limit (); - gdb_printf (gdb_stdlog, "<- %s->get_memory_xfer_limit (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_ULONGEST (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->get_memory_xfer_limit () = %s\n", + this->beneath ()->shortname (), + target_debug_print_ULONGEST (result).c_str ()); return result; } @@ -2569,10 +2543,10 @@ debug_target::memory_map () gdb_printf (gdb_stdlog, "-> %s->memory_map (...)\n", this->beneath ()->shortname ()); std::vector result = this->beneath ()->memory_map (); - gdb_printf (gdb_stdlog, "<- %s->memory_map (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_std_vector_mem_region (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->memory_map () = %s\n", + this->beneath ()->shortname (), + target_debug_print_std_vector_mem_region (result).c_str ()); return result; } @@ -2593,11 +2567,11 @@ 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 ()); - gdb_puts (target_debug_print_ULONGEST (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_LONGEST (arg1), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->flash_erase (%s, %s)\n", + this->beneath ()->shortname (), + target_debug_print_ULONGEST (arg0).c_str (), + target_debug_print_LONGEST (arg1).c_str ()); } void @@ -2617,8 +2591,9 @@ debug_target::flash_done () { gdb_printf (gdb_stdlog, "-> %s->flash_done (...)\n", this->beneath ()->shortname ()); this->beneath ()->flash_done (); - gdb_printf (gdb_stdlog, "<- %s->flash_done (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->flash_done ()\n", + this->beneath ()->shortname ()); } const struct target_desc * @@ -2639,10 +2614,10 @@ debug_target::read_description () gdb_printf (gdb_stdlog, "-> %s->read_description (...)\n", this->beneath ()->shortname ()); const struct target_desc * result = this->beneath ()->read_description (); - gdb_printf (gdb_stdlog, "<- %s->read_description (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_const_target_desc_p (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->read_description () = %s\n", + this->beneath ()->shortname (), + target_debug_print_const_target_desc_p (result).c_str ()); return result; } @@ -2664,13 +2639,12 @@ debug_target::get_ada_task_ptid (long arg0, ULONGEST arg1) gdb_printf (gdb_stdlog, "-> %s->get_ada_task_ptid (...)\n", this->beneath ()->shortname ()); ptid_t result = this->beneath ()->get_ada_task_ptid (arg0, arg1); - gdb_printf (gdb_stdlog, "<- %s->get_ada_task_ptid (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_long (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_ULONGEST (arg1), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_ptid_t (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->get_ada_task_ptid (%s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_long (arg0).c_str (), + target_debug_print_ULONGEST (arg1).c_str (), + target_debug_print_ptid_t (result).c_str ()); return result; } @@ -2692,17 +2666,14 @@ debug_target::auxv_parse (const gdb_byte **arg0, const gdb_byte *arg1, CORE_ADDR gdb_printf (gdb_stdlog, "-> %s->auxv_parse (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->auxv_parse (arg0, arg1, arg2, arg3); - gdb_printf (gdb_stdlog, "<- %s->auxv_parse (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_const_gdb_byte_pp (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_const_gdb_byte_p (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_CORE_ADDR_p (arg2), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - 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); + gdb_printf (gdb_stdlog, + "<- %s->auxv_parse (%s, %s, %s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_const_gdb_byte_pp (arg0).c_str (), + target_debug_print_const_gdb_byte_p (arg1).c_str (), + target_debug_print_CORE_ADDR_p (arg2).c_str (), + target_debug_print_CORE_ADDR_p (arg3).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -2724,19 +2695,15 @@ debug_target::search_memory (CORE_ADDR arg0, ULONGEST arg1, const gdb_byte *arg2 gdb_printf (gdb_stdlog, "-> %s->search_memory (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->search_memory (arg0, arg1, arg2, arg3, arg4); - gdb_printf (gdb_stdlog, "<- %s->search_memory (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_ULONGEST (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_const_gdb_byte_p (arg2), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_ULONGEST (arg3), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - 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); + gdb_printf (gdb_stdlog, + "<- %s->search_memory (%s, %s, %s, %s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_CORE_ADDR (arg0).c_str (), + target_debug_print_ULONGEST (arg1).c_str (), + target_debug_print_const_gdb_byte_p (arg2).c_str (), + target_debug_print_ULONGEST (arg3).c_str (), + target_debug_print_CORE_ADDR_p (arg4).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -2758,10 +2725,10 @@ debug_target::can_execute_reverse () gdb_printf (gdb_stdlog, "-> %s->can_execute_reverse (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->can_execute_reverse (); - gdb_printf (gdb_stdlog, "<- %s->can_execute_reverse (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->can_execute_reverse () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -2783,10 +2750,10 @@ debug_target::execution_direction () gdb_printf (gdb_stdlog, "-> %s->execution_direction (...)\n", this->beneath ()->shortname ()); enum exec_direction_kind result = this->beneath ()->execution_direction (); - gdb_printf (gdb_stdlog, "<- %s->execution_direction (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_exec_direction_kind (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->execution_direction () = %s\n", + this->beneath ()->shortname (), + target_debug_print_exec_direction_kind (result).c_str ()); return result; } @@ -2808,10 +2775,10 @@ debug_target::supports_multi_process () gdb_printf (gdb_stdlog, "-> %s->supports_multi_process (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_multi_process (); - gdb_printf (gdb_stdlog, "<- %s->supports_multi_process (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->supports_multi_process () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -2833,10 +2800,10 @@ debug_target::supports_enable_disable_tracepoint () gdb_printf (gdb_stdlog, "-> %s->supports_enable_disable_tracepoint (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_enable_disable_tracepoint (); - gdb_printf (gdb_stdlog, "<- %s->supports_enable_disable_tracepoint (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->supports_enable_disable_tracepoint () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -2858,10 +2825,10 @@ debug_target::supports_disable_randomization () gdb_printf (gdb_stdlog, "-> %s->supports_disable_randomization (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_disable_randomization (); - gdb_printf (gdb_stdlog, "<- %s->supports_disable_randomization (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->supports_disable_randomization () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -2883,10 +2850,10 @@ debug_target::supports_string_tracing () gdb_printf (gdb_stdlog, "-> %s->supports_string_tracing (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_string_tracing (); - gdb_printf (gdb_stdlog, "<- %s->supports_string_tracing (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->supports_string_tracing () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -2908,10 +2875,10 @@ debug_target::supports_evaluation_of_breakpoint_conditions () gdb_printf (gdb_stdlog, "-> %s->supports_evaluation_of_breakpoint_conditions (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_evaluation_of_breakpoint_conditions (); - gdb_printf (gdb_stdlog, "<- %s->supports_evaluation_of_breakpoint_conditions (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->supports_evaluation_of_breakpoint_conditions () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -2933,10 +2900,10 @@ debug_target::supports_dumpcore () gdb_printf (gdb_stdlog, "-> %s->supports_dumpcore (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_dumpcore (); - gdb_printf (gdb_stdlog, "<- %s->supports_dumpcore (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->supports_dumpcore () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -2956,9 +2923,10 @@ 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 ()); - gdb_puts (target_debug_print_const_char_p (arg0), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->dumpcore (%s)\n", + this->beneath ()->shortname (), + target_debug_print_const_char_p (arg0).c_str ()); } bool @@ -2979,10 +2947,10 @@ debug_target::can_run_breakpoint_commands () gdb_printf (gdb_stdlog, "-> %s->can_run_breakpoint_commands (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->can_run_breakpoint_commands (); - gdb_printf (gdb_stdlog, "<- %s->can_run_breakpoint_commands (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->can_run_breakpoint_commands () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -3004,11 +2972,11 @@ debug_target::thread_architecture (ptid_t arg0) gdb_printf (gdb_stdlog, "-> %s->thread_architecture (...)\n", this->beneath ()->shortname ()); struct gdbarch * result = this->beneath ()->thread_architecture (arg0); - gdb_printf (gdb_stdlog, "<- %s->thread_architecture (", this->beneath ()->shortname ()); - 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); + gdb_printf (gdb_stdlog, + "<- %s->thread_architecture (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_ptid_t (arg0).c_str (), + target_debug_print_gdbarch_p (result).c_str ()); return result; } @@ -3030,10 +2998,10 @@ debug_target::filesystem_is_local () gdb_printf (gdb_stdlog, "-> %s->filesystem_is_local (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->filesystem_is_local (); - gdb_printf (gdb_stdlog, "<- %s->filesystem_is_local (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->filesystem_is_local () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -3054,8 +3022,9 @@ debug_target::trace_init () { gdb_printf (gdb_stdlog, "-> %s->trace_init (...)\n", this->beneath ()->shortname ()); this->beneath ()->trace_init (); - gdb_printf (gdb_stdlog, "<- %s->trace_init (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->trace_init ()\n", + this->beneath ()->shortname ()); } void @@ -3075,9 +3044,10 @@ 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 ()); - gdb_puts (target_debug_print_bp_location_p (arg0), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->download_tracepoint (%s)\n", + this->beneath ()->shortname (), + target_debug_print_bp_location_p (arg0).c_str ()); } bool @@ -3098,10 +3068,10 @@ debug_target::can_download_tracepoint () gdb_printf (gdb_stdlog, "-> %s->can_download_tracepoint (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->can_download_tracepoint (); - gdb_printf (gdb_stdlog, "<- %s->can_download_tracepoint (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->can_download_tracepoint () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -3122,9 +3092,10 @@ 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 ()); - gdb_puts (target_debug_print_const_trace_state_variable_r (arg0), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->download_trace_state_variable (%s)\n", + this->beneath ()->shortname (), + target_debug_print_const_trace_state_variable_r (arg0).c_str ()); } void @@ -3144,9 +3115,10 @@ 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 ()); - gdb_puts (target_debug_print_bp_location_p (arg0), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->enable_tracepoint (%s)\n", + this->beneath ()->shortname (), + target_debug_print_bp_location_p (arg0).c_str ()); } void @@ -3166,9 +3138,10 @@ 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 ()); - gdb_puts (target_debug_print_bp_location_p (arg0), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->disable_tracepoint (%s)\n", + this->beneath ()->shortname (), + target_debug_print_bp_location_p (arg0).c_str ()); } void @@ -3188,8 +3161,9 @@ debug_target::trace_set_readonly_regions () { gdb_printf (gdb_stdlog, "-> %s->trace_set_readonly_regions (...)\n", this->beneath ()->shortname ()); this->beneath ()->trace_set_readonly_regions (); - gdb_printf (gdb_stdlog, "<- %s->trace_set_readonly_regions (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->trace_set_readonly_regions ()\n", + this->beneath ()->shortname ()); } void @@ -3209,8 +3183,9 @@ debug_target::trace_start () { gdb_printf (gdb_stdlog, "-> %s->trace_start (...)\n", this->beneath ()->shortname ()); this->beneath ()->trace_start (); - gdb_printf (gdb_stdlog, "<- %s->trace_start (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->trace_start ()\n", + this->beneath ()->shortname ()); } int @@ -3231,11 +3206,11 @@ debug_target::get_trace_status (struct trace_status *arg0) gdb_printf (gdb_stdlog, "-> %s->get_trace_status (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->get_trace_status (arg0); - gdb_printf (gdb_stdlog, "<- %s->get_trace_status (", this->beneath ()->shortname ()); - 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); + gdb_printf (gdb_stdlog, + "<- %s->get_trace_status (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_trace_status_p (arg0).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -3256,11 +3231,11 @@ 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 ()); - gdb_puts (target_debug_print_tracepoint_p (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_uploaded_tp_p (arg1), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->get_tracepoint_status (%s, %s)\n", + this->beneath ()->shortname (), + target_debug_print_tracepoint_p (arg0).c_str (), + target_debug_print_uploaded_tp_p (arg1).c_str ()); } void @@ -3280,8 +3255,9 @@ debug_target::trace_stop () { gdb_printf (gdb_stdlog, "-> %s->trace_stop (...)\n", this->beneath ()->shortname ()); this->beneath ()->trace_stop (); - gdb_printf (gdb_stdlog, "<- %s->trace_stop (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->trace_stop ()\n", + this->beneath ()->shortname ()); } int @@ -3302,19 +3278,15 @@ debug_target::trace_find (enum trace_find_type arg0, int arg1, CORE_ADDR arg2, C gdb_printf (gdb_stdlog, "-> %s->trace_find (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->trace_find (arg0, arg1, arg2, arg3, arg4); - gdb_printf (gdb_stdlog, "<- %s->trace_find (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_trace_find_type (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_CORE_ADDR (arg2), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_CORE_ADDR (arg3), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int_p (arg4), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_int (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->trace_find (%s, %s, %s, %s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_trace_find_type (arg0).c_str (), + target_debug_print_int (arg1).c_str (), + target_debug_print_CORE_ADDR (arg2).c_str (), + target_debug_print_CORE_ADDR (arg3).c_str (), + target_debug_print_int_p (arg4).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -3336,13 +3308,12 @@ debug_target::get_trace_state_variable_value (int arg0, LONGEST *arg1) gdb_printf (gdb_stdlog, "-> %s->get_trace_state_variable_value (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->get_trace_state_variable_value (arg0, arg1); - gdb_printf (gdb_stdlog, "<- %s->get_trace_state_variable_value (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_int (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_LONGEST_p (arg1), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->get_trace_state_variable_value (%s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_int (arg0).c_str (), + target_debug_print_LONGEST_p (arg1).c_str (), + target_debug_print_bool (result).c_str ()); return result; } @@ -3364,11 +3335,11 @@ debug_target::save_trace_data (const char *arg0) gdb_printf (gdb_stdlog, "-> %s->save_trace_data (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->save_trace_data (arg0); - gdb_printf (gdb_stdlog, "<- %s->save_trace_data (", this->beneath ()->shortname ()); - 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); + gdb_printf (gdb_stdlog, + "<- %s->save_trace_data (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_const_char_p (arg0).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -3390,11 +3361,11 @@ debug_target::upload_tracepoints (struct uploaded_tp **arg0) gdb_printf (gdb_stdlog, "-> %s->upload_tracepoints (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->upload_tracepoints (arg0); - gdb_printf (gdb_stdlog, "<- %s->upload_tracepoints (", this->beneath ()->shortname ()); - 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); + gdb_printf (gdb_stdlog, + "<- %s->upload_tracepoints (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_uploaded_tp_pp (arg0).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -3416,11 +3387,11 @@ debug_target::upload_trace_state_variables (struct uploaded_tsv **arg0) gdb_printf (gdb_stdlog, "-> %s->upload_trace_state_variables (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->upload_trace_state_variables (arg0); - gdb_printf (gdb_stdlog, "<- %s->upload_trace_state_variables (", this->beneath ()->shortname ()); - 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); + gdb_printf (gdb_stdlog, + "<- %s->upload_trace_state_variables (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_uploaded_tsv_pp (arg0).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -3442,15 +3413,13 @@ debug_target::get_raw_trace_data (gdb_byte *arg0, ULONGEST arg1, LONGEST arg2) gdb_printf (gdb_stdlog, "-> %s->get_raw_trace_data (...)\n", this->beneath ()->shortname ()); LONGEST result = this->beneath ()->get_raw_trace_data (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, "<- %s->get_raw_trace_data (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_gdb_byte_p (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_ULONGEST (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_LONGEST (arg2), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_LONGEST (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->get_raw_trace_data (%s, %s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_gdb_byte_p (arg0).c_str (), + target_debug_print_ULONGEST (arg1).c_str (), + target_debug_print_LONGEST (arg2).c_str (), + target_debug_print_LONGEST (result).c_str ()); return result; } @@ -3472,10 +3441,10 @@ debug_target::get_min_fast_tracepoint_insn_len () gdb_printf (gdb_stdlog, "-> %s->get_min_fast_tracepoint_insn_len (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->get_min_fast_tracepoint_insn_len (); - gdb_printf (gdb_stdlog, "<- %s->get_min_fast_tracepoint_insn_len (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_int (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->get_min_fast_tracepoint_insn_len () = %s\n", + this->beneath ()->shortname (), + target_debug_print_int (result).c_str ()); return result; } @@ -3495,9 +3464,10 @@ 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 ()); - gdb_puts (target_debug_print_int (arg0), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->set_disconnected_tracing (%s)\n", + this->beneath ()->shortname (), + target_debug_print_int (arg0).c_str ()); } void @@ -3516,9 +3486,10 @@ 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 ()); - gdb_puts (target_debug_print_int (arg0), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->set_circular_trace_buffer (%s)\n", + this->beneath ()->shortname (), + target_debug_print_int (arg0).c_str ()); } void @@ -3537,9 +3508,10 @@ 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 ()); - gdb_puts (target_debug_print_LONGEST (arg0), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->set_trace_buffer_size (%s)\n", + this->beneath ()->shortname (), + target_debug_print_LONGEST (arg0).c_str ()); } bool @@ -3560,15 +3532,13 @@ debug_target::set_trace_notes (const char *arg0, const char *arg1, const char *a gdb_printf (gdb_stdlog, "-> %s->set_trace_notes (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->set_trace_notes (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, "<- %s->set_trace_notes (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_const_char_p (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_const_char_p (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - 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); + gdb_printf (gdb_stdlog, + "<- %s->set_trace_notes (%s, %s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_const_char_p (arg0).c_str (), + target_debug_print_const_char_p (arg1).c_str (), + target_debug_print_const_char_p (arg2).c_str (), + target_debug_print_bool (result).c_str ()); return result; } @@ -3590,11 +3560,11 @@ debug_target::core_of_thread (ptid_t arg0) gdb_printf (gdb_stdlog, "-> %s->core_of_thread (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->core_of_thread (arg0); - gdb_printf (gdb_stdlog, "<- %s->core_of_thread (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_int (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->core_of_thread (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_ptid_t (arg0).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -3616,15 +3586,13 @@ debug_target::verify_memory (const gdb_byte *arg0, CORE_ADDR arg1, ULONGEST arg2 gdb_printf (gdb_stdlog, "-> %s->verify_memory (...)\n", this->beneath ()->shortname ()); int result = this->beneath ()->verify_memory (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, "<- %s->verify_memory (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_const_gdb_byte_p (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_CORE_ADDR (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_ULONGEST (arg2), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_int (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->verify_memory (%s, %s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_const_gdb_byte_p (arg0).c_str (), + target_debug_print_CORE_ADDR (arg1).c_str (), + target_debug_print_ULONGEST (arg2).c_str (), + target_debug_print_int (result).c_str ()); return result; } @@ -3646,13 +3614,12 @@ debug_target::get_tib_address (ptid_t arg0, CORE_ADDR *arg1) gdb_printf (gdb_stdlog, "-> %s->get_tib_address (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->get_tib_address (arg0, arg1); - gdb_printf (gdb_stdlog, "<- %s->get_tib_address (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - 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); + gdb_printf (gdb_stdlog, + "<- %s->get_tib_address (%s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_ptid_t (arg0).c_str (), + target_debug_print_CORE_ADDR_p (arg1).c_str (), + target_debug_print_bool (result).c_str ()); return result; } @@ -3672,8 +3639,9 @@ debug_target::set_permissions () { gdb_printf (gdb_stdlog, "-> %s->set_permissions (...)\n", this->beneath ()->shortname ()); this->beneath ()->set_permissions (); - gdb_printf (gdb_stdlog, "<- %s->set_permissions (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->set_permissions ()\n", + this->beneath ()->shortname ()); } bool @@ -3694,13 +3662,12 @@ debug_target::static_tracepoint_marker_at (CORE_ADDR arg0, static_tracepoint_mar gdb_printf (gdb_stdlog, "-> %s->static_tracepoint_marker_at (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->static_tracepoint_marker_at (arg0, arg1); - gdb_printf (gdb_stdlog, "<- %s->static_tracepoint_marker_at (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - 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); + gdb_printf (gdb_stdlog, + "<- %s->static_tracepoint_marker_at (%s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_CORE_ADDR (arg0).c_str (), + target_debug_print_static_tracepoint_marker_p (arg1).c_str (), + target_debug_print_bool (result).c_str ()); return result; } @@ -3722,11 +3689,11 @@ debug_target::static_tracepoint_markers_by_strid (const char *arg0) gdb_printf (gdb_stdlog, "-> %s->static_tracepoint_markers_by_strid (...)\n", this->beneath ()->shortname ()); std::vector result = this->beneath ()->static_tracepoint_markers_by_strid (arg0); - gdb_printf (gdb_stdlog, "<- %s->static_tracepoint_markers_by_strid (", this->beneath ()->shortname ()); - 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); + gdb_printf (gdb_stdlog, + "<- %s->static_tracepoint_markers_by_strid (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_const_char_p (arg0).c_str (), + target_debug_print_std_vector_static_tracepoint_marker (result).c_str ()); return result; } @@ -3748,10 +3715,10 @@ debug_target::traceframe_info () gdb_printf (gdb_stdlog, "-> %s->traceframe_info (...)\n", this->beneath ()->shortname ()); traceframe_info_up result = this->beneath ()->traceframe_info (); - gdb_printf (gdb_stdlog, "<- %s->traceframe_info (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_traceframe_info_up (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->traceframe_info () = %s\n", + this->beneath ()->shortname (), + target_debug_print_traceframe_info_up (result).c_str ()); return result; } @@ -3773,11 +3740,11 @@ debug_target::use_agent (bool arg0) gdb_printf (gdb_stdlog, "-> %s->use_agent (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->use_agent (arg0); - gdb_printf (gdb_stdlog, "<- %s->use_agent (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_bool (arg0), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->use_agent (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (arg0).c_str (), + target_debug_print_bool (result).c_str ()); return result; } @@ -3799,10 +3766,10 @@ debug_target::can_use_agent () gdb_printf (gdb_stdlog, "-> %s->can_use_agent (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->can_use_agent (); - gdb_printf (gdb_stdlog, "<- %s->can_use_agent (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->can_use_agent () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -3824,13 +3791,12 @@ debug_target::enable_btrace (thread_info *arg0, const struct btrace_config *arg1 gdb_printf (gdb_stdlog, "-> %s->enable_btrace (...)\n", this->beneath ()->shortname ()); struct btrace_target_info * result = this->beneath ()->enable_btrace (arg0, arg1); - gdb_printf (gdb_stdlog, "<- %s->enable_btrace (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_thread_info_p (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - 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); + gdb_printf (gdb_stdlog, + "<- %s->enable_btrace (%s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_thread_info_p (arg0).c_str (), + target_debug_print_const_btrace_config_p (arg1).c_str (), + target_debug_print_btrace_target_info_p (result).c_str ()); return result; } @@ -3851,9 +3817,10 @@ 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 ()); - gdb_puts (target_debug_print_btrace_target_info_p (arg0), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->disable_btrace (%s)\n", + this->beneath ()->shortname (), + target_debug_print_btrace_target_info_p (arg0).c_str ()); } void @@ -3873,9 +3840,10 @@ 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 ()); - gdb_puts (target_debug_print_btrace_target_info_p (arg0), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->teardown_btrace (%s)\n", + this->beneath ()->shortname (), + target_debug_print_btrace_target_info_p (arg0).c_str ()); } enum btrace_error @@ -3896,15 +3864,13 @@ debug_target::read_btrace (struct btrace_data *arg0, struct btrace_target_info * gdb_printf (gdb_stdlog, "-> %s->read_btrace (...)\n", this->beneath ()->shortname ()); enum btrace_error result = this->beneath ()->read_btrace (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, "<- %s->read_btrace (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_btrace_data_p (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_btrace_target_info_p (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - 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); + gdb_printf (gdb_stdlog, + "<- %s->read_btrace (%s, %s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_btrace_data_p (arg0).c_str (), + target_debug_print_btrace_target_info_p (arg1).c_str (), + target_debug_print_btrace_read_type (arg2).c_str (), + target_debug_print_btrace_error (result).c_str ()); return result; } @@ -3926,11 +3892,11 @@ debug_target::btrace_conf (const struct btrace_target_info *arg0) gdb_printf (gdb_stdlog, "-> %s->btrace_conf (...)\n", this->beneath ()->shortname ()); const struct btrace_config * result = this->beneath ()->btrace_conf (arg0); - gdb_printf (gdb_stdlog, "<- %s->btrace_conf (", this->beneath ()->shortname ()); - 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); + gdb_printf (gdb_stdlog, + "<- %s->btrace_conf (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_const_btrace_target_info_p (arg0).c_str (), + target_debug_print_const_btrace_config_p (result).c_str ()); return result; } @@ -3952,11 +3918,11 @@ debug_target::record_method (ptid_t arg0) gdb_printf (gdb_stdlog, "-> %s->record_method (...)\n", this->beneath ()->shortname ()); enum record_method result = this->beneath ()->record_method (arg0); - gdb_printf (gdb_stdlog, "<- %s->record_method (", this->beneath ()->shortname ()); - 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); + gdb_printf (gdb_stdlog, + "<- %s->record_method (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_ptid_t (arg0).c_str (), + target_debug_print_record_method (result).c_str ()); return result; } @@ -3976,8 +3942,9 @@ debug_target::stop_recording () { gdb_printf (gdb_stdlog, "-> %s->stop_recording (...)\n", this->beneath ()->shortname ()); this->beneath ()->stop_recording (); - gdb_printf (gdb_stdlog, "<- %s->stop_recording (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->stop_recording ()\n", + this->beneath ()->shortname ()); } void @@ -3996,8 +3963,9 @@ debug_target::info_record () { gdb_printf (gdb_stdlog, "-> %s->info_record (...)\n", this->beneath ()->shortname ()); this->beneath ()->info_record (); - gdb_printf (gdb_stdlog, "<- %s->info_record (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->info_record ()\n", + this->beneath ()->shortname ()); } void @@ -4017,9 +3985,10 @@ 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 ()); - gdb_puts (target_debug_print_const_char_p (arg0), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->save_record (%s)\n", + this->beneath ()->shortname (), + target_debug_print_const_char_p (arg0).c_str ()); } bool @@ -4040,10 +4009,10 @@ debug_target::supports_delete_record () gdb_printf (gdb_stdlog, "-> %s->supports_delete_record (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_delete_record (); - gdb_printf (gdb_stdlog, "<- %s->supports_delete_record (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->supports_delete_record () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -4064,8 +4033,9 @@ debug_target::delete_record () { gdb_printf (gdb_stdlog, "-> %s->delete_record (...)\n", this->beneath ()->shortname ()); this->beneath ()->delete_record (); - gdb_printf (gdb_stdlog, "<- %s->delete_record (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->delete_record ()\n", + this->beneath ()->shortname ()); } bool @@ -4086,11 +4056,11 @@ debug_target::record_is_replaying (ptid_t arg0) gdb_printf (gdb_stdlog, "-> %s->record_is_replaying (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->record_is_replaying (arg0); - gdb_printf (gdb_stdlog, "<- %s->record_is_replaying (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->record_is_replaying (%s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_ptid_t (arg0).c_str (), + target_debug_print_bool (result).c_str ()); return result; } @@ -4112,13 +4082,12 @@ debug_target::record_will_replay (ptid_t arg0, int arg1) gdb_printf (gdb_stdlog, "-> %s->record_will_replay (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->record_will_replay (arg0, arg1); - gdb_printf (gdb_stdlog, "<- %s->record_will_replay (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_ptid_t (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int (arg1), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->record_will_replay (%s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_ptid_t (arg0).c_str (), + target_debug_print_int (arg1).c_str (), + target_debug_print_bool (result).c_str ()); return result; } @@ -4138,8 +4107,9 @@ debug_target::record_stop_replaying () { gdb_printf (gdb_stdlog, "-> %s->record_stop_replaying (...)\n", this->beneath ()->shortname ()); this->beneath ()->record_stop_replaying (); - gdb_printf (gdb_stdlog, "<- %s->record_stop_replaying (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->record_stop_replaying ()\n", + this->beneath ()->shortname ()); } void @@ -4159,8 +4129,9 @@ debug_target::goto_record_begin () { gdb_printf (gdb_stdlog, "-> %s->goto_record_begin (...)\n", this->beneath ()->shortname ()); this->beneath ()->goto_record_begin (); - gdb_printf (gdb_stdlog, "<- %s->goto_record_begin (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->goto_record_begin ()\n", + this->beneath ()->shortname ()); } void @@ -4180,8 +4151,9 @@ debug_target::goto_record_end () { gdb_printf (gdb_stdlog, "-> %s->goto_record_end (...)\n", this->beneath ()->shortname ()); this->beneath ()->goto_record_end (); - gdb_printf (gdb_stdlog, "<- %s->goto_record_end (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->goto_record_end ()\n", + this->beneath ()->shortname ()); } void @@ -4201,9 +4173,10 @@ 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 ()); - gdb_puts (target_debug_print_ULONGEST (arg0), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->goto_record (%s)\n", + this->beneath ()->shortname (), + target_debug_print_ULONGEST (arg0).c_str ()); } void @@ -4223,11 +4196,11 @@ 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 ()); - gdb_puts (target_debug_print_int (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_gdb_disassembly_flags (arg1), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->insn_history (%s, %s)\n", + this->beneath ()->shortname (), + target_debug_print_int (arg0).c_str (), + target_debug_print_gdb_disassembly_flags (arg1).c_str ()); } void @@ -4247,13 +4220,12 @@ 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 ()); - gdb_puts (target_debug_print_ULONGEST (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_gdb_disassembly_flags (arg2), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->insn_history_from (%s, %s, %s)\n", + this->beneath ()->shortname (), + target_debug_print_ULONGEST (arg0).c_str (), + target_debug_print_int (arg1).c_str (), + target_debug_print_gdb_disassembly_flags (arg2).c_str ()); } void @@ -4273,13 +4245,12 @@ 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 ()); - gdb_puts (target_debug_print_ULONGEST (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_ULONGEST (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_gdb_disassembly_flags (arg2), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->insn_history_range (%s, %s, %s)\n", + this->beneath ()->shortname (), + target_debug_print_ULONGEST (arg0).c_str (), + target_debug_print_ULONGEST (arg1).c_str (), + target_debug_print_gdb_disassembly_flags (arg2).c_str ()); } void @@ -4299,11 +4270,11 @@ 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 ()); - gdb_puts (target_debug_print_int (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_record_print_flags (arg1), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->call_history (%s, %s)\n", + this->beneath ()->shortname (), + target_debug_print_int (arg0).c_str (), + target_debug_print_record_print_flags (arg1).c_str ()); } void @@ -4323,13 +4294,12 @@ 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 ()); - gdb_puts (target_debug_print_ULONGEST (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_record_print_flags (arg2), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->call_history_from (%s, %s, %s)\n", + this->beneath ()->shortname (), + target_debug_print_ULONGEST (arg0).c_str (), + target_debug_print_int (arg1).c_str (), + target_debug_print_record_print_flags (arg2).c_str ()); } void @@ -4349,13 +4319,12 @@ 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 ()); - gdb_puts (target_debug_print_ULONGEST (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_ULONGEST (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_record_print_flags (arg2), gdb_stdlog); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->call_history_range (%s, %s, %s)\n", + this->beneath ()->shortname (), + target_debug_print_ULONGEST (arg0).c_str (), + target_debug_print_ULONGEST (arg1).c_str (), + target_debug_print_record_print_flags (arg2).c_str ()); } bool @@ -4376,10 +4345,10 @@ debug_target::augmented_libraries_svr4_read () gdb_printf (gdb_stdlog, "-> %s->augmented_libraries_svr4_read (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->augmented_libraries_svr4_read (); - gdb_printf (gdb_stdlog, "<- %s->augmented_libraries_svr4_read (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->augmented_libraries_svr4_read () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -4401,10 +4370,10 @@ debug_target::get_unwinder () gdb_printf (gdb_stdlog, "-> %s->get_unwinder (...)\n", this->beneath ()->shortname ()); const struct frame_unwind * result = this->beneath ()->get_unwinder (); - gdb_printf (gdb_stdlog, "<- %s->get_unwinder (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_const_frame_unwind_p (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->get_unwinder () = %s\n", + this->beneath ()->shortname (), + target_debug_print_const_frame_unwind_p (result).c_str ()); return result; } @@ -4426,10 +4395,10 @@ debug_target::get_tailcall_unwinder () gdb_printf (gdb_stdlog, "-> %s->get_tailcall_unwinder (...)\n", this->beneath ()->shortname ()); const struct frame_unwind * result = this->beneath ()->get_tailcall_unwinder (); - gdb_printf (gdb_stdlog, "<- %s->get_tailcall_unwinder (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_const_frame_unwind_p (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->get_tailcall_unwinder () = %s\n", + this->beneath ()->shortname (), + target_debug_print_const_frame_unwind_p (result).c_str ()); return result; } @@ -4449,8 +4418,9 @@ debug_target::prepare_to_generate_core () { gdb_printf (gdb_stdlog, "-> %s->prepare_to_generate_core (...)\n", this->beneath ()->shortname ()); this->beneath ()->prepare_to_generate_core (); - gdb_printf (gdb_stdlog, "<- %s->prepare_to_generate_core (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->prepare_to_generate_core ()\n", + this->beneath ()->shortname ()); } void @@ -4469,8 +4439,9 @@ debug_target::done_generating_core () { gdb_printf (gdb_stdlog, "-> %s->done_generating_core (...)\n", this->beneath ()->shortname ()); this->beneath ()->done_generating_core (); - gdb_printf (gdb_stdlog, "<- %s->done_generating_core (", this->beneath ()->shortname ()); - gdb_puts (")\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->done_generating_core ()\n", + this->beneath ()->shortname ()); } bool @@ -4491,10 +4462,10 @@ debug_target::supports_memory_tagging () gdb_printf (gdb_stdlog, "-> %s->supports_memory_tagging (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_memory_tagging (); - gdb_printf (gdb_stdlog, "<- %s->supports_memory_tagging (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->supports_memory_tagging () = %s\n", + this->beneath ()->shortname (), + target_debug_print_bool (result).c_str ()); return result; } @@ -4516,17 +4487,14 @@ debug_target::fetch_memtags (CORE_ADDR arg0, size_t arg1, gdb::byte_vector &arg2 gdb_printf (gdb_stdlog, "-> %s->fetch_memtags (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->fetch_memtags (arg0, arg1, arg2, arg3); - gdb_printf (gdb_stdlog, "<- %s->fetch_memtags (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_size_t (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_gdb_byte_vector_r (arg2), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int (arg3), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->fetch_memtags (%s, %s, %s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_CORE_ADDR (arg0).c_str (), + target_debug_print_size_t (arg1).c_str (), + target_debug_print_gdb_byte_vector_r (arg2).c_str (), + target_debug_print_int (arg3).c_str (), + target_debug_print_bool (result).c_str ()); return result; } @@ -4548,17 +4516,14 @@ debug_target::store_memtags (CORE_ADDR arg0, size_t arg1, const gdb::byte_vector gdb_printf (gdb_stdlog, "-> %s->store_memtags (...)\n", this->beneath ()->shortname ()); bool result = this->beneath ()->store_memtags (arg0, arg1, arg2, arg3); - gdb_printf (gdb_stdlog, "<- %s->store_memtags (", this->beneath ()->shortname ()); - gdb_puts (target_debug_print_CORE_ADDR (arg0), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_size_t (arg1), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_const_gdb_byte_vector_r (arg2), gdb_stdlog); - gdb_puts (", ", gdb_stdlog); - gdb_puts (target_debug_print_int (arg3), gdb_stdlog); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_bool (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->store_memtags (%s, %s, %s, %s) = %s\n", + this->beneath ()->shortname (), + target_debug_print_CORE_ADDR (arg0).c_str (), + target_debug_print_size_t (arg1).c_str (), + target_debug_print_const_gdb_byte_vector_r (arg2).c_str (), + target_debug_print_int (arg3).c_str (), + target_debug_print_bool (result).c_str ()); return result; } @@ -4580,9 +4545,9 @@ debug_target::fetch_x86_xsave_layout () gdb_printf (gdb_stdlog, "-> %s->fetch_x86_xsave_layout (...)\n", this->beneath ()->shortname ()); x86_xsave_layout result = this->beneath ()->fetch_x86_xsave_layout (); - gdb_printf (gdb_stdlog, "<- %s->fetch_x86_xsave_layout (", this->beneath ()->shortname ()); - gdb_puts (") = ", gdb_stdlog); - target_debug_print_x86_xsave_layout (result); - gdb_puts ("\n", gdb_stdlog); + gdb_printf (gdb_stdlog, + "<- %s->fetch_x86_xsave_layout () = %s\n", + this->beneath ()->shortname (), + target_debug_print_x86_xsave_layout (result).c_str ()); return result; } From patchwork Wed Apr 17 20:54:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 88623 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 17A9A384AB66 for ; Wed, 17 Apr 2024 21:01:45 +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 46C67385841E for ; Wed, 17 Apr 2024 21:01:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 46C67385841E 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 46C67385841E 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=1713387677; cv=none; b=dDSi7MrbZ686NDCbz9cpxSd6+lr+tWjoLUPPZJg/sCVkjzFXHYPRr4CTdQ0Y4MB/MxaQEGM65FzpbIUjtvemFLVx5Ob4M1xnUHjDYhhSSIGOM1cWkL/1/PpkTqsnD4+VKYuTo+BZCtgQ7F1/fGr1YPBOGfK56Hu+oSndHFzxHEU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713387677; c=relaxed/simple; bh=Ofbsy1VyS+KKgCP+ijrCj2tdU1OyQl0elQ4jrS0mIU0=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=sK3a2VW1VYkIQIjP6fp9gAvSBJbs/LmXtSOJc4fypQZfBd68A0CapA5UmiK+4k7kA0rj48JhSzK7Gr5YhUDf2JxnLWyKYku5BR4LZhFHaD1seLqBfiqWuB3m0QW59wXgsf9CrCCQeSZ5Zn5+2NIycWS+QHGJNecGh8mjIdW7+zk= 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 43HL18BY039545 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Apr 2024 17:01:13 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 43HL18BY039545 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1713387674; bh=ygtjB4ZW5KcmfIbkTcX9TDYKvoYkRDKvlZI52g66OdU=; h=From:To:Cc:Subject:Date:In-Reply-To:From; b=mN4I+4lOLES0clrJKaZSKl6TeLvtD3YzTyr2N9VJRFGMgvwXPvu/Rx5O0rKeNV2tg etK0e6E9v/0FrGbnjAPCT/X0hSEFY7NcenSe+0B9+1lbdRm0BnCAYrYG64HuJfcOCf 4RE5fhhd6T5tykZJfftjq8Gk60NNCw2yXcmCC7zA= 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 A8E631E0CE; Wed, 17 Apr 2024 16:54:28 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 5/6] gdb: make regcache::debug_print_register return a string Date: Wed, 17 Apr 2024 16:54:10 -0400 Message-ID: <20240417205426.2030615-5-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 21:01:08 +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 This makes it easier to introduce `target_debug_printf` in a subsequent patch. Change-Id: I5bb2d49476d17940d503e66f40762e3f1e3baabc --- gdb/regcache.c | 28 +++++++++++++++------------- gdb/regcache.h | 5 ++--- gdb/target.c | 8 ++++---- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/gdb/regcache.c b/gdb/regcache.c index b7abbe99f3cc..e673d56a7e94 100644 --- a/gdb/regcache.c +++ b/gdb/regcache.c @@ -1463,36 +1463,38 @@ reg_buffer::num_raw_registers () const return gdbarch_num_regs (arch ()); } -void -regcache::debug_print_register (const char *func, int regno) +std::string +regcache::debug_print_register (int regno) { struct gdbarch *gdbarch = arch (); + std::string s; - gdb_printf (gdb_stdlog, "%s ", func); if (regno >= 0 && regno < gdbarch_num_regs (gdbarch) && gdbarch_register_name (gdbarch, regno)[0] != '\0') - gdb_printf (gdb_stdlog, "(%s)", - gdbarch_register_name (gdbarch, regno)); + string_appendf (s, "register %s:", gdbarch_register_name (gdbarch, regno)); else - gdb_printf (gdb_stdlog, "(%d)", regno); + string_appendf (s, "register %d:", regno); + if (regno >= 0 && regno < gdbarch_num_regs (gdbarch)) { - enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); gdb::array_view buf = register_buffer (regno); - gdb_printf (gdb_stdlog, " = "); + string_appendf (s, " = "); + for (gdb_byte byte : buf) - gdb_printf (gdb_stdlog, "%02x", byte); + string_appendf (s, "%02x", byte); if (buf.size () <= sizeof (LONGEST)) { - ULONGEST val = extract_unsigned_integer (buf, byte_order); + ULONGEST val + = extract_unsigned_integer (buf, gdbarch_byte_order (gdbarch)); - gdb_printf (gdb_stdlog, " %s %s", - core_addr_to_string_nz (val), plongest (val)); + string_appendf (s, " %s %s", + core_addr_to_string_nz (val), plongest (val)); } } - gdb_printf (gdb_stdlog, "\n"); + + return s; } /* Implement 'maint flush register-cache' command. */ diff --git a/gdb/regcache.h b/gdb/regcache.h index 9ba6c79ab0d5..3c621045c163 100644 --- a/gdb/regcache.h +++ b/gdb/regcache.h @@ -454,9 +454,8 @@ class regcache : public detached_regcache this->m_ptid = ptid; } -/* Dump the contents of a register from the register cache to the target - debug. */ - void debug_print_register (const char *func, int regno); + /* Return a dump of the contents of a register, suitable for debug output. */ + std::string debug_print_register (int regno); protected: regcache (inferior *inf_for_target_calls, gdbarch *gdbarch); diff --git a/gdb/target.c b/gdb/target.c index 107a84b3ca1d..cdaaf253cbcd 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -3889,7 +3889,8 @@ target_fetch_registers (struct regcache *regcache, int regno) { current_inferior ()->top_target ()->fetch_registers (regcache, regno); if (targetdebug) - regcache->debug_print_register ("target_fetch_registers", regno); + gdb_printf (gdb_stdlog, "target_fetch_registers: %s", + regcache->debug_print_register (regno).c_str ()); } void @@ -3900,9 +3901,8 @@ target_store_registers (struct regcache *regcache, int regno) current_inferior ()->top_target ()->store_registers (regcache, regno); if (targetdebug) - { - regcache->debug_print_register ("target_store_registers", regno); - } + gdb_printf (gdb_stdlog, "target_store_registers: %s", + regcache->debug_print_register (regno).c_str ()); } int From patchwork Wed Apr 17 20:54:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 88624 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 4E0ED385840F for ; Wed, 17 Apr 2024 21:02:00 +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 6E0503858C78 for ; Wed, 17 Apr 2024 21:01:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6E0503858C78 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 6E0503858C78 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=1713387684; cv=none; b=sNjZX/ZxqJpkxugVvSVJ0A/Qw6kXWbSt3R7EF8ii0fvsGE0GGS/RlMSCQ+AYBHFwvhtwHBaSIaPLriAUgSCTfFI/L21hnSku3PxJX5ZNg6x8q8QZlY7uG/xOnlBtnTaCJlcNAt1m6yV02faL1XBvBEvvbCndDXVQKV7PJ87jz8U= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713387684; c=relaxed/simple; bh=6zKWuzHcZAFvVB1F8x4JfcIg36LSoye0ui24ZfuRwNc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=TrzOo/j4H3F7AgTgFPpja3+V1nJumo00cz7vq71hoFisWGHnq+wqlrVbq+vdNVSK4CFIC4j7CGkMod2D1yDLdqj11bktGw5JeQMQIDlQ1XDqXmNIKPaa+fJsdhB70Df1kDtL4GofOMCmb0+bf8cW92WYOxV0cNvsE6K4hMHEvMw= 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 43HL18im039544 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Apr 2024 17:01:13 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 43HL18im039544 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1713387674; bh=wv4iUJZTlisr9mMujBE2/oqbJoFa+v7vvzv3ZTiZJPY=; h=From:To:Cc:Subject:Date:In-Reply-To:From; b=Vw3eldT9EZ0nqn0GbmRhSExRnlNyqfjnZ1imhXCpRJ9xWehnEQvkv/771+ILft7C0 iPCDybxA6IhqGePNe1Zr8aIgT4xtwpPfPVd5W7QrPKmQcTZNyEFnJq97qBDOx8xUIz n/egVVzzHFjLoImfZl4Jw2kKymWWgc0gJeMFr3VY= 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 0AEFA1E0D2; Wed, 17 Apr 2024 16:54:28 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 6/6] gdb: add target_debug_printf and target_debug_printf_nofunc Date: Wed, 17 Apr 2024 16:54:11 -0400 Message-ID: <20240417205426.2030615-6-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 21:01:08 +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 Add the `target_debug_printf` and `target_debug_printf_nofunc` macros and use them when outputting debug messages depending on `targetdebug`. I opted for `target_debug_printf_nofunc` to follow the current style where the function name is already printed, along with the arguments. Modify the debug printfs in the `debug_target` methods (generated by `make-target-delegates.py`) to use `target_debug_printf_nofunc` as well. This makes the "target" debug prints integrate nicely with the other debug prints that use the "new" debug print system: [infrun] proceed: enter [infrun] follow_fork: enter [target] -> multi-thread->record_will_replay (...) [target] <- multi-thread->record_will_replay (-1, 0) = false [target] -> multi-thread->supports_multi_process (...) [target] <- multi-thread->supports_multi_process () = true [infrun] follow_fork: exit ... Change-Id: Ide3c8c1b8a30e6d4c353a29cba911c7192de29ac --- gdb/make-target-delegates.py | 11 +- gdb/target-delegates.c | 840 ++++++++++++++--------------------- gdb/target.c | 129 +++--- 3 files changed, 390 insertions(+), 590 deletions(-) diff --git a/gdb/make-target-delegates.py b/gdb/make-target-delegates.py index f6f2bf004ff5..bfcf7faab7ae 100755 --- a/gdb/make-target-delegates.py +++ b/gdb/make-target-delegates.py @@ -274,9 +274,7 @@ def write_debugmethod( debugname = "debug_target::" + name names = write_function_header(f, False, debugname, return_type, argtypes) print( - ' gdb_printf (gdb_stdlog, "-> %s->' - + name - + ' (...)\\n", this->beneath ()->shortname ());', + f' target_debug_printf_nofunc ("-> %s->{name} (...)", this->beneath ()->shortname ());', file=f, ) @@ -311,11 +309,8 @@ def write_debugmethod( ret = "" print( - ( - " gdb_printf (gdb_stdlog,\n" - '\t "<- %s->{name} ({args_fmt}){ret_fmt}\\n",\n' - "\t this->beneath ()->shortname (){args}{ret});" - ).format(name=name, args_fmt=args_fmt, args=args, ret_fmt=ret_fmt, ret=ret), + f' target_debug_printf_nofunc ("<- %s->{name} ({args_fmt}){ret_fmt}",\n' + f"\t this->beneath ()->shortname (){args}{ret});", file=f, ) diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index f4f88a952157..b8ce24108f5c 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -390,10 +390,9 @@ dummy_target::post_attach (int arg0) void debug_target::post_attach (int arg0) { - gdb_printf (gdb_stdlog, "-> %s->post_attach (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->post_attach (...)", this->beneath ()->shortname ()); this->beneath ()->post_attach (arg0); - gdb_printf (gdb_stdlog, - "<- %s->post_attach (%s)\n", + target_debug_printf_nofunc ("<- %s->post_attach (%s)", this->beneath ()->shortname (), target_debug_print_int (arg0).c_str ()); } @@ -412,10 +411,9 @@ dummy_target::detach (inferior *arg0, int arg1) void debug_target::detach (inferior *arg0, int arg1) { - gdb_printf (gdb_stdlog, "-> %s->detach (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->detach (...)", this->beneath ()->shortname ()); this->beneath ()->detach (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->detach (%s, %s)\n", + target_debug_printf_nofunc ("<- %s->detach (%s, %s)", this->beneath ()->shortname (), target_debug_print_inferior_p (arg0).c_str (), target_debug_print_int (arg1).c_str ()); @@ -436,10 +434,9 @@ dummy_target::disconnect (const char *arg0, int arg1) void debug_target::disconnect (const char *arg0, int arg1) { - gdb_printf (gdb_stdlog, "-> %s->disconnect (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->disconnect (...)", this->beneath ()->shortname ()); this->beneath ()->disconnect (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->disconnect (%s, %s)\n", + target_debug_printf_nofunc ("<- %s->disconnect (%s, %s)", this->beneath ()->shortname (), target_debug_print_const_char_p (arg0).c_str (), target_debug_print_int (arg1).c_str ()); @@ -460,10 +457,9 @@ dummy_target::resume (ptid_t arg0, int arg1, enum gdb_signal arg2) void debug_target::resume (ptid_t arg0, int arg1, enum gdb_signal arg2) { - gdb_printf (gdb_stdlog, "-> %s->resume (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->resume (...)", this->beneath ()->shortname ()); this->beneath ()->resume (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, - "<- %s->resume (%s, %s, %s)\n", + target_debug_printf_nofunc ("<- %s->resume (%s, %s, %s)", this->beneath ()->shortname (), target_debug_print_ptid_t (arg0).c_str (), target_debug_print_step (arg1).c_str (), @@ -484,10 +480,9 @@ dummy_target::commit_resumed () void debug_target::commit_resumed () { - gdb_printf (gdb_stdlog, "-> %s->commit_resumed (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->commit_resumed (...)", this->beneath ()->shortname ()); this->beneath ()->commit_resumed (); - gdb_printf (gdb_stdlog, - "<- %s->commit_resumed ()\n", + target_debug_printf_nofunc ("<- %s->commit_resumed ()", this->beneath ()->shortname ()); } @@ -506,11 +501,10 @@ dummy_target::wait (ptid_t arg0, struct target_waitstatus *arg1, target_wait_fla ptid_t debug_target::wait (ptid_t arg0, struct target_waitstatus *arg1, target_wait_flags arg2) { - gdb_printf (gdb_stdlog, "-> %s->wait (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->wait (...)", this->beneath ()->shortname ()); ptid_t result = this->beneath ()->wait (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, - "<- %s->wait (%s, %s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->wait (%s, %s, %s) = %s", this->beneath ()->shortname (), target_debug_print_ptid_t (arg0).c_str (), target_debug_print_target_waitstatus_p (arg1).c_str (), @@ -533,10 +527,9 @@ dummy_target::fetch_registers (struct regcache *arg0, int arg1) void debug_target::fetch_registers (struct regcache *arg0, int arg1) { - gdb_printf (gdb_stdlog, "-> %s->fetch_registers (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->fetch_registers (...)", this->beneath ()->shortname ()); this->beneath ()->fetch_registers (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->fetch_registers (%s, %s)\n", + target_debug_printf_nofunc ("<- %s->fetch_registers (%s, %s)", this->beneath ()->shortname (), target_debug_print_regcache_p (arg0).c_str (), target_debug_print_int (arg1).c_str ()); @@ -557,10 +550,9 @@ dummy_target::store_registers (struct regcache *arg0, int arg1) void debug_target::store_registers (struct regcache *arg0, int arg1) { - gdb_printf (gdb_stdlog, "-> %s->store_registers (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->store_registers (...)", this->beneath ()->shortname ()); this->beneath ()->store_registers (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->store_registers (%s, %s)\n", + target_debug_printf_nofunc ("<- %s->store_registers (%s, %s)", this->beneath ()->shortname (), target_debug_print_regcache_p (arg0).c_str (), target_debug_print_int (arg1).c_str ()); @@ -581,10 +573,9 @@ dummy_target::prepare_to_store (struct regcache *arg0) void debug_target::prepare_to_store (struct regcache *arg0) { - gdb_printf (gdb_stdlog, "-> %s->prepare_to_store (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->prepare_to_store (...)", this->beneath ()->shortname ()); this->beneath ()->prepare_to_store (arg0); - gdb_printf (gdb_stdlog, - "<- %s->prepare_to_store (%s)\n", + target_debug_printf_nofunc ("<- %s->prepare_to_store (%s)", this->beneath ()->shortname (), target_debug_print_regcache_p (arg0).c_str ()); } @@ -603,10 +594,9 @@ dummy_target::files_info () void debug_target::files_info () { - gdb_printf (gdb_stdlog, "-> %s->files_info (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->files_info (...)", this->beneath ()->shortname ()); this->beneath ()->files_info (); - gdb_printf (gdb_stdlog, - "<- %s->files_info ()\n", + target_debug_printf_nofunc ("<- %s->files_info ()", this->beneath ()->shortname ()); } @@ -625,11 +615,10 @@ dummy_target::insert_breakpoint (struct gdbarch *arg0, struct bp_target_info *ar int debug_target::insert_breakpoint (struct gdbarch *arg0, struct bp_target_info *arg1) { - gdb_printf (gdb_stdlog, "-> %s->insert_breakpoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->insert_breakpoint (...)", this->beneath ()->shortname ()); int result = this->beneath ()->insert_breakpoint (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->insert_breakpoint (%s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->insert_breakpoint (%s, %s) = %s", this->beneath ()->shortname (), target_debug_print_gdbarch_p (arg0).c_str (), target_debug_print_bp_target_info_p (arg1).c_str (), @@ -652,11 +641,10 @@ dummy_target::remove_breakpoint (struct gdbarch *arg0, struct bp_target_info *ar int debug_target::remove_breakpoint (struct gdbarch *arg0, struct bp_target_info *arg1, enum remove_bp_reason arg2) { - gdb_printf (gdb_stdlog, "-> %s->remove_breakpoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->remove_breakpoint (...)", this->beneath ()->shortname ()); int result = this->beneath ()->remove_breakpoint (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, - "<- %s->remove_breakpoint (%s, %s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->remove_breakpoint (%s, %s, %s) = %s", this->beneath ()->shortname (), target_debug_print_gdbarch_p (arg0).c_str (), target_debug_print_bp_target_info_p (arg1).c_str (), @@ -680,11 +668,10 @@ dummy_target::stopped_by_sw_breakpoint () bool debug_target::stopped_by_sw_breakpoint () { - gdb_printf (gdb_stdlog, "-> %s->stopped_by_sw_breakpoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->stopped_by_sw_breakpoint (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->stopped_by_sw_breakpoint (); - gdb_printf (gdb_stdlog, - "<- %s->stopped_by_sw_breakpoint () = %s\n", + target_debug_printf_nofunc ("<- %s->stopped_by_sw_breakpoint () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -705,11 +692,10 @@ dummy_target::supports_stopped_by_sw_breakpoint () bool debug_target::supports_stopped_by_sw_breakpoint () { - gdb_printf (gdb_stdlog, "-> %s->supports_stopped_by_sw_breakpoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->supports_stopped_by_sw_breakpoint (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_stopped_by_sw_breakpoint (); - gdb_printf (gdb_stdlog, - "<- %s->supports_stopped_by_sw_breakpoint () = %s\n", + target_debug_printf_nofunc ("<- %s->supports_stopped_by_sw_breakpoint () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -730,11 +716,10 @@ dummy_target::stopped_by_hw_breakpoint () bool debug_target::stopped_by_hw_breakpoint () { - gdb_printf (gdb_stdlog, "-> %s->stopped_by_hw_breakpoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->stopped_by_hw_breakpoint (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->stopped_by_hw_breakpoint (); - gdb_printf (gdb_stdlog, - "<- %s->stopped_by_hw_breakpoint () = %s\n", + target_debug_printf_nofunc ("<- %s->stopped_by_hw_breakpoint () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -755,11 +740,10 @@ dummy_target::supports_stopped_by_hw_breakpoint () bool debug_target::supports_stopped_by_hw_breakpoint () { - gdb_printf (gdb_stdlog, "-> %s->supports_stopped_by_hw_breakpoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->supports_stopped_by_hw_breakpoint (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_stopped_by_hw_breakpoint (); - gdb_printf (gdb_stdlog, - "<- %s->supports_stopped_by_hw_breakpoint () = %s\n", + target_debug_printf_nofunc ("<- %s->supports_stopped_by_hw_breakpoint () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -780,11 +764,10 @@ dummy_target::can_use_hw_breakpoint (enum bptype arg0, int arg1, int arg2) int debug_target::can_use_hw_breakpoint (enum bptype arg0, int arg1, int arg2) { - gdb_printf (gdb_stdlog, "-> %s->can_use_hw_breakpoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->can_use_hw_breakpoint (...)", this->beneath ()->shortname ()); int result = this->beneath ()->can_use_hw_breakpoint (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, - "<- %s->can_use_hw_breakpoint (%s, %s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->can_use_hw_breakpoint (%s, %s, %s) = %s", this->beneath ()->shortname (), target_debug_print_bptype (arg0).c_str (), target_debug_print_int (arg1).c_str (), @@ -808,11 +791,10 @@ dummy_target::ranged_break_num_registers () int debug_target::ranged_break_num_registers () { - gdb_printf (gdb_stdlog, "-> %s->ranged_break_num_registers (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->ranged_break_num_registers (...)", this->beneath ()->shortname ()); int result = this->beneath ()->ranged_break_num_registers (); - gdb_printf (gdb_stdlog, - "<- %s->ranged_break_num_registers () = %s\n", + target_debug_printf_nofunc ("<- %s->ranged_break_num_registers () = %s", this->beneath ()->shortname (), target_debug_print_int (result).c_str ()); return result; @@ -833,11 +815,10 @@ dummy_target::insert_hw_breakpoint (struct gdbarch *arg0, struct bp_target_info int debug_target::insert_hw_breakpoint (struct gdbarch *arg0, struct bp_target_info *arg1) { - gdb_printf (gdb_stdlog, "-> %s->insert_hw_breakpoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->insert_hw_breakpoint (...)", this->beneath ()->shortname ()); int result = this->beneath ()->insert_hw_breakpoint (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->insert_hw_breakpoint (%s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->insert_hw_breakpoint (%s, %s) = %s", this->beneath ()->shortname (), target_debug_print_gdbarch_p (arg0).c_str (), target_debug_print_bp_target_info_p (arg1).c_str (), @@ -860,11 +841,10 @@ dummy_target::remove_hw_breakpoint (struct gdbarch *arg0, struct bp_target_info int debug_target::remove_hw_breakpoint (struct gdbarch *arg0, struct bp_target_info *arg1) { - gdb_printf (gdb_stdlog, "-> %s->remove_hw_breakpoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->remove_hw_breakpoint (...)", this->beneath ()->shortname ()); int result = this->beneath ()->remove_hw_breakpoint (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->remove_hw_breakpoint (%s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->remove_hw_breakpoint (%s, %s) = %s", this->beneath ()->shortname (), target_debug_print_gdbarch_p (arg0).c_str (), target_debug_print_bp_target_info_p (arg1).c_str (), @@ -887,11 +867,10 @@ dummy_target::remove_watchpoint (CORE_ADDR arg0, int arg1, enum target_hw_bp_typ int debug_target::remove_watchpoint (CORE_ADDR arg0, int arg1, enum target_hw_bp_type arg2, struct expression *arg3) { - gdb_printf (gdb_stdlog, "-> %s->remove_watchpoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->remove_watchpoint (...)", this->beneath ()->shortname ()); int result = this->beneath ()->remove_watchpoint (arg0, arg1, arg2, arg3); - gdb_printf (gdb_stdlog, - "<- %s->remove_watchpoint (%s, %s, %s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->remove_watchpoint (%s, %s, %s, %s) = %s", this->beneath ()->shortname (), target_debug_print_CORE_ADDR (arg0).c_str (), target_debug_print_int (arg1).c_str (), @@ -916,11 +895,10 @@ dummy_target::insert_watchpoint (CORE_ADDR arg0, int arg1, enum target_hw_bp_typ int debug_target::insert_watchpoint (CORE_ADDR arg0, int arg1, enum target_hw_bp_type arg2, struct expression *arg3) { - gdb_printf (gdb_stdlog, "-> %s->insert_watchpoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->insert_watchpoint (...)", this->beneath ()->shortname ()); int result = this->beneath ()->insert_watchpoint (arg0, arg1, arg2, arg3); - gdb_printf (gdb_stdlog, - "<- %s->insert_watchpoint (%s, %s, %s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->insert_watchpoint (%s, %s, %s, %s) = %s", this->beneath ()->shortname (), target_debug_print_CORE_ADDR (arg0).c_str (), target_debug_print_int (arg1).c_str (), @@ -945,11 +923,10 @@ dummy_target::insert_mask_watchpoint (CORE_ADDR arg0, CORE_ADDR arg1, enum targe int debug_target::insert_mask_watchpoint (CORE_ADDR arg0, CORE_ADDR arg1, enum target_hw_bp_type arg2) { - gdb_printf (gdb_stdlog, "-> %s->insert_mask_watchpoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->insert_mask_watchpoint (...)", this->beneath ()->shortname ()); int result = this->beneath ()->insert_mask_watchpoint (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, - "<- %s->insert_mask_watchpoint (%s, %s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->insert_mask_watchpoint (%s, %s, %s) = %s", this->beneath ()->shortname (), target_debug_print_CORE_ADDR (arg0).c_str (), target_debug_print_CORE_ADDR (arg1).c_str (), @@ -973,11 +950,10 @@ dummy_target::remove_mask_watchpoint (CORE_ADDR arg0, CORE_ADDR arg1, enum targe int debug_target::remove_mask_watchpoint (CORE_ADDR arg0, CORE_ADDR arg1, enum target_hw_bp_type arg2) { - gdb_printf (gdb_stdlog, "-> %s->remove_mask_watchpoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->remove_mask_watchpoint (...)", this->beneath ()->shortname ()); int result = this->beneath ()->remove_mask_watchpoint (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, - "<- %s->remove_mask_watchpoint (%s, %s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->remove_mask_watchpoint (%s, %s, %s) = %s", this->beneath ()->shortname (), target_debug_print_CORE_ADDR (arg0).c_str (), target_debug_print_CORE_ADDR (arg1).c_str (), @@ -1001,11 +977,10 @@ dummy_target::stopped_by_watchpoint () bool debug_target::stopped_by_watchpoint () { - gdb_printf (gdb_stdlog, "-> %s->stopped_by_watchpoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->stopped_by_watchpoint (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->stopped_by_watchpoint (); - gdb_printf (gdb_stdlog, - "<- %s->stopped_by_watchpoint () = %s\n", + target_debug_printf_nofunc ("<- %s->stopped_by_watchpoint () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -1026,11 +1001,10 @@ dummy_target::have_steppable_watchpoint () bool debug_target::have_steppable_watchpoint () { - gdb_printf (gdb_stdlog, "-> %s->have_steppable_watchpoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->have_steppable_watchpoint (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->have_steppable_watchpoint (); - gdb_printf (gdb_stdlog, - "<- %s->have_steppable_watchpoint () = %s\n", + target_debug_printf_nofunc ("<- %s->have_steppable_watchpoint () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -1051,11 +1025,10 @@ dummy_target::stopped_data_address (CORE_ADDR *arg0) bool debug_target::stopped_data_address (CORE_ADDR *arg0) { - gdb_printf (gdb_stdlog, "-> %s->stopped_data_address (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->stopped_data_address (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->stopped_data_address (arg0); - gdb_printf (gdb_stdlog, - "<- %s->stopped_data_address (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->stopped_data_address (%s) = %s", this->beneath ()->shortname (), target_debug_print_CORE_ADDR_p (arg0).c_str (), target_debug_print_bool (result).c_str ()); @@ -1077,11 +1050,10 @@ dummy_target::watchpoint_addr_within_range (CORE_ADDR arg0, CORE_ADDR arg1, int bool debug_target::watchpoint_addr_within_range (CORE_ADDR arg0, CORE_ADDR arg1, int arg2) { - gdb_printf (gdb_stdlog, "-> %s->watchpoint_addr_within_range (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->watchpoint_addr_within_range (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->watchpoint_addr_within_range (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, - "<- %s->watchpoint_addr_within_range (%s, %s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->watchpoint_addr_within_range (%s, %s, %s) = %s", this->beneath ()->shortname (), target_debug_print_CORE_ADDR (arg0).c_str (), target_debug_print_CORE_ADDR (arg1).c_str (), @@ -1105,11 +1077,10 @@ dummy_target::region_ok_for_hw_watchpoint (CORE_ADDR arg0, int arg1) int debug_target::region_ok_for_hw_watchpoint (CORE_ADDR arg0, int arg1) { - gdb_printf (gdb_stdlog, "-> %s->region_ok_for_hw_watchpoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->region_ok_for_hw_watchpoint (...)", this->beneath ()->shortname ()); int result = this->beneath ()->region_ok_for_hw_watchpoint (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->region_ok_for_hw_watchpoint (%s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->region_ok_for_hw_watchpoint (%s, %s) = %s", this->beneath ()->shortname (), target_debug_print_CORE_ADDR (arg0).c_str (), target_debug_print_int (arg1).c_str (), @@ -1132,11 +1103,10 @@ dummy_target::can_accel_watchpoint_condition (CORE_ADDR arg0, int arg1, int arg2 bool debug_target::can_accel_watchpoint_condition (CORE_ADDR arg0, int arg1, int arg2, struct expression *arg3) { - gdb_printf (gdb_stdlog, "-> %s->can_accel_watchpoint_condition (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->can_accel_watchpoint_condition (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->can_accel_watchpoint_condition (arg0, arg1, arg2, arg3); - gdb_printf (gdb_stdlog, - "<- %s->can_accel_watchpoint_condition (%s, %s, %s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->can_accel_watchpoint_condition (%s, %s, %s, %s) = %s", this->beneath ()->shortname (), target_debug_print_CORE_ADDR (arg0).c_str (), target_debug_print_int (arg1).c_str (), @@ -1161,11 +1131,10 @@ dummy_target::masked_watch_num_registers (CORE_ADDR arg0, CORE_ADDR arg1) int debug_target::masked_watch_num_registers (CORE_ADDR arg0, CORE_ADDR arg1) { - gdb_printf (gdb_stdlog, "-> %s->masked_watch_num_registers (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->masked_watch_num_registers (...)", this->beneath ()->shortname ()); int result = this->beneath ()->masked_watch_num_registers (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->masked_watch_num_registers (%s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->masked_watch_num_registers (%s, %s) = %s", this->beneath ()->shortname (), target_debug_print_CORE_ADDR (arg0).c_str (), target_debug_print_CORE_ADDR (arg1).c_str (), @@ -1188,11 +1157,10 @@ dummy_target::can_do_single_step () int debug_target::can_do_single_step () { - gdb_printf (gdb_stdlog, "-> %s->can_do_single_step (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->can_do_single_step (...)", this->beneath ()->shortname ()); int result = this->beneath ()->can_do_single_step (); - gdb_printf (gdb_stdlog, - "<- %s->can_do_single_step () = %s\n", + target_debug_printf_nofunc ("<- %s->can_do_single_step () = %s", this->beneath ()->shortname (), target_debug_print_int (result).c_str ()); return result; @@ -1213,11 +1181,10 @@ dummy_target::supports_terminal_ours () bool debug_target::supports_terminal_ours () { - gdb_printf (gdb_stdlog, "-> %s->supports_terminal_ours (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->supports_terminal_ours (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_terminal_ours (); - gdb_printf (gdb_stdlog, - "<- %s->supports_terminal_ours () = %s\n", + target_debug_printf_nofunc ("<- %s->supports_terminal_ours () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -1237,10 +1204,9 @@ dummy_target::terminal_init () void debug_target::terminal_init () { - gdb_printf (gdb_stdlog, "-> %s->terminal_init (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->terminal_init (...)", this->beneath ()->shortname ()); this->beneath ()->terminal_init (); - gdb_printf (gdb_stdlog, - "<- %s->terminal_init ()\n", + target_debug_printf_nofunc ("<- %s->terminal_init ()", this->beneath ()->shortname ()); } @@ -1258,10 +1224,9 @@ dummy_target::terminal_inferior () void debug_target::terminal_inferior () { - gdb_printf (gdb_stdlog, "-> %s->terminal_inferior (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->terminal_inferior (...)", this->beneath ()->shortname ()); this->beneath ()->terminal_inferior (); - gdb_printf (gdb_stdlog, - "<- %s->terminal_inferior ()\n", + target_debug_printf_nofunc ("<- %s->terminal_inferior ()", this->beneath ()->shortname ()); } @@ -1279,10 +1244,9 @@ dummy_target::terminal_save_inferior () void debug_target::terminal_save_inferior () { - gdb_printf (gdb_stdlog, "-> %s->terminal_save_inferior (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->terminal_save_inferior (...)", this->beneath ()->shortname ()); this->beneath ()->terminal_save_inferior (); - gdb_printf (gdb_stdlog, - "<- %s->terminal_save_inferior ()\n", + target_debug_printf_nofunc ("<- %s->terminal_save_inferior ()", this->beneath ()->shortname ()); } @@ -1300,10 +1264,9 @@ dummy_target::terminal_ours_for_output () void debug_target::terminal_ours_for_output () { - gdb_printf (gdb_stdlog, "-> %s->terminal_ours_for_output (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->terminal_ours_for_output (...)", this->beneath ()->shortname ()); this->beneath ()->terminal_ours_for_output (); - gdb_printf (gdb_stdlog, - "<- %s->terminal_ours_for_output ()\n", + target_debug_printf_nofunc ("<- %s->terminal_ours_for_output ()", this->beneath ()->shortname ()); } @@ -1321,10 +1284,9 @@ dummy_target::terminal_ours () void debug_target::terminal_ours () { - gdb_printf (gdb_stdlog, "-> %s->terminal_ours (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->terminal_ours (...)", this->beneath ()->shortname ()); this->beneath ()->terminal_ours (); - gdb_printf (gdb_stdlog, - "<- %s->terminal_ours ()\n", + target_debug_printf_nofunc ("<- %s->terminal_ours ()", this->beneath ()->shortname ()); } @@ -1343,10 +1305,9 @@ dummy_target::terminal_info (const char *arg0, int arg1) void debug_target::terminal_info (const char *arg0, int arg1) { - gdb_printf (gdb_stdlog, "-> %s->terminal_info (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->terminal_info (...)", this->beneath ()->shortname ()); this->beneath ()->terminal_info (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->terminal_info (%s, %s)\n", + target_debug_printf_nofunc ("<- %s->terminal_info (%s, %s)", this->beneath ()->shortname (), target_debug_print_const_char_p (arg0).c_str (), target_debug_print_int (arg1).c_str ()); @@ -1367,10 +1328,9 @@ dummy_target::kill () void debug_target::kill () { - gdb_printf (gdb_stdlog, "-> %s->kill (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->kill (...)", this->beneath ()->shortname ()); this->beneath ()->kill (); - gdb_printf (gdb_stdlog, - "<- %s->kill ()\n", + target_debug_printf_nofunc ("<- %s->kill ()", this->beneath ()->shortname ()); } @@ -1389,10 +1349,9 @@ dummy_target::load (const char *arg0, int arg1) void debug_target::load (const char *arg0, int arg1) { - gdb_printf (gdb_stdlog, "-> %s->load (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->load (...)", this->beneath ()->shortname ()); this->beneath ()->load (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->load (%s, %s)\n", + target_debug_printf_nofunc ("<- %s->load (%s, %s)", this->beneath ()->shortname (), target_debug_print_const_char_p (arg0).c_str (), target_debug_print_int (arg1).c_str ()); @@ -1413,11 +1372,10 @@ dummy_target::insert_fork_catchpoint (int arg0) int debug_target::insert_fork_catchpoint (int arg0) { - gdb_printf (gdb_stdlog, "-> %s->insert_fork_catchpoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->insert_fork_catchpoint (...)", this->beneath ()->shortname ()); int result = this->beneath ()->insert_fork_catchpoint (arg0); - gdb_printf (gdb_stdlog, - "<- %s->insert_fork_catchpoint (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->insert_fork_catchpoint (%s) = %s", this->beneath ()->shortname (), target_debug_print_int (arg0).c_str (), target_debug_print_int (result).c_str ()); @@ -1439,11 +1397,10 @@ dummy_target::remove_fork_catchpoint (int arg0) int debug_target::remove_fork_catchpoint (int arg0) { - gdb_printf (gdb_stdlog, "-> %s->remove_fork_catchpoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->remove_fork_catchpoint (...)", this->beneath ()->shortname ()); int result = this->beneath ()->remove_fork_catchpoint (arg0); - gdb_printf (gdb_stdlog, - "<- %s->remove_fork_catchpoint (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->remove_fork_catchpoint (%s) = %s", this->beneath ()->shortname (), target_debug_print_int (arg0).c_str (), target_debug_print_int (result).c_str ()); @@ -1465,11 +1422,10 @@ dummy_target::insert_vfork_catchpoint (int arg0) int debug_target::insert_vfork_catchpoint (int arg0) { - gdb_printf (gdb_stdlog, "-> %s->insert_vfork_catchpoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->insert_vfork_catchpoint (...)", this->beneath ()->shortname ()); int result = this->beneath ()->insert_vfork_catchpoint (arg0); - gdb_printf (gdb_stdlog, - "<- %s->insert_vfork_catchpoint (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->insert_vfork_catchpoint (%s) = %s", this->beneath ()->shortname (), target_debug_print_int (arg0).c_str (), target_debug_print_int (result).c_str ()); @@ -1491,11 +1447,10 @@ dummy_target::remove_vfork_catchpoint (int arg0) int debug_target::remove_vfork_catchpoint (int arg0) { - gdb_printf (gdb_stdlog, "-> %s->remove_vfork_catchpoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->remove_vfork_catchpoint (...)", this->beneath ()->shortname ()); int result = this->beneath ()->remove_vfork_catchpoint (arg0); - gdb_printf (gdb_stdlog, - "<- %s->remove_vfork_catchpoint (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->remove_vfork_catchpoint (%s) = %s", this->beneath ()->shortname (), target_debug_print_int (arg0).c_str (), target_debug_print_int (result).c_str ()); @@ -1517,10 +1472,9 @@ dummy_target::follow_fork (inferior *arg0, ptid_t arg1, target_waitkind arg2, bo void debug_target::follow_fork (inferior *arg0, ptid_t arg1, target_waitkind arg2, bool arg3, bool arg4) { - gdb_printf (gdb_stdlog, "-> %s->follow_fork (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->follow_fork (...)", this->beneath ()->shortname ()); this->beneath ()->follow_fork (arg0, arg1, arg2, arg3, arg4); - gdb_printf (gdb_stdlog, - "<- %s->follow_fork (%s, %s, %s, %s, %s)\n", + target_debug_printf_nofunc ("<- %s->follow_fork (%s, %s, %s, %s, %s)", this->beneath ()->shortname (), target_debug_print_inferior_p (arg0).c_str (), target_debug_print_ptid_t (arg1).c_str (), @@ -1544,10 +1498,9 @@ dummy_target::follow_clone (ptid_t arg0) void debug_target::follow_clone (ptid_t arg0) { - gdb_printf (gdb_stdlog, "-> %s->follow_clone (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->follow_clone (...)", this->beneath ()->shortname ()); this->beneath ()->follow_clone (arg0); - gdb_printf (gdb_stdlog, - "<- %s->follow_clone (%s)\n", + target_debug_printf_nofunc ("<- %s->follow_clone (%s)", this->beneath ()->shortname (), target_debug_print_ptid_t (arg0).c_str ()); } @@ -1567,11 +1520,10 @@ dummy_target::insert_exec_catchpoint (int arg0) int debug_target::insert_exec_catchpoint (int arg0) { - gdb_printf (gdb_stdlog, "-> %s->insert_exec_catchpoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->insert_exec_catchpoint (...)", this->beneath ()->shortname ()); int result = this->beneath ()->insert_exec_catchpoint (arg0); - gdb_printf (gdb_stdlog, - "<- %s->insert_exec_catchpoint (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->insert_exec_catchpoint (%s) = %s", this->beneath ()->shortname (), target_debug_print_int (arg0).c_str (), target_debug_print_int (result).c_str ()); @@ -1593,11 +1545,10 @@ dummy_target::remove_exec_catchpoint (int arg0) int debug_target::remove_exec_catchpoint (int arg0) { - gdb_printf (gdb_stdlog, "-> %s->remove_exec_catchpoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->remove_exec_catchpoint (...)", this->beneath ()->shortname ()); int result = this->beneath ()->remove_exec_catchpoint (arg0); - gdb_printf (gdb_stdlog, - "<- %s->remove_exec_catchpoint (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->remove_exec_catchpoint (%s) = %s", this->beneath ()->shortname (), target_debug_print_int (arg0).c_str (), target_debug_print_int (result).c_str ()); @@ -1618,10 +1569,9 @@ dummy_target::follow_exec (inferior *arg0, ptid_t arg1, const char *arg2) void debug_target::follow_exec (inferior *arg0, ptid_t arg1, const char *arg2) { - gdb_printf (gdb_stdlog, "-> %s->follow_exec (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->follow_exec (...)", this->beneath ()->shortname ()); this->beneath ()->follow_exec (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, - "<- %s->follow_exec (%s, %s, %s)\n", + target_debug_printf_nofunc ("<- %s->follow_exec (%s, %s, %s)", this->beneath ()->shortname (), target_debug_print_inferior_p (arg0).c_str (), target_debug_print_ptid_t (arg1).c_str (), @@ -1643,11 +1593,10 @@ dummy_target::set_syscall_catchpoint (int arg0, bool arg1, int arg2, gdb::array_ int debug_target::set_syscall_catchpoint (int arg0, bool arg1, int arg2, gdb::array_view arg3) { - gdb_printf (gdb_stdlog, "-> %s->set_syscall_catchpoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->set_syscall_catchpoint (...)", this->beneath ()->shortname ()); int result = this->beneath ()->set_syscall_catchpoint (arg0, arg1, arg2, arg3); - gdb_printf (gdb_stdlog, - "<- %s->set_syscall_catchpoint (%s, %s, %s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->set_syscall_catchpoint (%s, %s, %s, %s) = %s", this->beneath ()->shortname (), target_debug_print_int (arg0).c_str (), target_debug_print_bool (arg1).c_str (), @@ -1672,10 +1621,9 @@ dummy_target::mourn_inferior () void debug_target::mourn_inferior () { - gdb_printf (gdb_stdlog, "-> %s->mourn_inferior (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->mourn_inferior (...)", this->beneath ()->shortname ()); this->beneath ()->mourn_inferior (); - gdb_printf (gdb_stdlog, - "<- %s->mourn_inferior ()\n", + target_debug_printf_nofunc ("<- %s->mourn_inferior ()", this->beneath ()->shortname ()); } @@ -1693,10 +1641,9 @@ dummy_target::pass_signals (gdb::array_view arg0) void debug_target::pass_signals (gdb::array_view arg0) { - gdb_printf (gdb_stdlog, "-> %s->pass_signals (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->pass_signals (...)", this->beneath ()->shortname ()); this->beneath ()->pass_signals (arg0); - gdb_printf (gdb_stdlog, - "<- %s->pass_signals (%s)\n", + target_debug_printf_nofunc ("<- %s->pass_signals (%s)", this->beneath ()->shortname (), target_debug_print_signals (arg0).c_str ()); } @@ -1715,10 +1662,9 @@ dummy_target::program_signals (gdb::array_view arg0) void debug_target::program_signals (gdb::array_view arg0) { - gdb_printf (gdb_stdlog, "-> %s->program_signals (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->program_signals (...)", this->beneath ()->shortname ()); this->beneath ()->program_signals (arg0); - gdb_printf (gdb_stdlog, - "<- %s->program_signals (%s)\n", + target_debug_printf_nofunc ("<- %s->program_signals (%s)", this->beneath ()->shortname (), target_debug_print_signals (arg0).c_str ()); } @@ -1738,11 +1684,10 @@ dummy_target::thread_alive (ptid_t arg0) bool debug_target::thread_alive (ptid_t arg0) { - gdb_printf (gdb_stdlog, "-> %s->thread_alive (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->thread_alive (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->thread_alive (arg0); - gdb_printf (gdb_stdlog, - "<- %s->thread_alive (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->thread_alive (%s) = %s", this->beneath ()->shortname (), target_debug_print_ptid_t (arg0).c_str (), target_debug_print_bool (result).c_str ()); @@ -1763,10 +1708,9 @@ dummy_target::update_thread_list () void debug_target::update_thread_list () { - gdb_printf (gdb_stdlog, "-> %s->update_thread_list (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->update_thread_list (...)", this->beneath ()->shortname ()); this->beneath ()->update_thread_list (); - gdb_printf (gdb_stdlog, - "<- %s->update_thread_list ()\n", + target_debug_printf_nofunc ("<- %s->update_thread_list ()", this->beneath ()->shortname ()); } @@ -1785,11 +1729,10 @@ dummy_target::pid_to_str (ptid_t arg0) std::string debug_target::pid_to_str (ptid_t arg0) { - gdb_printf (gdb_stdlog, "-> %s->pid_to_str (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->pid_to_str (...)", this->beneath ()->shortname ()); std::string result = this->beneath ()->pid_to_str (arg0); - gdb_printf (gdb_stdlog, - "<- %s->pid_to_str (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->pid_to_str (%s) = %s", this->beneath ()->shortname (), target_debug_print_ptid_t (arg0).c_str (), target_debug_print_std_string (result).c_str ()); @@ -1811,11 +1754,10 @@ dummy_target::extra_thread_info (thread_info *arg0) const char * debug_target::extra_thread_info (thread_info *arg0) { - gdb_printf (gdb_stdlog, "-> %s->extra_thread_info (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->extra_thread_info (...)", this->beneath ()->shortname ()); const char * result = this->beneath ()->extra_thread_info (arg0); - gdb_printf (gdb_stdlog, - "<- %s->extra_thread_info (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->extra_thread_info (%s) = %s", this->beneath ()->shortname (), target_debug_print_thread_info_p (arg0).c_str (), target_debug_print_const_char_p (result).c_str ()); @@ -1837,11 +1779,10 @@ dummy_target::thread_name (thread_info *arg0) const char * debug_target::thread_name (thread_info *arg0) { - gdb_printf (gdb_stdlog, "-> %s->thread_name (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->thread_name (...)", this->beneath ()->shortname ()); const char * result = this->beneath ()->thread_name (arg0); - gdb_printf (gdb_stdlog, - "<- %s->thread_name (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->thread_name (%s) = %s", this->beneath ()->shortname (), target_debug_print_thread_info_p (arg0).c_str (), target_debug_print_const_char_p (result).c_str ()); @@ -1863,11 +1804,10 @@ dummy_target::thread_handle_to_thread_info (const gdb_byte *arg0, int arg1, infe thread_info * debug_target::thread_handle_to_thread_info (const gdb_byte *arg0, int arg1, inferior *arg2) { - gdb_printf (gdb_stdlog, "-> %s->thread_handle_to_thread_info (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->thread_handle_to_thread_info (...)", this->beneath ()->shortname ()); thread_info * result = this->beneath ()->thread_handle_to_thread_info (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, - "<- %s->thread_handle_to_thread_info (%s, %s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->thread_handle_to_thread_info (%s, %s, %s) = %s", this->beneath ()->shortname (), target_debug_print_const_gdb_byte_p (arg0).c_str (), target_debug_print_int (arg1).c_str (), @@ -1891,11 +1831,10 @@ dummy_target::thread_info_to_thread_handle (struct thread_info *arg0) gdb::array_view debug_target::thread_info_to_thread_handle (struct thread_info *arg0) { - gdb_printf (gdb_stdlog, "-> %s->thread_info_to_thread_handle (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->thread_info_to_thread_handle (...)", this->beneath ()->shortname ()); gdb::array_view result = this->beneath ()->thread_info_to_thread_handle (arg0); - gdb_printf (gdb_stdlog, - "<- %s->thread_info_to_thread_handle (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->thread_info_to_thread_handle (%s) = %s", this->beneath ()->shortname (), target_debug_print_thread_info_p (arg0).c_str (), target_debug_print_gdb_array_view_const_gdb_byte (result).c_str ()); @@ -1916,10 +1855,9 @@ dummy_target::stop (ptid_t arg0) void debug_target::stop (ptid_t arg0) { - gdb_printf (gdb_stdlog, "-> %s->stop (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->stop (...)", this->beneath ()->shortname ()); this->beneath ()->stop (arg0); - gdb_printf (gdb_stdlog, - "<- %s->stop (%s)\n", + target_debug_printf_nofunc ("<- %s->stop (%s)", this->beneath ()->shortname (), target_debug_print_ptid_t (arg0).c_str ()); } @@ -1938,10 +1876,9 @@ dummy_target::interrupt () void debug_target::interrupt () { - gdb_printf (gdb_stdlog, "-> %s->interrupt (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->interrupt (...)", this->beneath ()->shortname ()); this->beneath ()->interrupt (); - gdb_printf (gdb_stdlog, - "<- %s->interrupt ()\n", + target_debug_printf_nofunc ("<- %s->interrupt ()", this->beneath ()->shortname ()); } @@ -1960,10 +1897,9 @@ dummy_target::pass_ctrlc () void debug_target::pass_ctrlc () { - gdb_printf (gdb_stdlog, "-> %s->pass_ctrlc (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->pass_ctrlc (...)", this->beneath ()->shortname ()); this->beneath ()->pass_ctrlc (); - gdb_printf (gdb_stdlog, - "<- %s->pass_ctrlc ()\n", + target_debug_printf_nofunc ("<- %s->pass_ctrlc ()", this->beneath ()->shortname ()); } @@ -1982,10 +1918,9 @@ dummy_target::rcmd (const char *arg0, struct ui_file *arg1) void debug_target::rcmd (const char *arg0, struct ui_file *arg1) { - gdb_printf (gdb_stdlog, "-> %s->rcmd (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->rcmd (...)", this->beneath ()->shortname ()); this->beneath ()->rcmd (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->rcmd (%s, %s)\n", + target_debug_printf_nofunc ("<- %s->rcmd (%s, %s)", this->beneath ()->shortname (), target_debug_print_const_char_p (arg0).c_str (), target_debug_print_ui_file_p (arg1).c_str ()); @@ -2006,11 +1941,10 @@ dummy_target::pid_to_exec_file (int arg0) const char * debug_target::pid_to_exec_file (int arg0) { - gdb_printf (gdb_stdlog, "-> %s->pid_to_exec_file (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->pid_to_exec_file (...)", this->beneath ()->shortname ()); const char * result = this->beneath ()->pid_to_exec_file (arg0); - gdb_printf (gdb_stdlog, - "<- %s->pid_to_exec_file (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->pid_to_exec_file (%s) = %s", this->beneath ()->shortname (), target_debug_print_int (arg0).c_str (), target_debug_print_const_char_p (result).c_str ()); @@ -2031,10 +1965,9 @@ dummy_target::log_command (const char *arg0) void debug_target::log_command (const char *arg0) { - gdb_printf (gdb_stdlog, "-> %s->log_command (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->log_command (...)", this->beneath ()->shortname ()); this->beneath ()->log_command (arg0); - gdb_printf (gdb_stdlog, - "<- %s->log_command (%s)\n", + target_debug_printf_nofunc ("<- %s->log_command (%s)", this->beneath ()->shortname (), target_debug_print_const_char_p (arg0).c_str ()); } @@ -2054,11 +1987,10 @@ dummy_target::get_section_table () const std::vector * debug_target::get_section_table () { - gdb_printf (gdb_stdlog, "-> %s->get_section_table (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->get_section_table (...)", this->beneath ()->shortname ()); const std::vector * result = this->beneath ()->get_section_table (); - gdb_printf (gdb_stdlog, - "<- %s->get_section_table () = %s\n", + target_debug_printf_nofunc ("<- %s->get_section_table () = %s", this->beneath ()->shortname (), target_debug_print_const_std_vector_target_section_p (result).c_str ()); return result; @@ -2079,11 +2011,10 @@ dummy_target::get_thread_control_capabilities () thread_control_capabilities debug_target::get_thread_control_capabilities () { - gdb_printf (gdb_stdlog, "-> %s->get_thread_control_capabilities (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->get_thread_control_capabilities (...)", this->beneath ()->shortname ()); thread_control_capabilities result = this->beneath ()->get_thread_control_capabilities (); - gdb_printf (gdb_stdlog, - "<- %s->get_thread_control_capabilities () = %s\n", + target_debug_printf_nofunc ("<- %s->get_thread_control_capabilities () = %s", this->beneath ()->shortname (), target_debug_print_thread_control_capabilities (result).c_str ()); return result; @@ -2104,11 +2035,10 @@ dummy_target::attach_no_wait () bool debug_target::attach_no_wait () { - gdb_printf (gdb_stdlog, "-> %s->attach_no_wait (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->attach_no_wait (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->attach_no_wait (); - gdb_printf (gdb_stdlog, - "<- %s->attach_no_wait () = %s\n", + target_debug_printf_nofunc ("<- %s->attach_no_wait () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -2129,11 +2059,10 @@ dummy_target::can_async_p () bool debug_target::can_async_p () { - gdb_printf (gdb_stdlog, "-> %s->can_async_p (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->can_async_p (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->can_async_p (); - gdb_printf (gdb_stdlog, - "<- %s->can_async_p () = %s\n", + target_debug_printf_nofunc ("<- %s->can_async_p () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -2154,11 +2083,10 @@ dummy_target::is_async_p () bool debug_target::is_async_p () { - gdb_printf (gdb_stdlog, "-> %s->is_async_p (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->is_async_p (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->is_async_p (); - gdb_printf (gdb_stdlog, - "<- %s->is_async_p () = %s\n", + target_debug_printf_nofunc ("<- %s->is_async_p () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -2179,10 +2107,9 @@ dummy_target::async (bool arg0) void debug_target::async (bool arg0) { - gdb_printf (gdb_stdlog, "-> %s->async (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->async (...)", this->beneath ()->shortname ()); this->beneath ()->async (arg0); - gdb_printf (gdb_stdlog, - "<- %s->async (%s)\n", + target_debug_printf_nofunc ("<- %s->async (%s)", this->beneath ()->shortname (), target_debug_print_bool (arg0).c_str ()); } @@ -2202,11 +2129,10 @@ dummy_target::async_wait_fd () int debug_target::async_wait_fd () { - gdb_printf (gdb_stdlog, "-> %s->async_wait_fd (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->async_wait_fd (...)", this->beneath ()->shortname ()); int result = this->beneath ()->async_wait_fd (); - gdb_printf (gdb_stdlog, - "<- %s->async_wait_fd () = %s\n", + target_debug_printf_nofunc ("<- %s->async_wait_fd () = %s", this->beneath ()->shortname (), target_debug_print_int (result).c_str ()); return result; @@ -2227,11 +2153,10 @@ dummy_target::has_pending_events () bool debug_target::has_pending_events () { - gdb_printf (gdb_stdlog, "-> %s->has_pending_events (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->has_pending_events (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->has_pending_events (); - gdb_printf (gdb_stdlog, - "<- %s->has_pending_events () = %s\n", + target_debug_printf_nofunc ("<- %s->has_pending_events () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -2251,10 +2176,9 @@ dummy_target::thread_events (int arg0) void debug_target::thread_events (int arg0) { - gdb_printf (gdb_stdlog, "-> %s->thread_events (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->thread_events (...)", this->beneath ()->shortname ()); this->beneath ()->thread_events (arg0); - gdb_printf (gdb_stdlog, - "<- %s->thread_events (%s)\n", + target_debug_printf_nofunc ("<- %s->thread_events (%s)", this->beneath ()->shortname (), target_debug_print_int (arg0).c_str ()); } @@ -2274,11 +2198,10 @@ dummy_target::supports_set_thread_options (gdb_thread_options arg0) bool debug_target::supports_set_thread_options (gdb_thread_options arg0) { - gdb_printf (gdb_stdlog, "-> %s->supports_set_thread_options (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->supports_set_thread_options (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_set_thread_options (arg0); - gdb_printf (gdb_stdlog, - "<- %s->supports_set_thread_options (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->supports_set_thread_options (%s) = %s", this->beneath ()->shortname (), target_debug_print_gdb_thread_options (arg0).c_str (), target_debug_print_bool (result).c_str ()); @@ -2300,11 +2223,10 @@ dummy_target::supports_non_stop () bool debug_target::supports_non_stop () { - gdb_printf (gdb_stdlog, "-> %s->supports_non_stop (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->supports_non_stop (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_non_stop (); - gdb_printf (gdb_stdlog, - "<- %s->supports_non_stop () = %s\n", + target_debug_printf_nofunc ("<- %s->supports_non_stop () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -2325,11 +2247,10 @@ dummy_target::always_non_stop_p () bool debug_target::always_non_stop_p () { - gdb_printf (gdb_stdlog, "-> %s->always_non_stop_p (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->always_non_stop_p (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->always_non_stop_p (); - gdb_printf (gdb_stdlog, - "<- %s->always_non_stop_p () = %s\n", + target_debug_printf_nofunc ("<- %s->always_non_stop_p () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -2350,11 +2271,10 @@ dummy_target::find_memory_regions (find_memory_region_ftype arg0, void *arg1) int debug_target::find_memory_regions (find_memory_region_ftype arg0, void *arg1) { - gdb_printf (gdb_stdlog, "-> %s->find_memory_regions (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->find_memory_regions (...)", this->beneath ()->shortname ()); int result = this->beneath ()->find_memory_regions (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->find_memory_regions (%s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->find_memory_regions (%s, %s) = %s", this->beneath ()->shortname (), target_debug_print_find_memory_region_ftype (arg0).c_str (), target_debug_print_void_p (arg1).c_str (), @@ -2377,11 +2297,10 @@ dummy_target::make_corefile_notes (bfd *arg0, int *arg1) gdb::unique_xmalloc_ptr debug_target::make_corefile_notes (bfd *arg0, int *arg1) { - gdb_printf (gdb_stdlog, "-> %s->make_corefile_notes (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->make_corefile_notes (...)", this->beneath ()->shortname ()); gdb::unique_xmalloc_ptr result = this->beneath ()->make_corefile_notes (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->make_corefile_notes (%s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->make_corefile_notes (%s, %s) = %s", this->beneath ()->shortname (), target_debug_print_bfd_p (arg0).c_str (), target_debug_print_int_p (arg1).c_str (), @@ -2404,11 +2323,10 @@ dummy_target::get_bookmark (const char *arg0, int arg1) gdb_byte * debug_target::get_bookmark (const char *arg0, int arg1) { - gdb_printf (gdb_stdlog, "-> %s->get_bookmark (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->get_bookmark (...)", this->beneath ()->shortname ()); gdb_byte * result = this->beneath ()->get_bookmark (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->get_bookmark (%s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->get_bookmark (%s, %s) = %s", this->beneath ()->shortname (), target_debug_print_const_char_p (arg0).c_str (), target_debug_print_int (arg1).c_str (), @@ -2431,10 +2349,9 @@ dummy_target::goto_bookmark (const gdb_byte *arg0, int arg1) void debug_target::goto_bookmark (const gdb_byte *arg0, int arg1) { - gdb_printf (gdb_stdlog, "-> %s->goto_bookmark (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->goto_bookmark (...)", this->beneath ()->shortname ()); this->beneath ()->goto_bookmark (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->goto_bookmark (%s, %s)\n", + target_debug_printf_nofunc ("<- %s->goto_bookmark (%s, %s)", this->beneath ()->shortname (), target_debug_print_const_gdb_byte_p (arg0).c_str (), target_debug_print_int (arg1).c_str ()); @@ -2455,11 +2372,10 @@ dummy_target::get_thread_local_address (ptid_t arg0, CORE_ADDR arg1, CORE_ADDR a CORE_ADDR debug_target::get_thread_local_address (ptid_t arg0, CORE_ADDR arg1, CORE_ADDR arg2) { - gdb_printf (gdb_stdlog, "-> %s->get_thread_local_address (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->get_thread_local_address (...)", this->beneath ()->shortname ()); CORE_ADDR result = this->beneath ()->get_thread_local_address (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, - "<- %s->get_thread_local_address (%s, %s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->get_thread_local_address (%s, %s, %s) = %s", this->beneath ()->shortname (), target_debug_print_ptid_t (arg0).c_str (), target_debug_print_CORE_ADDR (arg1).c_str (), @@ -2483,11 +2399,10 @@ dummy_target::xfer_partial (enum target_object arg0, const char *arg1, gdb_byte enum target_xfer_status debug_target::xfer_partial (enum target_object arg0, const char *arg1, gdb_byte *arg2, const gdb_byte *arg3, ULONGEST arg4, ULONGEST arg5, ULONGEST *arg6) { - gdb_printf (gdb_stdlog, "-> %s->xfer_partial (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->xfer_partial (...)", this->beneath ()->shortname ()); enum target_xfer_status result = this->beneath ()->xfer_partial (arg0, arg1, arg2, arg3, arg4, arg5, arg6); - gdb_printf (gdb_stdlog, - "<- %s->xfer_partial (%s, %s, %s, %s, %s, %s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->xfer_partial (%s, %s, %s, %s, %s, %s, %s) = %s", this->beneath ()->shortname (), target_debug_print_target_object (arg0).c_str (), target_debug_print_const_char_p (arg1).c_str (), @@ -2515,11 +2430,10 @@ dummy_target::get_memory_xfer_limit () ULONGEST debug_target::get_memory_xfer_limit () { - gdb_printf (gdb_stdlog, "-> %s->get_memory_xfer_limit (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->get_memory_xfer_limit (...)", this->beneath ()->shortname ()); ULONGEST result = this->beneath ()->get_memory_xfer_limit (); - gdb_printf (gdb_stdlog, - "<- %s->get_memory_xfer_limit () = %s\n", + target_debug_printf_nofunc ("<- %s->get_memory_xfer_limit () = %s", this->beneath ()->shortname (), target_debug_print_ULONGEST (result).c_str ()); return result; @@ -2540,11 +2454,10 @@ dummy_target::memory_map () std::vector debug_target::memory_map () { - gdb_printf (gdb_stdlog, "-> %s->memory_map (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->memory_map (...)", this->beneath ()->shortname ()); std::vector result = this->beneath ()->memory_map (); - gdb_printf (gdb_stdlog, - "<- %s->memory_map () = %s\n", + target_debug_printf_nofunc ("<- %s->memory_map () = %s", this->beneath ()->shortname (), target_debug_print_std_vector_mem_region (result).c_str ()); return result; @@ -2565,10 +2478,9 @@ dummy_target::flash_erase (ULONGEST arg0, LONGEST arg1) void debug_target::flash_erase (ULONGEST arg0, LONGEST arg1) { - gdb_printf (gdb_stdlog, "-> %s->flash_erase (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->flash_erase (...)", this->beneath ()->shortname ()); this->beneath ()->flash_erase (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->flash_erase (%s, %s)\n", + target_debug_printf_nofunc ("<- %s->flash_erase (%s, %s)", this->beneath ()->shortname (), target_debug_print_ULONGEST (arg0).c_str (), target_debug_print_LONGEST (arg1).c_str ()); @@ -2589,10 +2501,9 @@ dummy_target::flash_done () void debug_target::flash_done () { - gdb_printf (gdb_stdlog, "-> %s->flash_done (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->flash_done (...)", this->beneath ()->shortname ()); this->beneath ()->flash_done (); - gdb_printf (gdb_stdlog, - "<- %s->flash_done ()\n", + target_debug_printf_nofunc ("<- %s->flash_done ()", this->beneath ()->shortname ()); } @@ -2611,11 +2522,10 @@ dummy_target::read_description () const struct target_desc * debug_target::read_description () { - gdb_printf (gdb_stdlog, "-> %s->read_description (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->read_description (...)", this->beneath ()->shortname ()); const struct target_desc * result = this->beneath ()->read_description (); - gdb_printf (gdb_stdlog, - "<- %s->read_description () = %s\n", + target_debug_printf_nofunc ("<- %s->read_description () = %s", this->beneath ()->shortname (), target_debug_print_const_target_desc_p (result).c_str ()); return result; @@ -2636,11 +2546,10 @@ dummy_target::get_ada_task_ptid (long arg0, ULONGEST arg1) ptid_t debug_target::get_ada_task_ptid (long arg0, ULONGEST arg1) { - gdb_printf (gdb_stdlog, "-> %s->get_ada_task_ptid (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->get_ada_task_ptid (...)", this->beneath ()->shortname ()); ptid_t result = this->beneath ()->get_ada_task_ptid (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->get_ada_task_ptid (%s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->get_ada_task_ptid (%s, %s) = %s", this->beneath ()->shortname (), target_debug_print_long (arg0).c_str (), target_debug_print_ULONGEST (arg1).c_str (), @@ -2663,11 +2572,10 @@ dummy_target::auxv_parse (const gdb_byte **arg0, const gdb_byte *arg1, CORE_ADDR int debug_target::auxv_parse (const gdb_byte **arg0, const gdb_byte *arg1, CORE_ADDR *arg2, CORE_ADDR *arg3) { - gdb_printf (gdb_stdlog, "-> %s->auxv_parse (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->auxv_parse (...)", this->beneath ()->shortname ()); int result = this->beneath ()->auxv_parse (arg0, arg1, arg2, arg3); - gdb_printf (gdb_stdlog, - "<- %s->auxv_parse (%s, %s, %s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->auxv_parse (%s, %s, %s, %s) = %s", this->beneath ()->shortname (), target_debug_print_const_gdb_byte_pp (arg0).c_str (), target_debug_print_const_gdb_byte_p (arg1).c_str (), @@ -2692,11 +2600,10 @@ dummy_target::search_memory (CORE_ADDR arg0, ULONGEST arg1, const gdb_byte *arg2 int debug_target::search_memory (CORE_ADDR arg0, ULONGEST arg1, const gdb_byte *arg2, ULONGEST arg3, CORE_ADDR *arg4) { - gdb_printf (gdb_stdlog, "-> %s->search_memory (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->search_memory (...)", this->beneath ()->shortname ()); int result = this->beneath ()->search_memory (arg0, arg1, arg2, arg3, arg4); - gdb_printf (gdb_stdlog, - "<- %s->search_memory (%s, %s, %s, %s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->search_memory (%s, %s, %s, %s, %s) = %s", this->beneath ()->shortname (), target_debug_print_CORE_ADDR (arg0).c_str (), target_debug_print_ULONGEST (arg1).c_str (), @@ -2722,11 +2629,10 @@ dummy_target::can_execute_reverse () bool debug_target::can_execute_reverse () { - gdb_printf (gdb_stdlog, "-> %s->can_execute_reverse (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->can_execute_reverse (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->can_execute_reverse (); - gdb_printf (gdb_stdlog, - "<- %s->can_execute_reverse () = %s\n", + target_debug_printf_nofunc ("<- %s->can_execute_reverse () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -2747,11 +2653,10 @@ dummy_target::execution_direction () enum exec_direction_kind debug_target::execution_direction () { - gdb_printf (gdb_stdlog, "-> %s->execution_direction (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->execution_direction (...)", this->beneath ()->shortname ()); enum exec_direction_kind result = this->beneath ()->execution_direction (); - gdb_printf (gdb_stdlog, - "<- %s->execution_direction () = %s\n", + target_debug_printf_nofunc ("<- %s->execution_direction () = %s", this->beneath ()->shortname (), target_debug_print_exec_direction_kind (result).c_str ()); return result; @@ -2772,11 +2677,10 @@ dummy_target::supports_multi_process () bool debug_target::supports_multi_process () { - gdb_printf (gdb_stdlog, "-> %s->supports_multi_process (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->supports_multi_process (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_multi_process (); - gdb_printf (gdb_stdlog, - "<- %s->supports_multi_process () = %s\n", + target_debug_printf_nofunc ("<- %s->supports_multi_process () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -2797,11 +2701,10 @@ dummy_target::supports_enable_disable_tracepoint () bool debug_target::supports_enable_disable_tracepoint () { - gdb_printf (gdb_stdlog, "-> %s->supports_enable_disable_tracepoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->supports_enable_disable_tracepoint (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_enable_disable_tracepoint (); - gdb_printf (gdb_stdlog, - "<- %s->supports_enable_disable_tracepoint () = %s\n", + target_debug_printf_nofunc ("<- %s->supports_enable_disable_tracepoint () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -2822,11 +2725,10 @@ dummy_target::supports_disable_randomization () bool debug_target::supports_disable_randomization () { - gdb_printf (gdb_stdlog, "-> %s->supports_disable_randomization (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->supports_disable_randomization (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_disable_randomization (); - gdb_printf (gdb_stdlog, - "<- %s->supports_disable_randomization () = %s\n", + target_debug_printf_nofunc ("<- %s->supports_disable_randomization () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -2847,11 +2749,10 @@ dummy_target::supports_string_tracing () bool debug_target::supports_string_tracing () { - gdb_printf (gdb_stdlog, "-> %s->supports_string_tracing (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->supports_string_tracing (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_string_tracing (); - gdb_printf (gdb_stdlog, - "<- %s->supports_string_tracing () = %s\n", + target_debug_printf_nofunc ("<- %s->supports_string_tracing () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -2872,11 +2773,10 @@ dummy_target::supports_evaluation_of_breakpoint_conditions () bool debug_target::supports_evaluation_of_breakpoint_conditions () { - gdb_printf (gdb_stdlog, "-> %s->supports_evaluation_of_breakpoint_conditions (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->supports_evaluation_of_breakpoint_conditions (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_evaluation_of_breakpoint_conditions (); - gdb_printf (gdb_stdlog, - "<- %s->supports_evaluation_of_breakpoint_conditions () = %s\n", + target_debug_printf_nofunc ("<- %s->supports_evaluation_of_breakpoint_conditions () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -2897,11 +2797,10 @@ dummy_target::supports_dumpcore () bool debug_target::supports_dumpcore () { - gdb_printf (gdb_stdlog, "-> %s->supports_dumpcore (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->supports_dumpcore (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_dumpcore (); - gdb_printf (gdb_stdlog, - "<- %s->supports_dumpcore () = %s\n", + target_debug_printf_nofunc ("<- %s->supports_dumpcore () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -2921,10 +2820,9 @@ dummy_target::dumpcore (const char *arg0) void debug_target::dumpcore (const char *arg0) { - gdb_printf (gdb_stdlog, "-> %s->dumpcore (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->dumpcore (...)", this->beneath ()->shortname ()); this->beneath ()->dumpcore (arg0); - gdb_printf (gdb_stdlog, - "<- %s->dumpcore (%s)\n", + target_debug_printf_nofunc ("<- %s->dumpcore (%s)", this->beneath ()->shortname (), target_debug_print_const_char_p (arg0).c_str ()); } @@ -2944,11 +2842,10 @@ dummy_target::can_run_breakpoint_commands () bool debug_target::can_run_breakpoint_commands () { - gdb_printf (gdb_stdlog, "-> %s->can_run_breakpoint_commands (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->can_run_breakpoint_commands (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->can_run_breakpoint_commands (); - gdb_printf (gdb_stdlog, - "<- %s->can_run_breakpoint_commands () = %s\n", + target_debug_printf_nofunc ("<- %s->can_run_breakpoint_commands () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -2969,11 +2866,10 @@ dummy_target::thread_architecture (ptid_t arg0) struct gdbarch * debug_target::thread_architecture (ptid_t arg0) { - gdb_printf (gdb_stdlog, "-> %s->thread_architecture (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->thread_architecture (...)", this->beneath ()->shortname ()); struct gdbarch * result = this->beneath ()->thread_architecture (arg0); - gdb_printf (gdb_stdlog, - "<- %s->thread_architecture (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->thread_architecture (%s) = %s", this->beneath ()->shortname (), target_debug_print_ptid_t (arg0).c_str (), target_debug_print_gdbarch_p (result).c_str ()); @@ -2995,11 +2891,10 @@ dummy_target::filesystem_is_local () bool debug_target::filesystem_is_local () { - gdb_printf (gdb_stdlog, "-> %s->filesystem_is_local (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->filesystem_is_local (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->filesystem_is_local (); - gdb_printf (gdb_stdlog, - "<- %s->filesystem_is_local () = %s\n", + target_debug_printf_nofunc ("<- %s->filesystem_is_local () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -3020,10 +2915,9 @@ dummy_target::trace_init () void debug_target::trace_init () { - gdb_printf (gdb_stdlog, "-> %s->trace_init (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->trace_init (...)", this->beneath ()->shortname ()); this->beneath ()->trace_init (); - gdb_printf (gdb_stdlog, - "<- %s->trace_init ()\n", + target_debug_printf_nofunc ("<- %s->trace_init ()", this->beneath ()->shortname ()); } @@ -3042,10 +2936,9 @@ dummy_target::download_tracepoint (struct bp_location *arg0) void debug_target::download_tracepoint (struct bp_location *arg0) { - gdb_printf (gdb_stdlog, "-> %s->download_tracepoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->download_tracepoint (...)", this->beneath ()->shortname ()); this->beneath ()->download_tracepoint (arg0); - gdb_printf (gdb_stdlog, - "<- %s->download_tracepoint (%s)\n", + target_debug_printf_nofunc ("<- %s->download_tracepoint (%s)", this->beneath ()->shortname (), target_debug_print_bp_location_p (arg0).c_str ()); } @@ -3065,11 +2958,10 @@ dummy_target::can_download_tracepoint () bool debug_target::can_download_tracepoint () { - gdb_printf (gdb_stdlog, "-> %s->can_download_tracepoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->can_download_tracepoint (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->can_download_tracepoint (); - gdb_printf (gdb_stdlog, - "<- %s->can_download_tracepoint () = %s\n", + target_debug_printf_nofunc ("<- %s->can_download_tracepoint () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -3090,10 +2982,9 @@ dummy_target::download_trace_state_variable (const trace_state_variable &arg0) void debug_target::download_trace_state_variable (const trace_state_variable &arg0) { - gdb_printf (gdb_stdlog, "-> %s->download_trace_state_variable (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->download_trace_state_variable (...)", this->beneath ()->shortname ()); this->beneath ()->download_trace_state_variable (arg0); - gdb_printf (gdb_stdlog, - "<- %s->download_trace_state_variable (%s)\n", + target_debug_printf_nofunc ("<- %s->download_trace_state_variable (%s)", this->beneath ()->shortname (), target_debug_print_const_trace_state_variable_r (arg0).c_str ()); } @@ -3113,10 +3004,9 @@ dummy_target::enable_tracepoint (struct bp_location *arg0) void debug_target::enable_tracepoint (struct bp_location *arg0) { - gdb_printf (gdb_stdlog, "-> %s->enable_tracepoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->enable_tracepoint (...)", this->beneath ()->shortname ()); this->beneath ()->enable_tracepoint (arg0); - gdb_printf (gdb_stdlog, - "<- %s->enable_tracepoint (%s)\n", + target_debug_printf_nofunc ("<- %s->enable_tracepoint (%s)", this->beneath ()->shortname (), target_debug_print_bp_location_p (arg0).c_str ()); } @@ -3136,10 +3026,9 @@ dummy_target::disable_tracepoint (struct bp_location *arg0) void debug_target::disable_tracepoint (struct bp_location *arg0) { - gdb_printf (gdb_stdlog, "-> %s->disable_tracepoint (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->disable_tracepoint (...)", this->beneath ()->shortname ()); this->beneath ()->disable_tracepoint (arg0); - gdb_printf (gdb_stdlog, - "<- %s->disable_tracepoint (%s)\n", + target_debug_printf_nofunc ("<- %s->disable_tracepoint (%s)", this->beneath ()->shortname (), target_debug_print_bp_location_p (arg0).c_str ()); } @@ -3159,10 +3048,9 @@ dummy_target::trace_set_readonly_regions () void debug_target::trace_set_readonly_regions () { - gdb_printf (gdb_stdlog, "-> %s->trace_set_readonly_regions (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->trace_set_readonly_regions (...)", this->beneath ()->shortname ()); this->beneath ()->trace_set_readonly_regions (); - gdb_printf (gdb_stdlog, - "<- %s->trace_set_readonly_regions ()\n", + target_debug_printf_nofunc ("<- %s->trace_set_readonly_regions ()", this->beneath ()->shortname ()); } @@ -3181,10 +3069,9 @@ dummy_target::trace_start () void debug_target::trace_start () { - gdb_printf (gdb_stdlog, "-> %s->trace_start (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->trace_start (...)", this->beneath ()->shortname ()); this->beneath ()->trace_start (); - gdb_printf (gdb_stdlog, - "<- %s->trace_start ()\n", + target_debug_printf_nofunc ("<- %s->trace_start ()", this->beneath ()->shortname ()); } @@ -3203,11 +3090,10 @@ dummy_target::get_trace_status (struct trace_status *arg0) int debug_target::get_trace_status (struct trace_status *arg0) { - gdb_printf (gdb_stdlog, "-> %s->get_trace_status (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->get_trace_status (...)", this->beneath ()->shortname ()); int result = this->beneath ()->get_trace_status (arg0); - gdb_printf (gdb_stdlog, - "<- %s->get_trace_status (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->get_trace_status (%s) = %s", this->beneath ()->shortname (), target_debug_print_trace_status_p (arg0).c_str (), target_debug_print_int (result).c_str ()); @@ -3229,10 +3115,9 @@ dummy_target::get_tracepoint_status (tracepoint *arg0, struct uploaded_tp *arg1) void debug_target::get_tracepoint_status (tracepoint *arg0, struct uploaded_tp *arg1) { - gdb_printf (gdb_stdlog, "-> %s->get_tracepoint_status (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->get_tracepoint_status (...)", this->beneath ()->shortname ()); this->beneath ()->get_tracepoint_status (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->get_tracepoint_status (%s, %s)\n", + target_debug_printf_nofunc ("<- %s->get_tracepoint_status (%s, %s)", this->beneath ()->shortname (), target_debug_print_tracepoint_p (arg0).c_str (), target_debug_print_uploaded_tp_p (arg1).c_str ()); @@ -3253,10 +3138,9 @@ dummy_target::trace_stop () void debug_target::trace_stop () { - gdb_printf (gdb_stdlog, "-> %s->trace_stop (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->trace_stop (...)", this->beneath ()->shortname ()); this->beneath ()->trace_stop (); - gdb_printf (gdb_stdlog, - "<- %s->trace_stop ()\n", + target_debug_printf_nofunc ("<- %s->trace_stop ()", this->beneath ()->shortname ()); } @@ -3275,11 +3159,10 @@ dummy_target::trace_find (enum trace_find_type arg0, int arg1, CORE_ADDR arg2, C int debug_target::trace_find (enum trace_find_type arg0, int arg1, CORE_ADDR arg2, CORE_ADDR arg3, int *arg4) { - gdb_printf (gdb_stdlog, "-> %s->trace_find (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->trace_find (...)", this->beneath ()->shortname ()); int result = this->beneath ()->trace_find (arg0, arg1, arg2, arg3, arg4); - gdb_printf (gdb_stdlog, - "<- %s->trace_find (%s, %s, %s, %s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->trace_find (%s, %s, %s, %s, %s) = %s", this->beneath ()->shortname (), target_debug_print_trace_find_type (arg0).c_str (), target_debug_print_int (arg1).c_str (), @@ -3305,11 +3188,10 @@ dummy_target::get_trace_state_variable_value (int arg0, LONGEST *arg1) bool debug_target::get_trace_state_variable_value (int arg0, LONGEST *arg1) { - gdb_printf (gdb_stdlog, "-> %s->get_trace_state_variable_value (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->get_trace_state_variable_value (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->get_trace_state_variable_value (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->get_trace_state_variable_value (%s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->get_trace_state_variable_value (%s, %s) = %s", this->beneath ()->shortname (), target_debug_print_int (arg0).c_str (), target_debug_print_LONGEST_p (arg1).c_str (), @@ -3332,11 +3214,10 @@ dummy_target::save_trace_data (const char *arg0) int debug_target::save_trace_data (const char *arg0) { - gdb_printf (gdb_stdlog, "-> %s->save_trace_data (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->save_trace_data (...)", this->beneath ()->shortname ()); int result = this->beneath ()->save_trace_data (arg0); - gdb_printf (gdb_stdlog, - "<- %s->save_trace_data (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->save_trace_data (%s) = %s", this->beneath ()->shortname (), target_debug_print_const_char_p (arg0).c_str (), target_debug_print_int (result).c_str ()); @@ -3358,11 +3239,10 @@ dummy_target::upload_tracepoints (struct uploaded_tp **arg0) int debug_target::upload_tracepoints (struct uploaded_tp **arg0) { - gdb_printf (gdb_stdlog, "-> %s->upload_tracepoints (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->upload_tracepoints (...)", this->beneath ()->shortname ()); int result = this->beneath ()->upload_tracepoints (arg0); - gdb_printf (gdb_stdlog, - "<- %s->upload_tracepoints (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->upload_tracepoints (%s) = %s", this->beneath ()->shortname (), target_debug_print_uploaded_tp_pp (arg0).c_str (), target_debug_print_int (result).c_str ()); @@ -3384,11 +3264,10 @@ dummy_target::upload_trace_state_variables (struct uploaded_tsv **arg0) int debug_target::upload_trace_state_variables (struct uploaded_tsv **arg0) { - gdb_printf (gdb_stdlog, "-> %s->upload_trace_state_variables (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->upload_trace_state_variables (...)", this->beneath ()->shortname ()); int result = this->beneath ()->upload_trace_state_variables (arg0); - gdb_printf (gdb_stdlog, - "<- %s->upload_trace_state_variables (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->upload_trace_state_variables (%s) = %s", this->beneath ()->shortname (), target_debug_print_uploaded_tsv_pp (arg0).c_str (), target_debug_print_int (result).c_str ()); @@ -3410,11 +3289,10 @@ dummy_target::get_raw_trace_data (gdb_byte *arg0, ULONGEST arg1, LONGEST arg2) LONGEST debug_target::get_raw_trace_data (gdb_byte *arg0, ULONGEST arg1, LONGEST arg2) { - gdb_printf (gdb_stdlog, "-> %s->get_raw_trace_data (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->get_raw_trace_data (...)", this->beneath ()->shortname ()); LONGEST result = this->beneath ()->get_raw_trace_data (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, - "<- %s->get_raw_trace_data (%s, %s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->get_raw_trace_data (%s, %s, %s) = %s", this->beneath ()->shortname (), target_debug_print_gdb_byte_p (arg0).c_str (), target_debug_print_ULONGEST (arg1).c_str (), @@ -3438,11 +3316,10 @@ dummy_target::get_min_fast_tracepoint_insn_len () int debug_target::get_min_fast_tracepoint_insn_len () { - gdb_printf (gdb_stdlog, "-> %s->get_min_fast_tracepoint_insn_len (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->get_min_fast_tracepoint_insn_len (...)", this->beneath ()->shortname ()); int result = this->beneath ()->get_min_fast_tracepoint_insn_len (); - gdb_printf (gdb_stdlog, - "<- %s->get_min_fast_tracepoint_insn_len () = %s\n", + target_debug_printf_nofunc ("<- %s->get_min_fast_tracepoint_insn_len () = %s", this->beneath ()->shortname (), target_debug_print_int (result).c_str ()); return result; @@ -3462,10 +3339,9 @@ dummy_target::set_disconnected_tracing (int arg0) void debug_target::set_disconnected_tracing (int arg0) { - gdb_printf (gdb_stdlog, "-> %s->set_disconnected_tracing (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->set_disconnected_tracing (...)", this->beneath ()->shortname ()); this->beneath ()->set_disconnected_tracing (arg0); - gdb_printf (gdb_stdlog, - "<- %s->set_disconnected_tracing (%s)\n", + target_debug_printf_nofunc ("<- %s->set_disconnected_tracing (%s)", this->beneath ()->shortname (), target_debug_print_int (arg0).c_str ()); } @@ -3484,10 +3360,9 @@ dummy_target::set_circular_trace_buffer (int arg0) void debug_target::set_circular_trace_buffer (int arg0) { - gdb_printf (gdb_stdlog, "-> %s->set_circular_trace_buffer (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->set_circular_trace_buffer (...)", this->beneath ()->shortname ()); this->beneath ()->set_circular_trace_buffer (arg0); - gdb_printf (gdb_stdlog, - "<- %s->set_circular_trace_buffer (%s)\n", + target_debug_printf_nofunc ("<- %s->set_circular_trace_buffer (%s)", this->beneath ()->shortname (), target_debug_print_int (arg0).c_str ()); } @@ -3506,10 +3381,9 @@ dummy_target::set_trace_buffer_size (LONGEST arg0) void debug_target::set_trace_buffer_size (LONGEST arg0) { - gdb_printf (gdb_stdlog, "-> %s->set_trace_buffer_size (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->set_trace_buffer_size (...)", this->beneath ()->shortname ()); this->beneath ()->set_trace_buffer_size (arg0); - gdb_printf (gdb_stdlog, - "<- %s->set_trace_buffer_size (%s)\n", + target_debug_printf_nofunc ("<- %s->set_trace_buffer_size (%s)", this->beneath ()->shortname (), target_debug_print_LONGEST (arg0).c_str ()); } @@ -3529,11 +3403,10 @@ dummy_target::set_trace_notes (const char *arg0, const char *arg1, const char *a bool debug_target::set_trace_notes (const char *arg0, const char *arg1, const char *arg2) { - gdb_printf (gdb_stdlog, "-> %s->set_trace_notes (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->set_trace_notes (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->set_trace_notes (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, - "<- %s->set_trace_notes (%s, %s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->set_trace_notes (%s, %s, %s) = %s", this->beneath ()->shortname (), target_debug_print_const_char_p (arg0).c_str (), target_debug_print_const_char_p (arg1).c_str (), @@ -3557,11 +3430,10 @@ dummy_target::core_of_thread (ptid_t arg0) int debug_target::core_of_thread (ptid_t arg0) { - gdb_printf (gdb_stdlog, "-> %s->core_of_thread (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->core_of_thread (...)", this->beneath ()->shortname ()); int result = this->beneath ()->core_of_thread (arg0); - gdb_printf (gdb_stdlog, - "<- %s->core_of_thread (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->core_of_thread (%s) = %s", this->beneath ()->shortname (), target_debug_print_ptid_t (arg0).c_str (), target_debug_print_int (result).c_str ()); @@ -3583,11 +3455,10 @@ dummy_target::verify_memory (const gdb_byte *arg0, CORE_ADDR arg1, ULONGEST arg2 int debug_target::verify_memory (const gdb_byte *arg0, CORE_ADDR arg1, ULONGEST arg2) { - gdb_printf (gdb_stdlog, "-> %s->verify_memory (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->verify_memory (...)", this->beneath ()->shortname ()); int result = this->beneath ()->verify_memory (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, - "<- %s->verify_memory (%s, %s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->verify_memory (%s, %s, %s) = %s", this->beneath ()->shortname (), target_debug_print_const_gdb_byte_p (arg0).c_str (), target_debug_print_CORE_ADDR (arg1).c_str (), @@ -3611,11 +3482,10 @@ dummy_target::get_tib_address (ptid_t arg0, CORE_ADDR *arg1) bool debug_target::get_tib_address (ptid_t arg0, CORE_ADDR *arg1) { - gdb_printf (gdb_stdlog, "-> %s->get_tib_address (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->get_tib_address (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->get_tib_address (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->get_tib_address (%s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->get_tib_address (%s, %s) = %s", this->beneath ()->shortname (), target_debug_print_ptid_t (arg0).c_str (), target_debug_print_CORE_ADDR_p (arg1).c_str (), @@ -3637,10 +3507,9 @@ dummy_target::set_permissions () void debug_target::set_permissions () { - gdb_printf (gdb_stdlog, "-> %s->set_permissions (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->set_permissions (...)", this->beneath ()->shortname ()); this->beneath ()->set_permissions (); - gdb_printf (gdb_stdlog, - "<- %s->set_permissions ()\n", + target_debug_printf_nofunc ("<- %s->set_permissions ()", this->beneath ()->shortname ()); } @@ -3659,11 +3528,10 @@ dummy_target::static_tracepoint_marker_at (CORE_ADDR arg0, static_tracepoint_mar bool debug_target::static_tracepoint_marker_at (CORE_ADDR arg0, static_tracepoint_marker *arg1) { - gdb_printf (gdb_stdlog, "-> %s->static_tracepoint_marker_at (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->static_tracepoint_marker_at (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->static_tracepoint_marker_at (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->static_tracepoint_marker_at (%s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->static_tracepoint_marker_at (%s, %s) = %s", this->beneath ()->shortname (), target_debug_print_CORE_ADDR (arg0).c_str (), target_debug_print_static_tracepoint_marker_p (arg1).c_str (), @@ -3686,11 +3554,10 @@ dummy_target::static_tracepoint_markers_by_strid (const char *arg0) std::vector debug_target::static_tracepoint_markers_by_strid (const char *arg0) { - gdb_printf (gdb_stdlog, "-> %s->static_tracepoint_markers_by_strid (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->static_tracepoint_markers_by_strid (...)", this->beneath ()->shortname ()); std::vector result = this->beneath ()->static_tracepoint_markers_by_strid (arg0); - gdb_printf (gdb_stdlog, - "<- %s->static_tracepoint_markers_by_strid (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->static_tracepoint_markers_by_strid (%s) = %s", this->beneath ()->shortname (), target_debug_print_const_char_p (arg0).c_str (), target_debug_print_std_vector_static_tracepoint_marker (result).c_str ()); @@ -3712,11 +3579,10 @@ dummy_target::traceframe_info () traceframe_info_up debug_target::traceframe_info () { - gdb_printf (gdb_stdlog, "-> %s->traceframe_info (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->traceframe_info (...)", this->beneath ()->shortname ()); traceframe_info_up result = this->beneath ()->traceframe_info (); - gdb_printf (gdb_stdlog, - "<- %s->traceframe_info () = %s\n", + target_debug_printf_nofunc ("<- %s->traceframe_info () = %s", this->beneath ()->shortname (), target_debug_print_traceframe_info_up (result).c_str ()); return result; @@ -3737,11 +3603,10 @@ dummy_target::use_agent (bool arg0) bool debug_target::use_agent (bool arg0) { - gdb_printf (gdb_stdlog, "-> %s->use_agent (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->use_agent (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->use_agent (arg0); - gdb_printf (gdb_stdlog, - "<- %s->use_agent (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->use_agent (%s) = %s", this->beneath ()->shortname (), target_debug_print_bool (arg0).c_str (), target_debug_print_bool (result).c_str ()); @@ -3763,11 +3628,10 @@ dummy_target::can_use_agent () bool debug_target::can_use_agent () { - gdb_printf (gdb_stdlog, "-> %s->can_use_agent (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->can_use_agent (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->can_use_agent (); - gdb_printf (gdb_stdlog, - "<- %s->can_use_agent () = %s\n", + target_debug_printf_nofunc ("<- %s->can_use_agent () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -3788,11 +3652,10 @@ dummy_target::enable_btrace (thread_info *arg0, const struct btrace_config *arg1 struct btrace_target_info * debug_target::enable_btrace (thread_info *arg0, const struct btrace_config *arg1) { - gdb_printf (gdb_stdlog, "-> %s->enable_btrace (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->enable_btrace (...)", this->beneath ()->shortname ()); struct btrace_target_info * result = this->beneath ()->enable_btrace (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->enable_btrace (%s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->enable_btrace (%s, %s) = %s", this->beneath ()->shortname (), target_debug_print_thread_info_p (arg0).c_str (), target_debug_print_const_btrace_config_p (arg1).c_str (), @@ -3815,10 +3678,9 @@ dummy_target::disable_btrace (struct btrace_target_info *arg0) void debug_target::disable_btrace (struct btrace_target_info *arg0) { - gdb_printf (gdb_stdlog, "-> %s->disable_btrace (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->disable_btrace (...)", this->beneath ()->shortname ()); this->beneath ()->disable_btrace (arg0); - gdb_printf (gdb_stdlog, - "<- %s->disable_btrace (%s)\n", + target_debug_printf_nofunc ("<- %s->disable_btrace (%s)", this->beneath ()->shortname (), target_debug_print_btrace_target_info_p (arg0).c_str ()); } @@ -3838,10 +3700,9 @@ dummy_target::teardown_btrace (struct btrace_target_info *arg0) void debug_target::teardown_btrace (struct btrace_target_info *arg0) { - gdb_printf (gdb_stdlog, "-> %s->teardown_btrace (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->teardown_btrace (...)", this->beneath ()->shortname ()); this->beneath ()->teardown_btrace (arg0); - gdb_printf (gdb_stdlog, - "<- %s->teardown_btrace (%s)\n", + target_debug_printf_nofunc ("<- %s->teardown_btrace (%s)", this->beneath ()->shortname (), target_debug_print_btrace_target_info_p (arg0).c_str ()); } @@ -3861,11 +3722,10 @@ dummy_target::read_btrace (struct btrace_data *arg0, struct btrace_target_info * enum btrace_error debug_target::read_btrace (struct btrace_data *arg0, struct btrace_target_info *arg1, enum btrace_read_type arg2) { - gdb_printf (gdb_stdlog, "-> %s->read_btrace (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->read_btrace (...)", this->beneath ()->shortname ()); enum btrace_error result = this->beneath ()->read_btrace (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, - "<- %s->read_btrace (%s, %s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->read_btrace (%s, %s, %s) = %s", this->beneath ()->shortname (), target_debug_print_btrace_data_p (arg0).c_str (), target_debug_print_btrace_target_info_p (arg1).c_str (), @@ -3889,11 +3749,10 @@ dummy_target::btrace_conf (const struct btrace_target_info *arg0) const struct btrace_config * debug_target::btrace_conf (const struct btrace_target_info *arg0) { - gdb_printf (gdb_stdlog, "-> %s->btrace_conf (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->btrace_conf (...)", this->beneath ()->shortname ()); const struct btrace_config * result = this->beneath ()->btrace_conf (arg0); - gdb_printf (gdb_stdlog, - "<- %s->btrace_conf (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->btrace_conf (%s) = %s", this->beneath ()->shortname (), target_debug_print_const_btrace_target_info_p (arg0).c_str (), target_debug_print_const_btrace_config_p (result).c_str ()); @@ -3915,11 +3774,10 @@ dummy_target::record_method (ptid_t arg0) enum record_method debug_target::record_method (ptid_t arg0) { - gdb_printf (gdb_stdlog, "-> %s->record_method (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->record_method (...)", this->beneath ()->shortname ()); enum record_method result = this->beneath ()->record_method (arg0); - gdb_printf (gdb_stdlog, - "<- %s->record_method (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->record_method (%s) = %s", this->beneath ()->shortname (), target_debug_print_ptid_t (arg0).c_str (), target_debug_print_record_method (result).c_str ()); @@ -3940,10 +3798,9 @@ dummy_target::stop_recording () void debug_target::stop_recording () { - gdb_printf (gdb_stdlog, "-> %s->stop_recording (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->stop_recording (...)", this->beneath ()->shortname ()); this->beneath ()->stop_recording (); - gdb_printf (gdb_stdlog, - "<- %s->stop_recording ()\n", + target_debug_printf_nofunc ("<- %s->stop_recording ()", this->beneath ()->shortname ()); } @@ -3961,10 +3818,9 @@ dummy_target::info_record () void debug_target::info_record () { - gdb_printf (gdb_stdlog, "-> %s->info_record (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->info_record (...)", this->beneath ()->shortname ()); this->beneath ()->info_record (); - gdb_printf (gdb_stdlog, - "<- %s->info_record ()\n", + target_debug_printf_nofunc ("<- %s->info_record ()", this->beneath ()->shortname ()); } @@ -3983,10 +3839,9 @@ dummy_target::save_record (const char *arg0) void debug_target::save_record (const char *arg0) { - gdb_printf (gdb_stdlog, "-> %s->save_record (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->save_record (...)", this->beneath ()->shortname ()); this->beneath ()->save_record (arg0); - gdb_printf (gdb_stdlog, - "<- %s->save_record (%s)\n", + target_debug_printf_nofunc ("<- %s->save_record (%s)", this->beneath ()->shortname (), target_debug_print_const_char_p (arg0).c_str ()); } @@ -4006,11 +3861,10 @@ dummy_target::supports_delete_record () bool debug_target::supports_delete_record () { - gdb_printf (gdb_stdlog, "-> %s->supports_delete_record (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->supports_delete_record (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_delete_record (); - gdb_printf (gdb_stdlog, - "<- %s->supports_delete_record () = %s\n", + target_debug_printf_nofunc ("<- %s->supports_delete_record () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -4031,10 +3885,9 @@ dummy_target::delete_record () void debug_target::delete_record () { - gdb_printf (gdb_stdlog, "-> %s->delete_record (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->delete_record (...)", this->beneath ()->shortname ()); this->beneath ()->delete_record (); - gdb_printf (gdb_stdlog, - "<- %s->delete_record ()\n", + target_debug_printf_nofunc ("<- %s->delete_record ()", this->beneath ()->shortname ()); } @@ -4053,11 +3906,10 @@ dummy_target::record_is_replaying (ptid_t arg0) bool debug_target::record_is_replaying (ptid_t arg0) { - gdb_printf (gdb_stdlog, "-> %s->record_is_replaying (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->record_is_replaying (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->record_is_replaying (arg0); - gdb_printf (gdb_stdlog, - "<- %s->record_is_replaying (%s) = %s\n", + target_debug_printf_nofunc ("<- %s->record_is_replaying (%s) = %s", this->beneath ()->shortname (), target_debug_print_ptid_t (arg0).c_str (), target_debug_print_bool (result).c_str ()); @@ -4079,11 +3931,10 @@ dummy_target::record_will_replay (ptid_t arg0, int arg1) bool debug_target::record_will_replay (ptid_t arg0, int arg1) { - gdb_printf (gdb_stdlog, "-> %s->record_will_replay (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->record_will_replay (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->record_will_replay (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->record_will_replay (%s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->record_will_replay (%s, %s) = %s", this->beneath ()->shortname (), target_debug_print_ptid_t (arg0).c_str (), target_debug_print_int (arg1).c_str (), @@ -4105,10 +3956,9 @@ dummy_target::record_stop_replaying () void debug_target::record_stop_replaying () { - gdb_printf (gdb_stdlog, "-> %s->record_stop_replaying (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->record_stop_replaying (...)", this->beneath ()->shortname ()); this->beneath ()->record_stop_replaying (); - gdb_printf (gdb_stdlog, - "<- %s->record_stop_replaying ()\n", + target_debug_printf_nofunc ("<- %s->record_stop_replaying ()", this->beneath ()->shortname ()); } @@ -4127,10 +3977,9 @@ dummy_target::goto_record_begin () void debug_target::goto_record_begin () { - gdb_printf (gdb_stdlog, "-> %s->goto_record_begin (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->goto_record_begin (...)", this->beneath ()->shortname ()); this->beneath ()->goto_record_begin (); - gdb_printf (gdb_stdlog, - "<- %s->goto_record_begin ()\n", + target_debug_printf_nofunc ("<- %s->goto_record_begin ()", this->beneath ()->shortname ()); } @@ -4149,10 +3998,9 @@ dummy_target::goto_record_end () void debug_target::goto_record_end () { - gdb_printf (gdb_stdlog, "-> %s->goto_record_end (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->goto_record_end (...)", this->beneath ()->shortname ()); this->beneath ()->goto_record_end (); - gdb_printf (gdb_stdlog, - "<- %s->goto_record_end ()\n", + target_debug_printf_nofunc ("<- %s->goto_record_end ()", this->beneath ()->shortname ()); } @@ -4171,10 +4019,9 @@ dummy_target::goto_record (ULONGEST arg0) void debug_target::goto_record (ULONGEST arg0) { - gdb_printf (gdb_stdlog, "-> %s->goto_record (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->goto_record (...)", this->beneath ()->shortname ()); this->beneath ()->goto_record (arg0); - gdb_printf (gdb_stdlog, - "<- %s->goto_record (%s)\n", + target_debug_printf_nofunc ("<- %s->goto_record (%s)", this->beneath ()->shortname (), target_debug_print_ULONGEST (arg0).c_str ()); } @@ -4194,10 +4041,9 @@ dummy_target::insn_history (int arg0, gdb_disassembly_flags arg1) void debug_target::insn_history (int arg0, gdb_disassembly_flags arg1) { - gdb_printf (gdb_stdlog, "-> %s->insn_history (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->insn_history (...)", this->beneath ()->shortname ()); this->beneath ()->insn_history (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->insn_history (%s, %s)\n", + target_debug_printf_nofunc ("<- %s->insn_history (%s, %s)", this->beneath ()->shortname (), target_debug_print_int (arg0).c_str (), target_debug_print_gdb_disassembly_flags (arg1).c_str ()); @@ -4218,10 +4064,9 @@ dummy_target::insn_history_from (ULONGEST arg0, int arg1, gdb_disassembly_flags void debug_target::insn_history_from (ULONGEST arg0, int arg1, gdb_disassembly_flags arg2) { - gdb_printf (gdb_stdlog, "-> %s->insn_history_from (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->insn_history_from (...)", this->beneath ()->shortname ()); this->beneath ()->insn_history_from (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, - "<- %s->insn_history_from (%s, %s, %s)\n", + target_debug_printf_nofunc ("<- %s->insn_history_from (%s, %s, %s)", this->beneath ()->shortname (), target_debug_print_ULONGEST (arg0).c_str (), target_debug_print_int (arg1).c_str (), @@ -4243,10 +4088,9 @@ dummy_target::insn_history_range (ULONGEST arg0, ULONGEST arg1, gdb_disassembly_ void debug_target::insn_history_range (ULONGEST arg0, ULONGEST arg1, gdb_disassembly_flags arg2) { - gdb_printf (gdb_stdlog, "-> %s->insn_history_range (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->insn_history_range (...)", this->beneath ()->shortname ()); this->beneath ()->insn_history_range (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, - "<- %s->insn_history_range (%s, %s, %s)\n", + target_debug_printf_nofunc ("<- %s->insn_history_range (%s, %s, %s)", this->beneath ()->shortname (), target_debug_print_ULONGEST (arg0).c_str (), target_debug_print_ULONGEST (arg1).c_str (), @@ -4268,10 +4112,9 @@ dummy_target::call_history (int arg0, record_print_flags arg1) void debug_target::call_history (int arg0, record_print_flags arg1) { - gdb_printf (gdb_stdlog, "-> %s->call_history (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->call_history (...)", this->beneath ()->shortname ()); this->beneath ()->call_history (arg0, arg1); - gdb_printf (gdb_stdlog, - "<- %s->call_history (%s, %s)\n", + target_debug_printf_nofunc ("<- %s->call_history (%s, %s)", this->beneath ()->shortname (), target_debug_print_int (arg0).c_str (), target_debug_print_record_print_flags (arg1).c_str ()); @@ -4292,10 +4135,9 @@ dummy_target::call_history_from (ULONGEST arg0, int arg1, record_print_flags arg void debug_target::call_history_from (ULONGEST arg0, int arg1, record_print_flags arg2) { - gdb_printf (gdb_stdlog, "-> %s->call_history_from (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->call_history_from (...)", this->beneath ()->shortname ()); this->beneath ()->call_history_from (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, - "<- %s->call_history_from (%s, %s, %s)\n", + target_debug_printf_nofunc ("<- %s->call_history_from (%s, %s, %s)", this->beneath ()->shortname (), target_debug_print_ULONGEST (arg0).c_str (), target_debug_print_int (arg1).c_str (), @@ -4317,10 +4159,9 @@ dummy_target::call_history_range (ULONGEST arg0, ULONGEST arg1, record_print_fla void debug_target::call_history_range (ULONGEST arg0, ULONGEST arg1, record_print_flags arg2) { - gdb_printf (gdb_stdlog, "-> %s->call_history_range (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->call_history_range (...)", this->beneath ()->shortname ()); this->beneath ()->call_history_range (arg0, arg1, arg2); - gdb_printf (gdb_stdlog, - "<- %s->call_history_range (%s, %s, %s)\n", + target_debug_printf_nofunc ("<- %s->call_history_range (%s, %s, %s)", this->beneath ()->shortname (), target_debug_print_ULONGEST (arg0).c_str (), target_debug_print_ULONGEST (arg1).c_str (), @@ -4342,11 +4183,10 @@ dummy_target::augmented_libraries_svr4_read () bool debug_target::augmented_libraries_svr4_read () { - gdb_printf (gdb_stdlog, "-> %s->augmented_libraries_svr4_read (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->augmented_libraries_svr4_read (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->augmented_libraries_svr4_read (); - gdb_printf (gdb_stdlog, - "<- %s->augmented_libraries_svr4_read () = %s\n", + target_debug_printf_nofunc ("<- %s->augmented_libraries_svr4_read () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -4367,11 +4207,10 @@ dummy_target::get_unwinder () const struct frame_unwind * debug_target::get_unwinder () { - gdb_printf (gdb_stdlog, "-> %s->get_unwinder (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->get_unwinder (...)", this->beneath ()->shortname ()); const struct frame_unwind * result = this->beneath ()->get_unwinder (); - gdb_printf (gdb_stdlog, - "<- %s->get_unwinder () = %s\n", + target_debug_printf_nofunc ("<- %s->get_unwinder () = %s", this->beneath ()->shortname (), target_debug_print_const_frame_unwind_p (result).c_str ()); return result; @@ -4392,11 +4231,10 @@ dummy_target::get_tailcall_unwinder () const struct frame_unwind * debug_target::get_tailcall_unwinder () { - gdb_printf (gdb_stdlog, "-> %s->get_tailcall_unwinder (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->get_tailcall_unwinder (...)", this->beneath ()->shortname ()); const struct frame_unwind * result = this->beneath ()->get_tailcall_unwinder (); - gdb_printf (gdb_stdlog, - "<- %s->get_tailcall_unwinder () = %s\n", + target_debug_printf_nofunc ("<- %s->get_tailcall_unwinder () = %s", this->beneath ()->shortname (), target_debug_print_const_frame_unwind_p (result).c_str ()); return result; @@ -4416,10 +4254,9 @@ dummy_target::prepare_to_generate_core () void debug_target::prepare_to_generate_core () { - gdb_printf (gdb_stdlog, "-> %s->prepare_to_generate_core (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->prepare_to_generate_core (...)", this->beneath ()->shortname ()); this->beneath ()->prepare_to_generate_core (); - gdb_printf (gdb_stdlog, - "<- %s->prepare_to_generate_core ()\n", + target_debug_printf_nofunc ("<- %s->prepare_to_generate_core ()", this->beneath ()->shortname ()); } @@ -4437,10 +4274,9 @@ dummy_target::done_generating_core () void debug_target::done_generating_core () { - gdb_printf (gdb_stdlog, "-> %s->done_generating_core (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->done_generating_core (...)", this->beneath ()->shortname ()); this->beneath ()->done_generating_core (); - gdb_printf (gdb_stdlog, - "<- %s->done_generating_core ()\n", + target_debug_printf_nofunc ("<- %s->done_generating_core ()", this->beneath ()->shortname ()); } @@ -4459,11 +4295,10 @@ dummy_target::supports_memory_tagging () bool debug_target::supports_memory_tagging () { - gdb_printf (gdb_stdlog, "-> %s->supports_memory_tagging (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->supports_memory_tagging (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->supports_memory_tagging (); - gdb_printf (gdb_stdlog, - "<- %s->supports_memory_tagging () = %s\n", + target_debug_printf_nofunc ("<- %s->supports_memory_tagging () = %s", this->beneath ()->shortname (), target_debug_print_bool (result).c_str ()); return result; @@ -4484,11 +4319,10 @@ dummy_target::fetch_memtags (CORE_ADDR arg0, size_t arg1, gdb::byte_vector &arg2 bool debug_target::fetch_memtags (CORE_ADDR arg0, size_t arg1, gdb::byte_vector &arg2, int arg3) { - gdb_printf (gdb_stdlog, "-> %s->fetch_memtags (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->fetch_memtags (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->fetch_memtags (arg0, arg1, arg2, arg3); - gdb_printf (gdb_stdlog, - "<- %s->fetch_memtags (%s, %s, %s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->fetch_memtags (%s, %s, %s, %s) = %s", this->beneath ()->shortname (), target_debug_print_CORE_ADDR (arg0).c_str (), target_debug_print_size_t (arg1).c_str (), @@ -4513,11 +4347,10 @@ dummy_target::store_memtags (CORE_ADDR arg0, size_t arg1, const gdb::byte_vector bool debug_target::store_memtags (CORE_ADDR arg0, size_t arg1, const gdb::byte_vector &arg2, int arg3) { - gdb_printf (gdb_stdlog, "-> %s->store_memtags (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->store_memtags (...)", this->beneath ()->shortname ()); bool result = this->beneath ()->store_memtags (arg0, arg1, arg2, arg3); - gdb_printf (gdb_stdlog, - "<- %s->store_memtags (%s, %s, %s, %s) = %s\n", + target_debug_printf_nofunc ("<- %s->store_memtags (%s, %s, %s, %s) = %s", this->beneath ()->shortname (), target_debug_print_CORE_ADDR (arg0).c_str (), target_debug_print_size_t (arg1).c_str (), @@ -4542,11 +4375,10 @@ dummy_target::fetch_x86_xsave_layout () x86_xsave_layout debug_target::fetch_x86_xsave_layout () { - gdb_printf (gdb_stdlog, "-> %s->fetch_x86_xsave_layout (...)\n", this->beneath ()->shortname ()); + target_debug_printf_nofunc ("-> %s->fetch_x86_xsave_layout (...)", this->beneath ()->shortname ()); x86_xsave_layout result = this->beneath ()->fetch_x86_xsave_layout (); - gdb_printf (gdb_stdlog, - "<- %s->fetch_x86_xsave_layout () = %s\n", + target_debug_printf_nofunc ("<- %s->fetch_x86_xsave_layout () = %s", this->beneath ()->shortname (), target_debug_print_x86_xsave_layout (result).c_str ()); return result; diff --git a/gdb/target.c b/gdb/target.c index cdaaf253cbcd..6968a56ddc5e 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -110,6 +110,16 @@ bool may_stop = true; static unsigned int targetdebug = 0; +/* Print a "target" debug statement with the function name prefix. */ + +#define target_debug_printf(fmt, ...) \ + debug_prefixed_printf_cond (targetdebug > 0, "target", fmt, ##__VA_ARGS__) + +/* Print a "target" debug statement without the function name prefix. */ + +#define target_debug_printf_nofunc(fmt, ...) \ + debug_prefixed_printf_cond_nofunc (targetdebug > 0, "target", fmt, ##__VA_ARGS__) + static void set_targetdebug (const char *args, int from_tty, struct cmd_list_element *c) { @@ -816,15 +826,9 @@ open_target (const char *args, int from_tty, struct cmd_list_element *command) auto *ti = static_cast (command->context ()); target_open_ftype *func = target_factories[ti]; - if (targetdebug) - gdb_printf (gdb_stdlog, "-> %s->open (...)\n", - ti->shortname); - + target_debug_printf_nofunc ("-> %s->open (...)", ti->shortname); func (args, from_tty); - - if (targetdebug) - gdb_printf (gdb_stdlog, "<- %s->open (%s, %d)\n", - ti->shortname, args, from_tty); + target_debug_printf_nofunc ("<- %s->open (%s, %d)", ti->shortname, args, from_tty); } /* See target.h. */ @@ -1151,8 +1155,7 @@ target_ops_ref_policy::decref (target_ops *t) t->close (); - if (targetdebug) - gdb_printf (gdb_stdlog, "closing target\n"); + target_debug_printf_nofunc ("closing target"); } } @@ -1687,18 +1690,15 @@ target_xfer_partial (struct target_ops *ops, if (targetdebug) { const unsigned char *myaddr = NULL; - - gdb_printf (gdb_stdlog, - "%s:target_xfer_partial " - "(%d, %s, %s, %s, %s, %s) = %d, %s", - ops->shortname (), - (int) object, - (annex ? annex : "(null)"), - host_address_to_string (readbuf), - host_address_to_string (writebuf), - core_addr_to_string_nz (offset), - pulongest (len), retval, - pulongest (*xfered_len)); + std::string s + = string_printf ("%s:target_xfer_partial " + "(%d, %s, %s, %s, %s, %s) = %d, %s", + ops->shortname (), (int) object, + (annex ? annex : "(null)"), + host_address_to_string (readbuf), + host_address_to_string (writebuf), + core_addr_to_string_nz (offset), pulongest (len), + retval, pulongest (*xfered_len)); if (readbuf) myaddr = readbuf; @@ -1708,24 +1708,26 @@ target_xfer_partial (struct target_ops *ops, { int i; - gdb_puts (", bytes =", gdb_stdlog); + string_appendf (s, ", bytes ="); for (i = 0; i < *xfered_len; i++) { if ((((intptr_t) &(myaddr[i])) & 0xf) == 0) { if (targetdebug < 2 && i > 0) { - gdb_printf (gdb_stdlog, " ..."); + string_appendf (s, " ..."); break; } - gdb_printf (gdb_stdlog, "\n"); + + target_debug_printf_nofunc ("%s", s.c_str ()); + s.clear(); } - gdb_printf (gdb_stdlog, " %02x", myaddr[i] & 0xff); + string_appendf (s, " %02x", myaddr[i] & 0xff); } } - gdb_putc ('\n', gdb_stdlog); + target_debug_printf_nofunc ("%s", s.c_str ()); } /* Check implementations of to_xfer_partial update *XFERED_LEN @@ -2938,10 +2940,7 @@ target_info_proc (const char *args, enum info_proc_what what) { if (t->info_proc (args, what)) { - if (targetdebug) - gdb_printf (gdb_stdlog, - "target_info_proc (\"%s\", %d)\n", args, what); - + target_debug_printf_nofunc ("target_info_proc (\"%s\", %d)", args, what); return 1; } } @@ -3232,14 +3231,9 @@ target_fileio_open (struct inferior *inf, const char *filename, else fd = acquire_fileio_fd (t, fd); - if (targetdebug) - gdb_printf (gdb_stdlog, - "target_fileio_open (%d,%s,0x%x,0%o,%d)" - " = %d (%d)\n", - inf == NULL ? 0 : inf->num, - filename, flags, mode, - warn_if_slow, fd, - fd != -1 ? 0 : *target_errno); + target_debug_printf_nofunc ("target_fileio_open (%d,%s,0x%x,0%o,%d) = %d (%d)", + inf == NULL ? 0 : inf->num, filename, flags, mode, + warn_if_slow, fd, fd != -1 ? 0 : *target_errno); return fd; } @@ -3264,12 +3258,9 @@ target_fileio_pwrite (int fd, const gdb_byte *write_buf, int len, ret = fh->target->fileio_pwrite (fh->target_fd, write_buf, len, offset, target_errno); - if (targetdebug) - gdb_printf (gdb_stdlog, - "target_fileio_pwrite (%d,...,%d,%s) " - "= %d (%d)\n", - fd, len, pulongest (offset), - ret, ret != -1 ? 0 : *target_errno); + target_debug_printf_nofunc ("target_fileio_pwrite (%d,...,%d,%s) = %d (%d)", fd, + len, pulongest (offset), ret, + ret != -1 ? 0 : *target_errno); return ret; } @@ -3290,12 +3281,8 @@ target_fileio_pread (int fd, gdb_byte *read_buf, int len, ret = fh->target->fileio_pread (fh->target_fd, read_buf, len, offset, target_errno); - if (targetdebug) - gdb_printf (gdb_stdlog, - "target_fileio_pread (%d,...,%d,%s) " - "= %d (%d)\n", - fd, len, pulongest (offset), - ret, ret != -1 ? 0 : *target_errno); + target_debug_printf_nofunc ("target_fileio_pread (%d,...,%d,%s) = %d (%d)", fd, len, + pulongest (offset), ret, ret != -1 ? 0 : *target_errno); return ret; } @@ -3314,10 +3301,8 @@ target_fileio_fstat (int fd, struct stat *sb, fileio_error *target_errno) else ret = fh->target->fileio_fstat (fh->target_fd, sb, target_errno); - if (targetdebug) - gdb_printf (gdb_stdlog, - "target_fileio_fstat (%d) = %d (%d)\n", - fd, ret, ret != -1 ? 0 : *target_errno); + target_debug_printf_nofunc ("target_fileio_fstat (%d) = %d (%d)", fd, ret, + ret != -1 ? 0 : *target_errno); return ret; } @@ -3341,10 +3326,8 @@ target_fileio_close (int fd, fileio_error *target_errno) release_fileio_fd (fd, fh); } - if (targetdebug) - gdb_printf (gdb_stdlog, - "target_fileio_close (%d) = %d (%d)\n", - fd, ret, ret != -1 ? 0 : *target_errno); + target_debug_printf_nofunc ("target_fileio_close (%d) = %d (%d)", fd, ret, + ret != -1 ? 0 : *target_errno); return ret; } @@ -3361,12 +3344,9 @@ target_fileio_unlink (struct inferior *inf, const char *filename, if (ret == -1 && *target_errno == FILEIO_ENOSYS) continue; - if (targetdebug) - gdb_printf (gdb_stdlog, - "target_fileio_unlink (%d,%s)" - " = %d (%d)\n", - inf == NULL ? 0 : inf->num, filename, - ret, ret != -1 ? 0 : *target_errno); + target_debug_printf_nofunc ("target_fileio_unlink (%d,%s) = %d (%d)", + inf == NULL ? 0 : inf->num, filename, ret, + ret != -1 ? 0 : *target_errno); return ret; } @@ -3388,13 +3368,10 @@ target_fileio_readlink (struct inferior *inf, const char *filename, if (!ret.has_value () && *target_errno == FILEIO_ENOSYS) continue; - if (targetdebug) - gdb_printf (gdb_stdlog, - "target_fileio_readlink (%d,%s)" - " = %s (%d)\n", - inf == NULL ? 0 : inf->num, - filename, ret ? ret->c_str () : "(nil)", - ret ? 0 : *target_errno); + target_debug_printf_nofunc ("target_fileio_readlink (%d,%s) = %s (%d)", + inf == NULL ? 0 : inf->num, filename, + ret ? ret->c_str () : "(nil)", + ret ? 0 : *target_errno); return ret; } @@ -3888,9 +3865,7 @@ void target_fetch_registers (struct regcache *regcache, int regno) { current_inferior ()->top_target ()->fetch_registers (regcache, regno); - if (targetdebug) - gdb_printf (gdb_stdlog, "target_fetch_registers: %s", - regcache->debug_print_register (regno).c_str ()); + target_debug_printf ("%s", regcache->debug_print_register (regno).c_str ()); } void @@ -3900,9 +3875,7 @@ target_store_registers (struct regcache *regcache, int regno) error (_("Writing to registers is not allowed (regno %d)"), regno); current_inferior ()->top_target ()->store_registers (regcache, regno); - if (targetdebug) - gdb_printf (gdb_stdlog, "target_store_registers: %s", - regcache->debug_print_register (regno).c_str ()); + target_debug_printf ("%s", regcache->debug_print_register (regno).c_str ()); } int