From patchwork Tue Feb 28 11:28:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tankut Baris Aktemur X-Patchwork-Id: 65739 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 D59ED385086A for ; Tue, 28 Feb 2023 11:30:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D59ED385086A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1677583814; bh=14T3MtOC8lUCzmhTuWUWjdrPo2fuypf4UnII7ATD8TI=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=Mak4DrZqTvVq0yDQZMzzCbeG3R3hZgjKnoI3fcMKxpfq/TlJmTx+fF5rJiTU0gxzR yrY62nMUzDXx2tetxD8MV3UH+6p7KpxdeWLuA8IZhhIig87Ai0avHoBM+Dcr1gZ7q+ SSaReb0TPaZzU9d8q/MFS0bHdxSAybAXIE7GqGrs= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by sourceware.org (Postfix) with ESMTPS id 86CE4385559E for ; Tue, 28 Feb 2023 11:29:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 86CE4385559E X-IronPort-AV: E=McAfee;i="6500,9779,10634"; a="396679527" X-IronPort-AV: E=Sophos;i="5.98,221,1673942400"; d="scan'208";a="396679527" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Feb 2023 03:29:47 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10634"; a="919748308" X-IronPort-AV: E=Sophos;i="5.98,221,1673942400"; d="scan'208";a="919748308" Received: from ultl2604.iul.intel.com (HELO localhost) ([172.28.48.47]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Feb 2023 03:29:44 -0800 To: gdb-patches@sourceware.org Subject: [PATCH 10/26] gdbserver: convert registers_to_string into regcache::registers_to_string Date: Tue, 28 Feb 2023 12:28:08 +0100 Message-Id: <5ff95fd684084ed53879f1c2c5f96be1a9d4a59a.1677582744.git.tankut.baris.aktemur@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_NONE, 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.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tankut Baris Aktemur via Gdb-patches From: Tankut Baris Aktemur Reply-To: Tankut Baris Aktemur Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Convert the free `registers_to_string` function into a method of the regcache struct. --- gdbserver/regcache.cc | 12 +++++------- gdbserver/regcache.h | 9 ++++----- gdbserver/server.cc | 4 ++-- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/gdbserver/regcache.cc b/gdbserver/regcache.cc index 1db78951cc2..92dc6fc921c 100644 --- a/gdbserver/regcache.cc +++ b/gdbserver/regcache.cc @@ -214,16 +214,14 @@ find_register_by_number (const struct target_desc *tdesc, int n) #ifndef IN_PROCESS_AGENT void -registers_to_string (struct regcache *regcache, char *buf) +regcache::registers_to_string (char *buf) { - unsigned char *registers = regcache->registers; - const struct target_desc *tdesc = regcache->tdesc; - + unsigned char *regs = registers; for (int i = 0; i < tdesc->reg_defs.size (); ++i) { - if (regcache->register_status[i] == REG_VALID) + if (register_status[i] == REG_VALID) { - bin2hex (registers, buf, register_size (tdesc, i)); + bin2hex (regs, buf, register_size (tdesc, i)); buf += register_size (tdesc, i) * 2; } else @@ -231,7 +229,7 @@ registers_to_string (struct regcache *regcache, char *buf) memset (buf, 'x', register_size (tdesc, i) * 2); buf += register_size (tdesc, i) * 2; } - registers += register_size (tdesc, i); + regs += register_size (tdesc, i); } *buf = '\0'; } diff --git a/gdbserver/regcache.h b/gdbserver/regcache.h index b4a9d8864ae..bed3151dcad 100644 --- a/gdbserver/regcache.h +++ b/gdbserver/regcache.h @@ -84,6 +84,10 @@ struct regcache : public reg_buffer_common /* Discard the cache without storing the registers to the target. */ void discard (); + + /* Convert all registers to a string in the currently specified remote + format. */ + void registers_to_string (char *buf); }; regcache *get_thread_regcache (thread_info *thread, bool fetch = true); @@ -106,11 +110,6 @@ void regcache_invalidate (void); void regcache_release (void); -/* Convert all registers to a string in the currently specified remote - format. */ - -void registers_to_string (struct regcache *regcache, char *buf); - /* Convert a string to register values and fill our register cache. */ void registers_from_string (struct regcache *regcache, char *buf); diff --git a/gdbserver/server.cc b/gdbserver/server.cc index 521f13c07d7..f540cc86f7b 100644 --- a/gdbserver/server.cc +++ b/gdbserver/server.cc @@ -4241,7 +4241,7 @@ process_serial_event (void) if (fetch_traceframe_registers (cs.current_traceframe, &a_regcache, -1) == 0) - registers_to_string (&a_regcache, cs.own_buf); + a_regcache.registers_to_string (cs.own_buf); else write_enn (cs.own_buf); } @@ -4254,7 +4254,7 @@ process_serial_event (void) else { regcache = get_thread_regcache (current_thread); - registers_to_string (regcache, cs.own_buf); + regcache->registers_to_string (cs.own_buf); } } break;