From patchwork Tue Feb 28 11:27:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aktemur, Tankut Baris" X-Patchwork-Id: 65736 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 326E0385842A for ; Tue, 28 Feb 2023 11:29:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 326E0385842A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1677583778; bh=Gtcovufc+2zq2W+zCndoM28R/0ebohtKrwjn579uMFs=; 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=GnpdoKVss+7v4tN8pMqXa1Kf8RvznbTGR5BWsKSMIl/hHYZ0WXsXWacd3DCJUmiSP rN2tx/x1lDwqwXpQGcO9cXalB2UtM3l4y6xGO4pzo3Xl4TH9JgzM28HETjzYm+UnVX eOXEh1nRYDbHYH8Y5R88TH3q0qR3kjDrVt5Z9mqU= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by sourceware.org (Postfix) with ESMTPS id 448D03858C53 for ; Tue, 28 Feb 2023 11:29:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 448D03858C53 X-IronPort-AV: E=McAfee;i="6500,9779,10634"; a="335597997" X-IronPort-AV: E=Sophos;i="5.98,221,1673942400"; d="scan'208";a="335597997" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Feb 2023 03:28:44 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10634"; a="706541647" X-IronPort-AV: E=Sophos;i="5.98,221,1673942400"; d="scan'208";a="706541647" Received: from ultl2604.iul.intel.com (HELO localhost) ([172.28.48.47]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Feb 2023 03:28:43 -0800 To: gdb-patches@sourceware.org Subject: [PATCH 01/26] gdbserver: convert init_register_cache into regcache::initialize Date: Tue, 28 Feb 2023 12:27:59 +0100 Message-Id: <696f1910a4f60993f28541e1a6e41be9f65f6a20.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.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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: "Aktemur, Tankut Baris" Reply-To: Tankut Baris Aktemur Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This is a refactoring that converts the `init_register_cache` function to a method of the regcache struct. During this conversion, we also change the return type to void. --- gdbserver/regcache.cc | 32 +++++++++++++++----------------- gdbserver/regcache.h | 7 +++---- gdbserver/tracepoint.cc | 9 ++++----- 3 files changed, 22 insertions(+), 26 deletions(-) diff --git a/gdbserver/regcache.cc b/gdbserver/regcache.cc index 0b1141662ac..7987c406ab4 100644 --- a/gdbserver/regcache.cc +++ b/gdbserver/regcache.cc @@ -113,10 +113,9 @@ regcache_invalidate (void) #endif -struct regcache * -init_register_cache (struct regcache *regcache, - const struct target_desc *tdesc, - unsigned char *regbuf) +void +regcache::initialize (const target_desc *tdesc, + unsigned char *regbuf) { if (regbuf == NULL) { @@ -125,13 +124,13 @@ init_register_cache (struct regcache *regcache, created, in case there are registers the target never fetches. This way they'll read as zero instead of garbage. */ - regcache->tdesc = tdesc; - regcache->registers + this->tdesc = tdesc; + this->registers = (unsigned char *) xcalloc (1, tdesc->registers_size); - regcache->registers_owned = 1; - regcache->register_status + this->registers_owned = 1; + this->register_status = (unsigned char *) xmalloc (tdesc->reg_defs.size ()); - memset ((void *) regcache->register_status, REG_UNAVAILABLE, + memset ((void *) this->register_status, REG_UNAVAILABLE, tdesc->reg_defs.size ()); #else gdb_assert_not_reached ("can't allocate memory from the heap"); @@ -139,17 +138,15 @@ init_register_cache (struct regcache *regcache, } else { - regcache->tdesc = tdesc; - regcache->registers = regbuf; - regcache->registers_owned = 0; + this->tdesc = tdesc; + this->registers = regbuf; + this->registers_owned = 0; #ifndef IN_PROCESS_AGENT - regcache->register_status = NULL; + this->register_status = nullptr; #endif } - regcache->registers_valid = 0; - - return regcache; + this->registers_valid = 0; } #ifndef IN_PROCESS_AGENT @@ -160,8 +157,9 @@ new_register_cache (const struct target_desc *tdesc) struct regcache *regcache = new struct regcache; gdb_assert (tdesc->registers_size != 0); + regcache->initialize (tdesc, nullptr); - return init_register_cache (regcache, tdesc, NULL); + return regcache; } void diff --git a/gdbserver/regcache.h b/gdbserver/regcache.h index 7248bcf5808..15b7e2b4dff 100644 --- a/gdbserver/regcache.h +++ b/gdbserver/regcache.h @@ -46,6 +46,9 @@ struct regcache : public reg_buffer_common unsigned char *register_status = nullptr; #endif + /* Init the regcache data. */ + void initialize (const target_desc *tdesc, unsigned char *regbuf); + /* See gdbsupport/common-regcache.h. */ enum register_status get_register_status (int regnum) const override; @@ -59,10 +62,6 @@ struct regcache : public reg_buffer_common bool raw_compare (int regnum, const void *buf, int offset) const override; }; -struct regcache *init_register_cache (struct regcache *regcache, - const struct target_desc *tdesc, - unsigned char *regbuf); - void regcache_cpy (struct regcache *dst, struct regcache *src); /* Create a new register cache for INFERIOR. */ diff --git a/gdbserver/tracepoint.cc b/gdbserver/tracepoint.cc index 3f60989e4c7..e4715b95eb3 100644 --- a/gdbserver/tracepoint.cc +++ b/gdbserver/tracepoint.cc @@ -4706,7 +4706,7 @@ get_context_regcache (struct tracepoint_hit_ctx *ctx) if (!fctx->regcache_initted) { fctx->regcache_initted = 1; - init_register_cache (&fctx->regcache, ipa_tdesc, fctx->regspace); + fctx->regcache.initialize (ipa_tdesc, fctx->regspace); supply_regblock (&fctx->regcache, NULL); supply_fast_tracepoint_registers (&fctx->regcache, fctx->regs); } @@ -4721,7 +4721,7 @@ get_context_regcache (struct tracepoint_hit_ctx *ctx) if (!sctx->regcache_initted) { sctx->regcache_initted = 1; - init_register_cache (&sctx->regcache, ipa_tdesc, sctx->regspace); + sctx->regcache.initialize (ipa_tdesc, sctx->regspace); supply_regblock (&sctx->regcache, NULL); /* Pass down the tracepoint address, because REGS doesn't include the PC, but we know what it must have been. */ @@ -4799,8 +4799,7 @@ do_action_at_tracepoint (struct tracepoint_hit_ctx *ctx, /* Wrap the regblock in a register cache (in the stack, we don't want to malloc here). */ - init_register_cache (&tregcache, context_regcache->tdesc, - regspace + 1); + tregcache.initialize (context_regcache->tdesc, regspace + 1); /* Copy the register data to the regblock. */ regcache_cpy (&tregcache, context_regcache); @@ -5207,7 +5206,7 @@ traceframe_get_pc (struct traceframe *tframe) if (dataptr == NULL) return 0; - init_register_cache (®cache, tdesc, dataptr); + regcache.initialize (tdesc, dataptr); return regcache_read_pc (®cache); }