* amd64obsd-tdep.c: Include "frame-unwind.h" and "trad-frame.h".

(amd64obsd_tf_reg_offset): New define.
(amd64obsd_trapframe_cache, amd64obsd_trapframe_this_id)
(amd64obsd_trapframe_prev_register, amd64obsd_trapframe_sniffer):
New functions.
(amd64obsd_trapframe_unwind): New variable.
(amd64obsd_init_abi): Prepend amd64obsd_trapframe_unwind.
* Makefile.in (amd64obsd-tdep.o): Update dependencies.

3 files changed, 126 insertions, 4 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6307319..a98c1d8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+2005-12-22  Mark Kettenis  <kettenis@gnu.org>
+
+	* amd64obsd-tdep.c: Include "frame-unwind.h" and "trad-frame.h".
+	(amd64obsd_tf_reg_offset): New define.
+	(amd64obsd_trapframe_cache, amd64obsd_trapframe_this_id)
+	(amd64obsd_trapframe_prev_register, amd64obsd_trapframe_sniffer):
+	New functions.
+	(amd64obsd_trapframe_unwind): New variable.
+	(amd64obsd_init_abi): Prepend amd64obsd_trapframe_unwind.
+	* Makefile.in (amd64obsd-tdep.o): Update dependencies.
+
 2005-12-20  Jim Blandy  <jimb@redhat.com>
 
 	* rs6000-tdep.c (rs6000_gdbarch_init): Doc fix.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 20f6176..e06c9c4 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1716,10 +1716,11 @@ amd64nbsd-tdep.o: amd64nbsd-tdep.c $(defs_h) $(arch_utils_h) $(frame_h) \
 amd64obsd-nat.o: amd64obsd-nat.c $(defs_h) $(gdbcore_h) $(regcache_h) \
 	$(target_h) $(gdb_assert_h) $(amd64_tdep_h) $(amd64_nat_h) \
 	$(bsd_kvm_h)
-amd64obsd-tdep.o: amd64obsd-tdep.c $(defs_h) $(frame_h) $(gdbcore_h) \
-	$(symtab_h) $(objfiles_h) $(osabi_h) $(regcache_h) $(regset_h) \
-	$(target_h) $(gdb_assert_h) $(gdb_string_h) $(amd64_tdep_h) \
-	$(i387_tdep_h) $(solib_svr4_h) $(bsd_uthread_h)
+amd64obsd-tdep.o: amd64obsd-tdep.c $(defs_h) $(frame_h) $(frame_unwind_h) \
+	$(gdbcore_h) $(symtab_h) $(objfiles_h) $(osabi_h) $(regcache_h) \
+	$(regset_h) $(target_h) $(trad_frame_h) $(gdb_assert_h) \
+	$(gdb_string_h) $(amd64_tdep_h) $(i387_tdep_h) $(solib_svr4_h) \
+	$(bsd_uthread_h)
 amd64-sol2-tdep.o: amd64-sol2-tdep.c $(defs_h) $(frame_h) $(gdbcore_h) \
 	$(regcache_h) $(osabi_h) $(symtab_h) $(gdb_string_h) $(amd64_tdep_h) \
 	$(solib_svr4_h)
diff --git a/gdb/amd64obsd-tdep.c b/gdb/amd64obsd-tdep.c
index 34a48ca..30e8fc1 100644
--- a/gdb/amd64obsd-tdep.c
+++ b/gdb/amd64obsd-tdep.c
@@ -21,6 +21,7 @@
 
 #include "defs.h"
 #include "frame.h"
+#include "frame-unwind.h"
 #include "gdbcore.h"
 #include "symtab.h"
 #include "objfiles.h"
@@ -28,6 +29,7 @@
 #include "regcache.h"
 #include "regset.h"
 #include "target.h"
+#include "trad-frame.h"
 
 #include "gdb_assert.h"
 #include "gdb_string.h"
@@ -333,6 +335,111 @@ amd64obsd_collect_uthread (const struct regcache *regcache,
 	}
     }
 }
