diff options
Diffstat (limited to 'gdb/amd64-bsd-nat.c')
| -rw-r--r-- | gdb/amd64-bsd-nat.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/gdb/amd64-bsd-nat.c b/gdb/amd64-bsd-nat.c index a2a91ab..35763a5 100644 --- a/gdb/amd64-bsd-nat.c +++ b/gdb/amd64-bsd-nat.c @@ -43,6 +43,9 @@ amd64bsd_fetch_inferior_registers (struct regcache *regcache, int regnum) { struct gdbarch *gdbarch = regcache->arch (); pid_t pid = get_ptrace_pid (regcache->ptid ()); +#if defined(PT_GETFSBASE) || defined(PT_GETGSBASE) + const struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); +#endif if (regnum == -1 || amd64_native_gregset_supplies_p (gdbarch, regnum)) { @@ -57,27 +60,27 @@ amd64bsd_fetch_inferior_registers (struct regcache *regcache, int regnum) } #ifdef PT_GETFSBASE - if (regnum == -1 || regnum == AMD64_FSBASE_REGNUM) + if (regnum == -1 || regnum == tdep->fsbase_regnum) { register_t base; if (ptrace (PT_GETFSBASE, pid, (PTRACE_TYPE_ARG3) &base, 0) == -1) perror_with_name (_("Couldn't get segment register fs_base")); - regcache->raw_supply (AMD64_FSBASE_REGNUM, &base); + regcache->raw_supply (tdep->fsbase_regnum, &base); if (regnum != -1) return; } #endif #ifdef PT_GETGSBASE - if (regnum == -1 || regnum == AMD64_GSBASE_REGNUM) + if (regnum == -1 || regnum == tdep->fsbase_regnum + 1) { register_t base; if (ptrace (PT_GETGSBASE, pid, (PTRACE_TYPE_ARG3) &base, 0) == -1) perror_with_name (_("Couldn't get segment register gs_base")); - regcache->raw_supply (AMD64_GSBASE_REGNUM, &base); + regcache->raw_supply (tdep->fsbase_regnum + 1, &base); if (regnum != -1) return; } @@ -116,6 +119,9 @@ amd64bsd_store_inferior_registers (struct regcache *regcache, int regnum) { struct gdbarch *gdbarch = regcache->arch (); pid_t pid = get_ptrace_pid (regcache->ptid ()); +#if defined(PT_SETFSBASE) || defined(PT_SETGSBASE) + const struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); +#endif if (regnum == -1 || amd64_native_gregset_supplies_p (gdbarch, regnum)) { @@ -134,11 +140,13 @@ amd64bsd_store_inferior_registers (struct regcache *regcache, int regnum) } #ifdef PT_SETFSBASE - if (regnum == -1 || regnum == AMD64_FSBASE_REGNUM) + if (regnum == -1 || regnum == tdep->fsbase_regnum) { register_t base; - regcache->raw_collect (AMD64_FSBASE_REGNUM, &base); + /* Clear the full base value to support 32-bit targets. */ + base = 0; + regcache->raw_collect (tdep->fsbase_regnum, &base); if (ptrace (PT_SETFSBASE, pid, (PTRACE_TYPE_ARG3) &base, 0) == -1) perror_with_name (_("Couldn't write segment register fs_base")); @@ -147,11 +155,13 @@ amd64bsd_store_inferior_registers (struct regcache *regcache, int regnum) } #endif #ifdef PT_SETGSBASE - if (regnum == -1 || regnum == AMD64_GSBASE_REGNUM) + if (regnum == -1 || regnum == tdep->fsbase_regnum + 1) { register_t base; - regcache->raw_collect (AMD64_GSBASE_REGNUM, &base); + /* Clear the full base value to support 32-bit targets. */ + base = 0; + regcache->raw_collect (tdep->fsbase_regnum + 1, &base); if (ptrace (PT_SETGSBASE, pid, (PTRACE_TYPE_ARG3) &base, 0) == -1) perror_with_name (_("Couldn't write segment register gs_base")); |