aarch64-fbsd: Use a static regset for the TLS register set.

This uses custom collect/supply regset handlers which pass the TLS
register number from the gdbarch_tdep as the base register number.

diff --git a/gdb/aarch64-fbsd-nat.c b/gdb/aarch64-fbsd-nat.c
index d8cf6227e73bdc463744a6d74ac224a808afa994..4c8e9c4fa81af97e0d9e99c5cb34511becb6e471 100644 (file)
--- 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 12575ffdc4e32fc9bba13415912bed211b9dd212..a5931e83af194196d9f96ce294096b331664f921 100644 (file)
--- a/gdb/aarch64-fbsd-tdep.c
+++ b/gdb/aarch64-fbsd-tdep.c
@@ -69,6 +69,12 @@ static const struct regcache_map_entry aarch64_fbsd_capregmap[] =
 
 #define        TAGMASK_OFFSET          (16 * 40)
 
+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:
 
@@ -332,6 +338,34 @@ const struct regset aarch64_fbsd_capregset =
     aarch64_fbsd_supply_capregset, aarch64_fbsd_collect_capregset
   };
 
+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
@@ -348,23 +382,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);
 
   if (tdep->has_capability ())
     cb (".reg-cap", AARCH64_FBSD_SIZEOF_CAPREGSET,

diff --git a/gdb/aarch64-fbsd-tdep.h b/gdb/aarch64-fbsd-tdep.h
index a01a6c81a1be1a08c1c95394ab7b48d273d42c81..aa003ed3387d735e340b5a9d986e50966375ef67 100644 (file)
--- a/gdb/aarch64-fbsd-tdep.h
+++ b/gdb/aarch64-fbsd-tdep.h
@@ -43,5 +43,6 @@
 extern const struct regset aarch64_fbsd_gregset;
 extern const struct regset aarch64_fbsd_fpregset;
 extern const struct regset aarch64_fbsd_capregset;
+extern const struct regset aarch64_fbsd_tls_regset;
 
 #endif /* AARCH64_FBSD_TDEP_H */