From patchwork Tue Feb 28 11:28:11 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: 65751 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 0E3523847839 for ; Tue, 28 Feb 2023 11:31:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0E3523847839 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1677583894; bh=Z19Mgnh8uCNRhyRpl+U9lO5mwUiOTfBrPPZU7mwZypE=; 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=qF9faXelZ2codun16eVJVS70BtJVjSNj5SrS61VSFcNdfTfBHg7zBjbxxWGKCqddG iOB/hq/UcNfxeU11e1JLsuE5LnhSgKPSUnG1gsbvWwNCjn1g0BikOlew80XO1rnAHF rJabhdaAIV85KCxXw7hlArKyo7KkYrTA/Rejv99A= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by sourceware.org (Postfix) with ESMTPS id 04DBC3858422 for ; Tue, 28 Feb 2023 11:30:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 04DBC3858422 X-IronPort-AV: E=McAfee;i="6500,9779,10634"; a="420374047" X-IronPort-AV: E=Sophos;i="5.98,221,1673942400"; d="scan'208";a="420374047" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Feb 2023 03:30:06 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10634"; a="848213489" X-IronPort-AV: E=Sophos;i="5.98,221,1673942400"; d="scan'208";a="848213489" Received: from ultl2604.iul.intel.com (HELO localhost) ([172.28.48.47]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Feb 2023 03:30:05 -0800 To: gdb-patches@sourceware.org Subject: [PATCH 13/26] gdbserver: convert register_data into regcache::register_data Date: Tue, 28 Feb 2023 12:28:11 +0100 Message-Id: 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 register_data function to a method of the regcache struct. --- gdbserver/regcache.cc | 20 ++++++++++---------- gdbserver/regcache.h | 3 +++ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/gdbserver/regcache.cc b/gdbserver/regcache.cc index 31f1e7bb3dc..79835ef4ff1 100644 --- a/gdbserver/regcache.cc +++ b/gdbserver/regcache.cc @@ -314,11 +314,11 @@ regcache_register_size (const struct regcache *regcache, int n) return register_size (regcache->tdesc, n); } -static unsigned char * -register_data (const struct regcache *regcache, int n) +unsigned char * +regcache::register_data (int regnum) const { - return (regcache->registers - + find_register_by_number (regcache->tdesc, n).offset / 8); + return (registers + + find_register_by_number (tdesc, regnum).offset / 8); } void @@ -334,7 +334,7 @@ regcache::raw_supply (int n, const void *buf) { if (buf) { - memcpy (register_data (this, n), buf, register_size (tdesc, n)); + memcpy (register_data (n), buf, register_size (tdesc, n)); #ifndef IN_PROCESS_AGENT if (register_status != NULL) register_status[n] = REG_VALID; @@ -342,7 +342,7 @@ regcache::raw_supply (int n, const void *buf) } else { - memset (register_data (this, n), 0, register_size (tdesc, n)); + memset (register_data (n), 0, register_size (tdesc, n)); #ifndef IN_PROCESS_AGENT if (register_status != NULL) register_status[n] = REG_UNAVAILABLE; @@ -355,7 +355,7 @@ regcache::raw_supply (int n, const void *buf) void supply_register_zeroed (struct regcache *regcache, int n) { - memset (register_data (regcache, n), 0, + memset (regcache->register_data (n), 0, register_size (regcache->tdesc, n)); #ifndef IN_PROCESS_AGENT if (regcache->register_status != NULL) @@ -419,7 +419,7 @@ collect_register (struct regcache *regcache, int n, void *buf) void regcache::raw_collect (int n, void *buf) const { - memcpy (buf, register_data (this, n), register_size (tdesc, n)); + memcpy (buf, register_data (n), register_size (tdesc, n)); } enum register_status @@ -458,7 +458,7 @@ regcache_raw_get_unsigned_by_name (struct regcache *regcache, void collect_register_as_string (struct regcache *regcache, int n, char *buf) { - bin2hex (register_data (regcache, n), buf, + bin2hex (regcache->register_data (n), buf, register_size (regcache->tdesc, n)); } @@ -505,7 +505,7 @@ regcache::raw_compare (int regnum, const void *buf, int offset) const { gdb_assert (buf != NULL); - const unsigned char *regbuf = register_data (this, regnum); + const unsigned char *regbuf = register_data (regnum); int size = register_size (tdesc, regnum); gdb_assert (size >= offset); diff --git a/gdbserver/regcache.h b/gdbserver/regcache.h index 944718070b4..88e6ac32bae 100644 --- a/gdbserver/regcache.h +++ b/gdbserver/regcache.h @@ -96,6 +96,9 @@ struct regcache : public reg_buffer_common to this regcache. If BUF is NULL, all the registers' values are recorded as unavailable. */ void supply_regblock (const void *buf); + + /* Return the pointer to the register with number REGNUM. */ + unsigned char *register_data (int regnum) const; }; regcache *get_thread_regcache (thread_info *thread, bool fetch = true);