From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1936) id DFF3D3853D5C; Tue, 22 Nov 2022 22:44:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DFF3D3853D5C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669157046; bh=XmvUpb1nkimNphFKBtzn1J/QlNi36DhrZsmWh5XBQUs=; h=From:To:Subject:Date:From; b=AktP8AALTS1JItgM9/ckqkChko8ydCecQwMmw7x73iqIozx5+0MLM/rHyHsC5JQaK xkdzN5cb2FfKV/Ir/QWL/PPUcq1E6dyDtn4G0/y9LeItipE7Zs5J/UpuInXSc6A5n5 59fAgE3wHqCMp6Rteb9oCOtl4pfi/w1223qrQHtw= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: John Baldwin To: gdb-cvs@sourceware.org Subject: [binutils-gdb] aarch64-fbsd: Use a static regset for the TLS register set. X-Act-Checkin: binutils-gdb X-Git-Author: John Baldwin X-Git-Refname: refs/heads/master X-Git-Oldrev: 759bbcb917959eedca1c67a05fd43583fe20f12e X-Git-Newrev: d818c7ad8c6097746f436b8689211626e517d4f7 Message-Id: <20221122224406.DFF3D3853D5C@sourceware.org> Date: Tue, 22 Nov 2022 22:44:06 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dd818c7ad8c60= 97746f436b8689211626e517d4f7 commit d818c7ad8c6097746f436b8689211626e517d4f7 Author: John Baldwin Date: Tue Nov 22 14:21:13 2022 -0800 aarch64-fbsd: Use a static regset for the TLS register set. =20 This uses custom collect/supply regset handlers which pass the TLS register number from the gdbarch_tdep as the base register number. =20 Approved-By: Simon Marchi Diff: --- gdb/aarch64-fbsd-nat.c | 36 ++++--------------------------- gdb/aarch64-fbsd-tdep.c | 56 ++++++++++++++++++++++++++++++++++-----------= ---- gdb/aarch64-fbsd-tdep.h | 1 + 3 files changed, 44 insertions(+), 49 deletions(-) diff --git a/gdb/aarch64-fbsd-nat.c b/gdb/aarch64-fbsd-nat.c index 708ddc40d58..ecf7e4fb5a7 100644 --- a/gdb/aarch64-fbsd-nat.c +++ b/gdb/aarch64-fbsd-nat.c @@ -92,22 +92,8 @@ aarch64_fbsd_nat_target::fetch_registers (struct regcach= e *regcache, gdbarch *gdbarch =3D regcache->arch (); aarch64_gdbarch_tdep *tdep =3D gdbarch_tdep (gdbar= ch); if (tdep->has_tls ()) - { - const struct regcache_map_entry aarch64_fbsd_tls_regmap[] =3D - { - { 1, tdep->tls_regnum, 8 }, - { 0 } - }; - - const struct regset aarch64_fbsd_tls_regset =3D - { - 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); } =20 /* Store register REGNUM back into the inferior. If REGNUM is -1, do @@ -125,22 +111,8 @@ aarch64_fbsd_nat_target::store_registers (struct regca= che *regcache, gdbarch *gdbarch =3D regcache->arch (); aarch64_gdbarch_tdep *tdep =3D gdbarch_tdep (gdbar= ch); if (tdep->has_tls ()) - { - const struct regcache_map_entry aarch64_fbsd_tls_regmap[] =3D - { - { 1, tdep->tls_regnum, 8 }, - { 0 } - }; - - const struct regset aarch64_fbsd_tls_regset =3D - { - 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); } =20 /* Implement the target read_description method. */ diff --git a/gdb/aarch64-fbsd-tdep.c b/gdb/aarch64-fbsd-tdep.c index f37729a4d01..39d19355105 100644 --- a/gdb/aarch64-fbsd-tdep.c +++ b/gdb/aarch64-fbsd-tdep.c @@ -50,6 +50,14 @@ static const struct regcache_map_entry aarch64_fbsd_fpre= gmap[] =3D { 0 } }; =20 +/* Register numbers are relative to tdep->tls_regnum. */ + +static const struct regcache_map_entry aarch64_fbsd_tls_regmap[] =3D + { + { 1, 0, 8 }, /* tpidr */ + { 0 } + }; + /* In a signal frame, sp points to a 'struct sigframe' which is defined as: =20 @@ -135,6 +143,34 @@ const struct regset aarch64_fbsd_fpregset =3D regcache_supply_regset, regcache_collect_regset }; =20 +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 =3D regcache->arch (); + aarch64_gdbarch_tdep *tdep =3D gdbarch_tdep (gdbar= ch); + + 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 =3D regcache->arch (); + aarch64_gdbarch_tdep *tdep =3D gdbarch_tdep (gdbar= ch); + + regcache->collect_regset (regset, tdep->tls_regnum, regnum, buf, size); +} + +const struct regset aarch64_fbsd_tls_regset =3D + { + aarch64_fbsd_tls_regmap, + aarch64_fbsd_supply_tls_regset, aarch64_fbsd_collect_tls_regset + }; + /* Implement the "iterate_over_regset_sections" gdbarch method. */ =20 static void @@ -151,23 +187,9 @@ aarch64_fbsd_iterate_over_regset_sections (struct gdba= rch *gdbarch, &aarch64_fbsd_fpregset, NULL, cb_data); =20 if (tdep->has_tls ()) - { - const struct regcache_map_entry aarch64_fbsd_tls_regmap[] =3D - { - { 1, tdep->tls_regnum, 8 }, - { 0 } - }; - - const struct regset aarch64_fbsd_tls_regset =3D - { - 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); } =20 /* 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 @@ =20 extern const struct regset aarch64_fbsd_gregset; extern const struct regset aarch64_fbsd_fpregset; +extern const struct regset aarch64_fbsd_tls_regset; =20 #endif /* AARCH64_FBSD_TDEP_H */