From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.baldwin.cx (bigwig.baldwin.cx [IPv6:2607:f138:0:13::2]) by sourceware.org (Postfix) with ESMTPS id EBEAD3857B95 for ; Fri, 8 Jul 2022 01:03:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EBEAD3857B95 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=FreeBSD.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=FreeBSD.org Received: from ralph.com (ralph.baldwin.cx [66.234.199.215]) by mail.baldwin.cx (Postfix) with ESMTPSA id AA2FE1A84E29 for ; Thu, 7 Jul 2022 21:03:34 -0400 (EDT) From: John Baldwin To: gdb-patches@sourceware.org Subject: [PATCH 4/5] arm-fbsd: Use a static regset for the TLS register set. Date: Thu, 7 Jul 2022 17:58:15 -0700 Message-Id: <20220708005816.9408-5-jhb@FreeBSD.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220708005816.9408-1-jhb@FreeBSD.org> References: <20220708005816.9408-1-jhb@FreeBSD.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.4 (mail.baldwin.cx [0.0.0.0]); Thu, 07 Jul 2022 21:03:34 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.103.1 at mail.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, FORGED_SPF_HELO, GIT_PATCH_0, KAM_DMARC_STATUS, KHOP_HELO_FCRDNS, SPF_HELO_PASS, SPF_SOFTFAIL, TXREP, T_SCC_BODY_TEXT_LINE 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-List-Received-Date: Fri, 08 Jul 2022 01:03:40 -0000 This uses custom collect/supply regset handlers which pass the TLS register number from the gdbarch_tdep as the base register number. --- gdb/arm-fbsd-nat.c | 34 ++++------------------------- gdb/arm-fbsd-tdep.c | 52 +++++++++++++++++++++++++++++++-------------- gdb/arm-fbsd-tdep.h | 1 + 3 files changed, 41 insertions(+), 46 deletions(-) diff --git a/gdb/arm-fbsd-nat.c b/gdb/arm-fbsd-nat.c index a306e1e2ee0..ceda6337ab9 100644 --- a/gdb/arm-fbsd-nat.c +++ b/gdb/arm-fbsd-nat.c @@ -58,21 +58,8 @@ arm_fbsd_nat_target::fetch_registers (struct regcache *regcache, int regnum) arm_gdbarch_tdep *tdep = (arm_gdbarch_tdep *) gdbarch_tdep (gdbarch); if (tdep->tls_regnum > 0) - { - const struct regcache_map_entry arm_fbsd_tlsregmap[] = - { - { 1, tdep->tls_regnum, 4 }, - { 0 } - }; - - const struct regset arm_fbsd_tlsregset = - { - arm_fbsd_tlsregmap, - regcache_supply_regset, regcache_collect_regset - }; - - fetch_regset (regcache, regnum, NT_ARM_TLS, &arm_fbsd_tlsregset); - } + fetch_regset (regcache, regnum, NT_ARM_TLS, &arm_fbsd_tls_regset, + tdep->tls_regnum); #endif } @@ -93,21 +80,8 @@ arm_fbsd_nat_target::store_registers (struct regcache *regcache, int regnum) arm_gdbarch_tdep *tdep = (arm_gdbarch_tdep *) gdbarch_tdep (gdbarch); if (tdep->tls_regnum > 0) - { - const struct regcache_map_entry arm_fbsd_tlsregmap[] = - { - { 1, tdep->tls_regnum, 4 }, - { 0 } - }; - - const struct regset arm_fbsd_tlsregset = - { - arm_fbsd_tlsregmap, - regcache_supply_regset, regcache_collect_regset - }; - - store_regset (regcache, regnum, NT_ARM_TLS, &arm_fbsd_tlsregset); - } + store_regset (regcache, regnum, NT_ARM_TLS, &arm_fbsd_tls_regset, + tdep->tls_regnum); #endif } diff --git a/gdb/arm-fbsd-tdep.c b/gdb/arm-fbsd-tdep.c index 483820c1092..2a73643b763 100644 --- a/gdb/arm-fbsd-tdep.c +++ b/gdb/arm-fbsd-tdep.c @@ -52,6 +52,12 @@ static const struct regcache_map_entry arm_fbsd_vfpregmap[] = { 0 } }; +static const struct regcache_map_entry arm_fbsd_tls_regmap[] = + { + { 1, 0, 4 }, + { 0 } + }; + /* In a signal frame, sp points to a 'struct sigframe' which is defined as: @@ -151,6 +157,34 @@ const struct regset arm_fbsd_vfpregset = regcache_supply_regset, regcache_collect_regset }; +static void +arm_fbsd_supply_tls_regset (const struct regset *regset, + struct regcache *regcache, + int regnum, const void *buf, size_t size) +{ + struct gdbarch *gdbarch = regcache->arch (); + arm_gdbarch_tdep *tdep = (arm_gdbarch_tdep *) gdbarch_tdep (gdbarch); + + regcache->supply_regset (regset, tdep->tls_regnum, regnum, buf, size); +} + +static void +arm_fbsd_collect_tls_regset (const struct regset *regset, + const struct regcache *regcache, + int regnum, void *buf, size_t size) +{ + struct gdbarch *gdbarch = regcache->arch (); + arm_gdbarch_tdep *tdep = (arm_gdbarch_tdep *) gdbarch_tdep (gdbarch); + + regcache->collect_regset (regset, tdep->tls_regnum, regnum, buf, size); +} + +const struct regset arm_fbsd_tls_regset = + { + arm_fbsd_tls_regmap, + arm_fbsd_supply_tls_regset, arm_fbsd_collect_tls_regset + }; + /* Implement the "iterate_over_regset_sections" gdbarch method. */ static void @@ -165,22 +199,8 @@ arm_fbsd_iterate_over_regset_sections (struct gdbarch *gdbarch, &arm_fbsd_gregset, NULL, cb_data); if (tdep->tls_regnum > 0) - { - const struct regcache_map_entry arm_fbsd_tlsregmap[] = - { - { 1, tdep->tls_regnum, 4 }, - { 0 } - }; - - const struct regset arm_fbsd_tlsregset = - { - arm_fbsd_tlsregmap, - regcache_supply_regset, regcache_collect_regset - }; - - cb (".reg-aarch-tls", ARM_FBSD_SIZEOF_TLSREGSET, ARM_FBSD_SIZEOF_TLSREGSET, - &arm_fbsd_tlsregset, NULL, cb_data); - } + cb (".reg-aarch-tls", ARM_FBSD_SIZEOF_TLSREGSET, ARM_FBSD_SIZEOF_TLSREGSET, + &arm_fbsd_tls_regset, NULL, cb_data); /* While FreeBSD/arm cores do contain a NT_FPREGSET / ".reg2" register set, it is not populated with register values by the diff --git a/gdb/arm-fbsd-tdep.h b/gdb/arm-fbsd-tdep.h index 193eb76df3c..923b749367e 100644 --- a/gdb/arm-fbsd-tdep.h +++ b/gdb/arm-fbsd-tdep.h @@ -35,6 +35,7 @@ extern const struct regset arm_fbsd_gregset; extern const struct regset arm_fbsd_vfpregset; +extern const struct regset arm_fbsd_tls_regset; /* Flags passed in AT_HWCAP. */ #define HWCAP_VFP 0x00000040 -- 2.36.1