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