2004-07-17 Andrew Cagney <cagney@gnu.org>

[deliverable/binutils-gdb.git] / gdb / amd64obsd-tdep.c

diff --git a/gdb/amd64obsd-tdep.c b/gdb/amd64obsd-tdep.c
index f9e0f69fe6ec9a627ddfc21ccad1d2d5e4dd01b8..0c742a26ecc30c637ffa5b9a8fcd3d11a07a6e98 100644 (file)
--- a/gdb/amd64obsd-tdep.c
+++ b/gdb/amd64obsd-tdep.c
@@ -42,7 +42,7 @@ amd64obsd_supply_regset (const struct regset *regset,
                         struct regcache *regcache, int regnum,
                         const void *regs, size_t len)
 {
-  const struct gdbarch_tdep *tdep = regset->descr;
+  const struct gdbarch_tdep *tdep = gdbarch_tdep (regset->arch);
 
   gdb_assert (len >= tdep->sizeof_gregset + I387_SIZEOF_FXSAVE);
 
@@ -63,11 +63,7 @@ amd64obsd_regset_from_core_section (struct gdbarch *gdbarch,
       && sect_size >= tdep->sizeof_gregset + I387_SIZEOF_FXSAVE)
     {
       if (tdep->gregset == NULL)
-       {
-         tdep->gregset = XMALLOC (struct regset);
-         tdep->gregset->descr = tdep;
-         tdep->gregset->supply_regset = amd64obsd_supply_regset;
-       }
+        tdep->gregset = regset_alloc (gdbarch, amd64obsd_supply_regset, NULL);
       return tdep->gregset;
     }
 
@@ -108,12 +104,15 @@ amd64obsd_sigtramp_p (struct frame_info *next_frame)
     return 0;
 
   /* If we can't read the instructions at START_PC, return zero.  */
-  buf = alloca (sizeof sigreturn);
-  if (target_read_memory (start_pc + 7, buf, sizeof sigreturn))
+  buf = alloca ((sizeof sigreturn) + 1);
+  if (target_read_memory (start_pc + 6, buf, (sizeof sigreturn) + 1))
     return 0;
 
-  /* Check for sigreturn(2).  */
-  if (memcmp (buf, sigreturn, sizeof sigreturn))
+  /* Check for sigreturn(2).  Depending on how the assembler encoded
+     the `movq %rsp, %rdi' instruction, the code starts at offset 6 or
+     7.  */
+  if (memcmp (buf, sigreturn, sizeof sigreturn)
+      && memcpy (buf + 1, sigreturn, sizeof sigreturn))
     return 0;
 
   return 1;
@@ -140,7 +139,7 @@ amd64obsd_sigcontext_addr (struct frame_info *next_frame)
      (see /usr/src/sys/arch/amd64/amd64/locore.S).  The `pushq'
      instruction clobbers %rsp, but its value is saved in `%rdi'.  */
 
-  if (offset > 6)
+  if (offset > 5)
     return frame_unwind_register_unsigned (next_frame, AMD64_RDI_REGNUM);
   else
     return frame_unwind_register_unsigned (next_frame, AMD64_RSP_REGNUM);