From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.baldwin.cx (bigwig.baldwin.cx [66.216.25.90]) by sourceware.org (Postfix) with ESMTPS id 510683857B8F for ; Fri, 8 Jul 2022 01:03:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 510683857B8F 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 3C57A1A84E2A for ; Thu, 7 Jul 2022 21:03:35 -0400 (EDT) From: John Baldwin To: gdb-patches@sourceware.org Subject: [PATCH 5/5] aarch64-fbsd: Use a static regset for the TLS register set. Date: Thu, 7 Jul 2022 17:58:16 -0700 Message-Id: <20220708005816.9408-6-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:35 -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:42 -0000 This uses custom collect/supply regset handlers which pass the TLS register number from the gdbarch_tdep as the base register number. --- gdb/aarch64-fbsd-nat.c | 36 +++------------------------ gdb/aarch64-fbsd-tdep.c | 54 ++++++++++++++++++++++++++++------------- gdb/aarch64-fbsd-tdep.h | 1 + 3 files changed, 42 insertions(+), 49 deletions(-) diff --git a/gdb/aarch64-fbsd-nat.c b/gdb/aarch64-fbsd-nat.c index d8cf6227e73..4c8e9c4fa81 100644 --- a/gdb/aarch64-fbsd-nat.c +++ b/gdb/aarch64-fbsd-nat.c @@ -92,22 +92,8 @@ aarch64_fbsd_nat_target::fetch_registers (struct regcache *regcache, gdbarch *gdbarch = regcache->arch (); aarch64_gdbarch_tdep *tdep = (aarch64_gdbarch_tdep *) gdbarch_tdep (gdbarch); if (tdep->has_tls ()) - { - const struct regcache_map_entry aarch64_fbsd_tls_regmap[] = - { - { 1, tdep->tls_regnum, 8 }, - { 0 } - }; - - const struct regset aarch64_fbsd_tls_regset = - { - aarch64_fbsd_tls_regmap, - regcache_supply_regset, regcache_collect_regset - }; - - fetch_regset (regcache, regnum, NT_ARM_TLS, - &aarch64_fbsd_tls_regset); - } + fetch_regset (regcache, regnum, NT_ARM_TLS, + &aarch64_fbsd_tls_regset, tdep->tls_regnum); } /* Store register REGNUM back into the inferior. If REGNUM is -1, do @@ -125,22 +111,8 @@ aarch64_fbsd_nat_target::store_registers (struct regcache *regcache, gdbarch *gdbarch = regcache->arch (); aarch64_gdbarch_tdep *tdep = (aarch64_gdbarch_tdep *) gdbarch_tdep (gdbarch); if (tdep->has_tls ()) - { - const struct regcache_map_entry aarch64_fbsd_tls_regmap[] = - { - { 1, tdep->tls_regnum, 8 }, - { 0 } - }; - - const struct regset aarch64_fbsd_tls_regset = - { - aarch64_fbsd_tls_regmap, - regcache_supply_regset, regcache_collect_regset - }; - - store_regset (regcache, regnum, NT_ARM_TLS, - &aarch64_fbsd_tls_regset); - } + store_regset (regcache, regnum, NT_ARM_TLS, + &aarch64_fbsd_tls_regset, tdep->tls_regnum); } /* Implement the target read_description method. */ diff --git a/gdb/aarch64-fbsd-tdep.c b/gdb/aarch64-fbsd-tdep.c index 891546b3c64..d7d15009efe 100644 --- a/gdb/aarch64-fbsd-tdep.c +++ b/gdb/aarch64-fbsd-tdep.c @@ -50,6 +50,12 @@ static const struct regcache_map_entry aarch64_fbsd_fpregmap[] = { 0 } }; +static const struct regcache_map_entry aarch64_fbsd_tls_regmap[] = + { + { 1, 0, 8 }, + { 0 } + }; + /* In a signal frame, sp points to a 'struct sigframe' which is defined as: @@ -135,6 +141,34 @@ const struct regset aarch64_fbsd_fpregset = regcache_supply_regset, regcache_collect_regset }; +static void +aarch64_fbsd_supply_tls_regset (const struct regset *regset, + struct regcache *regcache, + int regnum, const void *buf, size_t size) +{ + struct gdbarch *gdbarch = regcache->arch (); + aarch64_gdbarch_tdep *tdep = (aarch64_gdbarch_tdep *) gdbarch_tdep (gdbarch); + + regcache->supply_regset (regset, tdep->tls_regnum, regnum, buf, size); +} + +static void +aarch64_fbsd_collect_tls_regset (const struct regset *regset, + const struct regcache *regcache, + int regnum, void *buf, size_t size) +{ + struct gdbarch *gdbarch = regcache->arch (); + aarch64_gdbarch_tdep *tdep = (aarch64_gdbarch_tdep *) gdbarch_tdep (gdbarch); + + regcache->collect_regset (regset, tdep->tls_regnum, regnum, buf, size); +} + +const struct regset aarch64_fbsd_tls_regset = + { + aarch64_fbsd_tls_regmap, + aarch64_fbsd_supply_tls_regset, aarch64_fbsd_collect_tls_regset + }; + /* Implement the "iterate_over_regset_sections" gdbarch method. */ static void @@ -151,23 +185,9 @@ aarch64_fbsd_iterate_over_regset_sections (struct gdbarch *gdbarch, &aarch64_fbsd_fpregset, NULL, cb_data); if (tdep->has_tls ()) - { - const struct regcache_map_entry aarch64_fbsd_tls_regmap[] = - { - { 1, tdep->tls_regnum, 8 }, - { 0 } - }; - - const struct regset aarch64_fbsd_tls_regset = - { - aarch64_fbsd_tls_regmap, - regcache_supply_regset, regcache_collect_regset - }; - - cb (".reg-aarch-tls", AARCH64_FBSD_SIZEOF_TLSREGSET, - AARCH64_FBSD_SIZEOF_TLSREGSET, &aarch64_fbsd_tls_regset, - "TLS register", cb_data); - } + cb (".reg-aarch-tls", AARCH64_FBSD_SIZEOF_TLSREGSET, + AARCH64_FBSD_SIZEOF_TLSREGSET, &aarch64_fbsd_tls_regset, + "TLS register", cb_data); } /* Implement the "core_read_description" gdbarch method. */ diff --git a/gdb/aarch64-fbsd-tdep.h b/gdb/aarch64-fbsd-tdep.h index 7419ea6be03..eaf0774f595 100644 --- a/gdb/aarch64-fbsd-tdep.h +++ b/gdb/aarch64-fbsd-tdep.h @@ -37,5 +37,6 @@ extern const struct regset aarch64_fbsd_gregset; extern const struct regset aarch64_fbsd_fpregset; +extern const struct regset aarch64_fbsd_tls_regset; #endif /* AARCH64_FBSD_TDEP_H */ -- 2.36.1