mirror of
https://git.freebsd.org/ports.git
synced 2025-05-21 03:23:10 -04:00
1c25ded0af
One notable feature included in 12.1 is async target support permitting the use of commands like continue&. In addition, this commit backports various post-12 commits to add support for hardware breakpoints/watchpoints on aarch64, support for resolving TLS variables from core dumps on amd64 and i386 via the recently added NT_X86_SEGBASES core dump note, and support for resolving TLS variables on arm and aarch64 via the recently added NT_ARM_TLS register set. Reviewed by: pizzamig Differential Revision: https://reviews.freebsd.org/D35111
102 lines
3 KiB
Text
102 lines
3 KiB
Text
commit 0e67403c6b094d638a4ca130ff6dcd6a153f3eb2
|
|
Author: John Baldwin <jhb@FreeBSD.org>
|
|
Date: Tue May 3 16:05:10 2022 -0700
|
|
|
|
Fetch the NT_ARM_TLS register set for native FreeBSD/Aarch64 processes.
|
|
|
|
This permits resolving TLS variables.
|
|
|
|
(cherry picked from commit b7fe5463cf0dd6d7701d0be5ae129a9d4ecd28bc)
|
|
|
|
diff --git gdb/aarch64-fbsd-nat.c gdb/aarch64-fbsd-nat.c
|
|
index 99e2bf35276..910bf5bb190 100644
|
|
--- gdb/aarch64-fbsd-nat.c
|
|
+++ gdb/aarch64-fbsd-nat.c
|
|
@@ -24,12 +24,15 @@
|
|
#include "target.h"
|
|
#include "nat/aarch64-hw-point.h"
|
|
|
|
+#include "elf/common.h"
|
|
+
|
|
#include <sys/param.h>
|
|
#include <sys/ptrace.h>
|
|
#include <machine/armreg.h>
|
|
#include <machine/reg.h>
|
|
|
|
#include "fbsd-nat.h"
|
|
+#include "aarch64-tdep.h"
|
|
#include "aarch64-fbsd-tdep.h"
|
|
#include "aarch64-nat.h"
|
|
#include "inf-ptrace.h"
|
|
@@ -50,6 +53,8 @@ struct aarch64_fbsd_nat_target final : public fbsd_nat_target
|
|
void fetch_registers (struct regcache *, int) override;
|
|
void store_registers (struct regcache *, int) override;
|
|
|
|
+ const struct target_desc *read_description () override;
|
|
+
|
|
#ifdef HAVE_DBREG
|
|
/* Hardware breakpoints and watchpoints. */
|
|
bool stopped_by_watchpoint () override;
|
|
@@ -84,6 +89,26 @@ aarch64_fbsd_nat_target::fetch_registers (struct regcache *regcache,
|
|
&aarch64_fbsd_gregset);
|
|
fetch_register_set<struct fpreg> (regcache, regnum, PT_GETFPREGS,
|
|
&aarch64_fbsd_fpregset);
|
|
+
|
|
+ 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);
|
|
+ }
|
|
}
|
|
|
|
/* Store register REGNUM back into the inferior. If REGNUM is -1, do
|
|
@@ -97,6 +122,35 @@ aarch64_fbsd_nat_target::store_registers (struct regcache *regcache,
|
|
&aarch64_fbsd_gregset);
|
|
store_register_set<struct fpreg> (regcache, regnum, PT_GETFPREGS,
|
|
PT_SETFPREGS, &aarch64_fbsd_fpregset);
|
|
+
|
|
+ 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);
|
|
+ }
|
|
+}
|
|
+
|
|
+/* Implement the target read_description method. */
|
|
+
|
|
+const struct target_desc *
|
|
+aarch64_fbsd_nat_target::read_description ()
|
|
+{
|
|
+ bool tls = have_regset (inferior_ptid, NT_ARM_TLS) != 0;
|
|
+ return aarch64_read_description (0, false, false, tls);
|
|
}
|
|
|
|
#ifdef HAVE_DBREG
|