From 759bbcb917959eedca1c67a05fd43583fe20f12e Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Tue, 22 Nov 2022 14:21:13 -0800 Subject: [PATCH] arm-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. Approved-By: Simon Marchi --- gdb/arm-fbsd-nat.c | 34 ++++------------------------ gdb/arm-fbsd-tdep.c | 54 +++++++++++++++++++++++++++++++-------------- gdb/arm-fbsd-tdep.h | 1 + 3 files changed, 43 insertions(+), 46 deletions(-) diff --git a/gdb/arm-fbsd-nat.c b/gdb/arm-fbsd-nat.c index bbd722ed923..340b8e0d710 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 = 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 = 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 4395136b83c..75ee08eba50 100644 --- a/gdb/arm-fbsd-tdep.c +++ b/gdb/arm-fbsd-tdep.c @@ -52,6 +52,14 @@ static const struct regcache_map_entry arm_fbsd_vfpregmap[] = { 0 } }; +/* Register numbers are relative to tdep->tls_regnum. */ + +static const struct regcache_map_entry arm_fbsd_tls_regmap[] = + { + { 1, 0, 4 }, /* tpidruro */ + { 0 } + }; + /* In a signal frame, sp points to a 'struct sigframe' which is defined as: @@ -151,6 +159,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 = 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 = 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 +201,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 85d7b59d136..b4137eb9a51 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.30.2