+/* Kernel debugging support.  */
+
+/* From <machine/frame.h>.  Easy since `struct trapframe' matches
+   `struct sigcontext'.  */
+#define amd64obsd_tf_reg_offset amd64obsd_sc_reg_offset
+
+static struct trad_frame_cache *
+amd64obsd_trapframe_cache(struct frame_info *next_frame, void **this_cache)
+{
+  struct trad_frame_cache *cache;
+  CORE_ADDR func, sp, addr;
+  ULONGEST cs;
+  char *name;
+  int i;
+
+  if (*this_cache)
+    return *this_cache;
+
+  cache = trad_frame_cache_zalloc (next_frame);
+  *this_cache = cache;
+
+  func = frame_func_unwind (next_frame);
+  sp = frame_unwind_register_unsigned (next_frame, AMD64_RSP_REGNUM);
+
+  find_pc_partial_function (func, &name, NULL, NULL);
+  if (name && strncmp(name, "Xintr", 5) == 0)
+    addr = sp + 8;		/* It's an interrupt frame.  */
+  else
+    addr = sp;
+
+  for (i = 0; i < ARRAY_SIZE (amd64obsd_tf_reg_offset); i++)
+    if (amd64obsd_tf_reg_offset[i] != -1)
+      trad_frame_set_reg_addr (cache, i, addr + amd64obsd_tf_reg_offset[i]);
+
+  /* Read %cs from trap frame.  */
+  addr = sp + amd64obsd_tf_reg_offset[AMD64_CS_REGNUM];
+  cs = read_memory_unsigned_integer (addr, 8); 
+  if ((cs & I386_SEL_RPL) == I386_SEL_UPL)
+    {
+      /* Trap from use space; terminate backtrace.  */
+      trad_frame_set_id (cache, null_frame_id);
+    }
+  else
+    {
+      /* Construct the frame ID using the function start.  */
+      trad_frame_set_id (cache, frame_id_build (sp + 16, func));
+    }
+
+  return cache;
+}
+
+static void
+amd64obsd_trapframe_this_id (struct frame_info *next_frame,
+			     void **this_cache, struct frame_id *this_id)
+{
+  struct trad_frame_cache *cache =
+    amd64obsd_trapframe_cache (next_frame, this_cache);
+  
+  trad_frame_get_id (cache, this_id);
+}
+
+static void
+amd64obsd_trapframe_prev_register (struct frame_info *next_frame,
+				   void **this_cache, int regnum,
+				   int *optimizedp, enum lval_type *lvalp,
+				   CORE_ADDR *addrp, int *realnump,
+				   gdb_byte *valuep)
+{
+  struct trad_frame_cache *cache =
+    amd64obsd_trapframe_cache (next_frame, this_cache);
+
+  trad_frame_get_register (cache, next_frame, regnum,
+			   optimizedp, lvalp, addrp, realnump, valuep);
+}
+
+static int
+amd64obsd_trapframe_sniffer (const struct frame_unwind *self,
+			     struct frame_info *next_frame,
+			     void **this_prologue_cache)
+{
+  ULONGEST cs;
+  char *name;
+
+  cs = frame_unwind_register_unsigned (next_frame, AMD64_CS_REGNUM);
+  if ((cs & I386_SEL_RPL) == I386_SEL_UPL)
+    return 0;
+
+  find_pc_partial_function (frame_pc_unwind (next_frame), &name, NULL, NULL);
+  return (name && ((strcmp (name, "calltrap") == 0)
+		   || (strcmp (name, "osyscall1") == 0)
+		   || (strcmp (name, "Xsyscall") == 0)
+		   || (strncmp (name, "Xintr", 5) == 0)));
+}
+
+static const struct frame_unwind amd64obsd_trapframe_unwind = {
+  /* FIXME: kettenis/20051219: This really is more like an interrupt
+     frame, but SIGTRAMP_FRAME would print <signal handler called>,
+     which really is not what we want here.  */
+  NORMAL_FRAME,
+  amd64obsd_trapframe_this_id,
+  amd64obsd_trapframe_prev_register,
+  NULL,
+  amd64obsd_trapframe_sniffer
+};
+
 
 static void
 amd64obsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
@@ -363,6 +470,9 @@ amd64obsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   /* OpenBSD uses SVR4-style shared libraries.  */
   set_solib_svr4_fetch_link_map_offsets
     (gdbarch, svr4_lp64_fetch_link_map_offsets);
+
+  /* Unwind kernel trap frames correctly.  */
+  frame_unwind_prepend_unwinder (gdbarch, &amd64obsd_trapframe_unwind);
 }