[PATCH 5/5] aarch64-fbsd: Use a static regset for the TLS register set.

John Baldwin
2022-07-08T01:04:35Z

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<uint64_t> (regcache, regnum, NT_ARM_TLS,
- &aarch64_fbsd_tls_regset);
- }
+ fetch_regset<uint64_t> (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<uint64_t> (regcache, regnum, NT_ARM_TLS,
- &aarch64_fbsd_tls_regset);
- }
+ store_regset<uint64_t> (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