2003-02-12 Andrew Cagney <ac131313@redhat.com>

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

diff --git a/gdb/alphanbsd-tdep.c b/gdb/alphanbsd-tdep.c
index d10a3cab1597762c4488948f7456abd48536969d..6137c5e98de96c9d51c7f20d8088981d754e9fa2 100644 (file)
--- a/gdb/alphanbsd-tdep.c
+++ b/gdb/alphanbsd-tdep.c
@@ -1,5 +1,5 @@
 /* Target-dependent code for NetBSD/Alpha.
-   Copyright 2002 Free Software Foundation, Inc.
+   Copyright 2002, 2003 Free Software Foundation, Inc.
    Contributed by Wasabi Systems, Inc.
 
    This file is part of GDB.
@@ -21,8 +21,12 @@
 
 #include "defs.h"
 #include "gdbcore.h"
+#include "frame.h"
 #include "regcache.h"
 #include "value.h"
+#include "osabi.h"
+
+#include "solib-svr4.h"
 
 #include "alpha-tdep.h"
 #include "alphabsd-tdep.h"
@@ -133,29 +137,29 @@ static struct core_fns alphanbsd_elfcore_fns =
    sequence and can then check whether we really are executing in the
    signal trampoline.  If not, -1 is returned, otherwise the offset from the
    start of the return sequence is returned.  */
-static const unsigned int sigtramp_retcode[] =
+static const unsigned char sigtramp_retcode[] =
 {
-  0xa61e0000,          /* ldq a0, 0(sp) */
-  0x23de0010,          /* lda sp, 16(sp) */
-  0x201f0127,          /* lda v0, 295(zero) */
-  0x00000083,          /* call_pal callsys */
+  0x00, 0x00, 0x1e, 0xa6,      /* ldq a0, 0(sp) */
+  0x10, 0x00, 0xde, 0x23,      /* lda sp, 16(sp) */
+  0x27, 0x01, 0x1f, 0x20,      /* lda v0, 295(zero) */
+  0x83, 0x00, 0x00, 0x00,      /* call_pal callsys */
 };
-#define        RETCODE_NWORDS \
-  (sizeof (sigtramp_retcode) / sizeof (sigtramp_retcode[0]))
+#define RETCODE_NWORDS         4
+#define RETCODE_SIZE           (RETCODE_NWORDS * 4)
 
 LONGEST
 alphanbsd_sigtramp_offset (CORE_ADDR pc)
 {
-  unsigned int ret[4], w;
+  unsigned char ret[RETCODE_SIZE], w[4];
   LONGEST off;
   int i;
 
-  if (read_memory_nobpt (pc, (char *) &w, 4) != 0)
+  if (read_memory_nobpt (pc, (char *) w, 4) != 0)
     return -1;
 
   for (i = 0; i < RETCODE_NWORDS; i++)
     {
-      if (w == sigtramp_retcode[i])
+      if (memcmp (w, sigtramp_retcode + (i * 4), 4) == 0)
        break;
     }
   if (i == RETCODE_NWORDS)
@@ -167,7 +171,7 @@ alphanbsd_sigtramp_offset (CORE_ADDR pc)
   if (read_memory_nobpt (pc, (char *) ret, sizeof (ret)) != 0)
     return -1;
 
-  if (memcmp (ret, sigtramp_retcode, sizeof (sigtramp_retcode)) == 0)
+  if (memcmp (ret, sigtramp_retcode, RETCODE_SIZE) == 0)
     return off;
 
   return -1;
@@ -176,7 +180,31 @@ alphanbsd_sigtramp_offset (CORE_ADDR pc)
 static int
 alphanbsd_pc_in_sigtramp (CORE_ADDR pc, char *func_name)
 {
-  return (alphanbsd_sigtramp_offset (pc) >= 0);
+  return (nbsd_pc_in_sigtramp (pc, func_name)
+         || alphanbsd_sigtramp_offset (pc) >= 0);
+}
+
+static CORE_ADDR
+alphanbsd_sigcontext_addr (struct frame_info *frame)
+{
+  /* FIXME: This is not correct for all versions of NetBSD/alpha.
+     We will probably need to disassemble the trampoline to figure
+     out which trampoline frame type we have.  */
+  return frame->frame;
+}
+
+static CORE_ADDR
+alphanbsd_skip_sigtramp_frame (struct frame_info *frame, CORE_ADDR pc)
+{
+  char *name;
+
+  /* FIXME: This is not correct for all versions of NetBSD/alpha.
+     We will probably need to disassemble the trampoline to figure
+     out which trampoline frame type we have.  */
+  find_pc_partial_function (pc, &name, (CORE_ADDR *) NULL, (CORE_ADDR *) NULL);
+  if (PC_IN_SIGTRAMP (pc, name))
+    return frame->frame;
+  return 0;
 }
 
 static void
@@ -194,7 +222,9 @@ alphanbsd_init_abi (struct gdbarch_info info,
   set_solib_svr4_fetch_link_map_offsets (gdbarch,
                                  nbsd_lp64_solib_svr4_fetch_link_map_offsets);
 
+  tdep->skip_sigtramp_frame = alphanbsd_skip_sigtramp_frame;
   tdep->dynamic_sigtramp_offset = alphanbsd_sigtramp_offset;
+  tdep->sigcontext_addr = alphanbsd_sigcontext_addr;
 
   tdep->jb_pc = 2;
   tdep->jb_elt_size = 8;
@@ -203,7 +233,8 @@ alphanbsd_init_abi (struct gdbarch_info info,
 void
 _initialize_alphanbsd_tdep (void)
 {
-  alpha_gdbarch_register_os_abi (ALPHA_ABI_NETBSD, alphanbsd_init_abi);
+  gdbarch_register_osabi (bfd_arch_alpha, 0, GDB_OSABI_NETBSD_ELF,
+                          alphanbsd_init_abi);
 
   add_core_fns (&alphanbsd_core_fns);
   add_core_fns (&alphanbsd_elfcore_fns);