From patchwork Wed Apr 17 20:54:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 88623 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 17A9A384AB66 for ; Wed, 17 Apr 2024 21:01:45 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 46C67385841E for ; Wed, 17 Apr 2024 21:01:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 46C67385841E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=polymtl.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=polymtl.ca ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 46C67385841E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=132.207.4.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713387677; cv=none; b=dDSi7MrbZ686NDCbz9cpxSd6+lr+tWjoLUPPZJg/sCVkjzFXHYPRr4CTdQ0Y4MB/MxaQEGM65FzpbIUjtvemFLVx5Ob4M1xnUHjDYhhSSIGOM1cWkL/1/PpkTqsnD4+VKYuTo+BZCtgQ7F1/fGr1YPBOGfK56Hu+oSndHFzxHEU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713387677; c=relaxed/simple; bh=Ofbsy1VyS+KKgCP+ijrCj2tdU1OyQl0elQ4jrS0mIU0=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=sK3a2VW1VYkIQIjP6fp9gAvSBJbs/LmXtSOJc4fypQZfBd68A0CapA5UmiK+4k7kA0rj48JhSzK7Gr5YhUDf2JxnLWyKYku5BR4LZhFHaD1seLqBfiqWuB3m0QW59wXgsf9CrCCQeSZ5Zn5+2NIycWS+QHGJNecGh8mjIdW7+zk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 43HL18BY039545 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Apr 2024 17:01:13 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 43HL18BY039545 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1713387674; bh=ygtjB4ZW5KcmfIbkTcX9TDYKvoYkRDKvlZI52g66OdU=; h=From:To:Cc:Subject:Date:In-Reply-To:From; b=mN4I+4lOLES0clrJKaZSKl6TeLvtD3YzTyr2N9VJRFGMgvwXPvu/Rx5O0rKeNV2tg etK0e6E9v/0FrGbnjAPCT/X0hSEFY7NcenSe+0B9+1lbdRm0BnCAYrYG64HuJfcOCf 4RE5fhhd6T5tykZJfftjq8Gk60NNCw2yXcmCC7zA= Received: from simark.localdomain (modemcable238.237-201-24.mc.videotron.ca [24.201.237.238]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id A8E631E0CE; Wed, 17 Apr 2024 16:54:28 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 5/6] gdb: make regcache::debug_print_register return a string Date: Wed, 17 Apr 2024 16:54:10 -0400 Message-ID: <20240417205426.2030615-5-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240417205426.2030615-1-simon.marchi@polymtl.ca> References: <20240417205426.2030615-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Wed, 17 Apr 2024 21:01:08 +0000 X-Spam-Status: No, score=-3188.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org From: Simon Marchi This makes it easier to introduce `target_debug_printf` in a subsequent patch. Change-Id: I5bb2d49476d17940d503e66f40762e3f1e3baabc --- gdb/regcache.c | 28 +++++++++++++++------------- gdb/regcache.h | 5 ++--- gdb/target.c | 8 ++++---- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/gdb/regcache.c b/gdb/regcache.c index b7abbe99f3cc..e673d56a7e94 100644 --- a/gdb/regcache.c +++ b/gdb/regcache.c @@ -1463,36 +1463,38 @@ reg_buffer::num_raw_registers () const return gdbarch_num_regs (arch ()); } -void -regcache::debug_print_register (const char *func, int regno) +std::string +regcache::debug_print_register (int regno) { struct gdbarch *gdbarch = arch (); + std::string s; - gdb_printf (gdb_stdlog, "%s ", func); if (regno >= 0 && regno < gdbarch_num_regs (gdbarch) && gdbarch_register_name (gdbarch, regno)[0] != '\0') - gdb_printf (gdb_stdlog, "(%s)", - gdbarch_register_name (gdbarch, regno)); + string_appendf (s, "register %s:", gdbarch_register_name (gdbarch, regno)); else - gdb_printf (gdb_stdlog, "(%d)", regno); + string_appendf (s, "register %d:", regno); + if (regno >= 0 && regno < gdbarch_num_regs (gdbarch)) { - enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); gdb::array_view buf = register_buffer (regno); - gdb_printf (gdb_stdlog, " = "); + string_appendf (s, " = "); + for (gdb_byte byte : buf) - gdb_printf (gdb_stdlog, "%02x", byte); + string_appendf (s, "%02x", byte); if (buf.size () <= sizeof (LONGEST)) { - ULONGEST val = extract_unsigned_integer (buf, byte_order); + ULONGEST val + = extract_unsigned_integer (buf, gdbarch_byte_order (gdbarch)); - gdb_printf (gdb_stdlog, " %s %s", - core_addr_to_string_nz (val), plongest (val)); + string_appendf (s, " %s %s", + core_addr_to_string_nz (val), plongest (val)); } } - gdb_printf (gdb_stdlog, "\n"); + + return s; } /* Implement 'maint flush register-cache' command. */ diff --git a/gdb/regcache.h b/gdb/regcache.h index 9ba6c79ab0d5..3c621045c163 100644 --- a/gdb/regcache.h +++ b/gdb/regcache.h @@ -454,9 +454,8 @@ class regcache : public detached_regcache this->m_ptid = ptid; } -/* Dump the contents of a register from the register cache to the target - debug. */ - void debug_print_register (const char *func, int regno); + /* Return a dump of the contents of a register, suitable for debug output. */ + std::string debug_print_register (int regno); protected: regcache (inferior *inf_for_target_calls, gdbarch *gdbarch); diff --git a/gdb/target.c b/gdb/target.c index 107a84b3ca1d..cdaaf253cbcd 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -3889,7 +3889,8 @@ target_fetch_registers (struct regcache *regcache, int regno) { current_inferior ()->top_target ()->fetch_registers (regcache, regno); if (targetdebug) - regcache->debug_print_register ("target_fetch_registers", regno); + gdb_printf (gdb_stdlog, "target_fetch_registers: %s", + regcache->debug_print_register (regno).c_str ()); } void @@ -3900,9 +3901,8 @@ target_store_registers (struct regcache *regcache, int regno) current_inferior ()->top_target ()->store_registers (regcache, regno); if (targetdebug) - { - regcache->debug_print_register ("target_store_registers", regno); - } + gdb_printf (gdb_stdlog, "target_store_registers: %s", + regcache->debug_print_register (regno).c_str ()); } int