From patchwork Fri Apr 19 19:46:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 88761 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 03D7F3849ADC for ; Fri, 19 Apr 2024 19:48:10 +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 2296B3849ADC for ; Fri, 19 Apr 2024 19:47:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2296B3849ADC 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 2296B3849ADC 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=1713556061; cv=none; b=f2Hv/iDLZYC1g42PVvFilTd1gCUxUe2XP4vqX1WfGwKBzwCXvwj4OfWm4SaViuumml/Fc6C+7GJKHv+id0fJNAaLF1U1FI61fl9/83+iTPlLwIdHQtuu7WRNTJWCoJZMjkh/i+bMluOQgQXiFkfeO0BA+V9/jpTbLUK+1f/ISg0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713556061; c=relaxed/simple; bh=xJxE67GMniXtHnQM+mKNcprDuNog2zJR5Hfxg73nSbk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=FjtXNc7REVk098ZBFMeG4TPdD9OIEfWH7VVFJNBJinlg4c/ZcWyJYj6x/0gGfrLBk14P0mOkiMwEWMp9l1CzBnDNQ53sJLe9IaipPvtBkjSC5sUx2h3TkXVjIu84GWn5bhOQk/BPmXqntu1KY/DN8/aKCdyprq19hXDxRsJZZ3c= 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 43JJlXKr019844 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 19 Apr 2024 15:47:38 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 43JJlXKr019844 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1713556058; bh=FWvbU/oK2xBxHOwpcm7VWw7+zNu9jkQ7FcFFUQkDWLI=; h=From:To:Cc:Subject:Date:In-Reply-To:From; b=DymAeQq9bUWcom64LgifAojeeyG3qoUUUxOrOEP4BKOm6Db6vb2PxYj1OAWmdgwcN Pk0mHoEL1QAea0crKSRdxohd8pn0L4BKTJJ/3dcM9oblUbAzuGQRjAa/IOxaK45MQ7 0R2LvGsKSAHZz26/Fa9+pf0V0prIEh7U0JddjDNo= 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 545D71E0C0; Fri, 19 Apr 2024 15:47:33 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH v2 3/4] gdb: make regcache::debug_print_register return a string Date: Fri, 19 Apr 2024 15:46:53 -0400 Message-ID: <20240419194732.2276504-3-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240419194732.2276504-1-simon.marchi@polymtl.ca> References: <20240419194732.2276504-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Fri, 19 Apr 2024 19:47:33 +0000 X-Spam-Status: No, score=-3188.4 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 Rename the method to `register_debug_string`. 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..c35a8138a39a 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::register_debug_string (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..1d049fe7ae8d 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 string with the contents of a register, suitable for debug output. */ + std::string register_debug_string (int regno); protected: regcache (inferior *inf_for_target_calls, gdbarch *gdbarch); diff --git a/gdb/target.c b/gdb/target.c index 5c3c1a57dbd2..0a836d1e146e 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -3895,7 +3895,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->register_debug_string (regno).c_str ()); } void @@ -3906,9 +3907,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->register_debug_string (regno).c_str ()); } int