* sparcobsd-tdep.c: Include "gdbcore.h", "regcache.h" and

"bsd-uthread.h".
(SPARC32OBSD_UTHREAD_FP_OFFSET, SPARC32OBSD_UTHREAD_PC_OFFSET):
New defines.
(sparc32obsd_supply_uthread, sparc32obsd_collect_uthread): New
functions.
(sparc32obsd_init_abi): Set supply_uthread and collect_uthread.
* Makefile.in (sparcobsd-tdep.o): Update dependencies.
* config/sparc/obsd.mt (TDEPFILES): Add bsd-uthread.o.
* config/sparc/obsd64.mt (TDEPFILES): Likewise.

5 files changed, 108 insertions, 5 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 060f0ea1fae..57bbf1aec5f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+2005-12-27  Mark Kettenis  <kettenis@gnu.org>
+
+	* sparcobsd-tdep.c: Include "gdbcore.h", "regcache.h" and
+	"bsd-uthread.h".
+	(SPARC32OBSD_UTHREAD_FP_OFFSET, SPARC32OBSD_UTHREAD_PC_OFFSET):
+	New defines.
+	(sparc32obsd_supply_uthread, sparc32obsd_collect_uthread): New
+	functions.
+	(sparc32obsd_init_abi): Set supply_uthread and collect_uthread.
+	* Makefile.in (sparcobsd-tdep.o): Update dependencies.
+	* config/sparc/obsd.mt (TDEPFILES): Add bsd-uthread.o.
+	* config/sparc/obsd64.mt (TDEPFILES): Likewise.
+
 2005-12-27  Alan Modra  <amodra@bigpond.net.au>
 
 	* elfread.c (elf_symfile_read): Don't make synth syms global.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 5caded78586..7429c8a1075 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2631,8 +2631,9 @@ sparcnbsd-tdep.o: sparcnbsd-tdep.c $(defs_h) $(floatformat_h) $(frame_h) \
 	$(solib_svr4_h) $(symtab_h) $(trad_frame_h) $(gdb_assert_h) \
 	$(gdb_string_h) $(sparc_tdep_h) $(nbsd_tdep_h)
 sparcobsd-tdep.o: sparcobsd-tdep.c $(defs_h) $(floatformat_h) $(frame_h) \
-	$(frame_unwind_h) $(osabi_h) $(solib_svr4_h) $(symtab_h) \
-	$(trad_frame_h) $(gdb_assert_h) $(obsd_tdep_h) $(sparc_tdep_h)
+	$(frame_unwind_h) $(gdbcore_h) $(osabi_h) $(regcache_h) \
+	$(symtab_h) $(trad_frame_h) $(gdb_assert_h) $(obsd_tdep_h) \
+	$(sparc_tdep_h) $(solib_svr4_h) $(bsd_uthread_h)
 sparc-sol2-nat.o: sparc-sol2-nat.c $(defs_h) $(regcache_h) $(gregset_h) \
 	$(sparc_tdep_h) $(sparc64_tdep_h)
 sparc-sol2-tdep.o: sparc-sol2-tdep.c $(defs_h) $(frame_h) $(frame_unwind_h) \
diff --git a/gdb/config/sparc/obsd.mt b/gdb/config/sparc/obsd.mt
index 8b31aa6df4e..f54ee00b2b8 100644
--- a/gdb/config/sparc/obsd.mt
+++ b/gdb/config/sparc/obsd.mt
@@ -1,3 +1,3 @@
 # Target: OpenBSD/sparc
 TDEPFILES= sparc-tdep.o sparcnbsd-tdep.o sparcobsd-tdep.o nbsd-tdep.o \
-	obsd-tdep.o corelow.o solib.o solib-svr4.o
+	obsd-tdep.o bsd-uthread.o corelow.o solib.o solib-svr4.o
diff --git a/gdb/config/sparc/obsd64.mt b/gdb/config/sparc/obsd64.mt
index 8816c6f1df4..7f2b38dd928 100644
--- a/gdb/config/sparc/obsd64.mt
+++ b/gdb/config/sparc/obsd64.mt
@@ -1,4 +1,4 @@
 # Target: OpenBSD/sparc64
 TDEPFILES= sparc64-tdep.o sparc64nbsd-tdep.o sparc64obsd-tdep.o \
 	sparc-tdep.o sparcnbsd-tdep.o sparcobsd-tdep.o nbsd-tdep.o \
-	obsd-tdep.o corelow.o solib.o solib-svr4.o
+	obsd-tdep.o bsd-uthread.o corelow.o solib.o solib-svr4.o
diff --git a/gdb/sparcobsd-tdep.c b/gdb/sparcobsd-tdep.c
index 88e4a78f3fc..0e6504bdf68 100644
--- a/gdb/sparcobsd-tdep.c
+++ b/gdb/sparcobsd-tdep.c
@@ -23,8 +23,9 @@
 #include "floatformat.h"
 #include "frame.h"
 #include "frame-unwind.h"
+#include "gdbcore.h"
 #include "osabi.h"
-#include "solib-svr4.h"
+#include "regcache.h"
 #include "symtab.h"
 #include "trad-frame.h"
 
@@ -32,6 +33,8 @@
 
 #include "obsd-tdep.h"
 #include "sparc-tdep.h"
+#include "solib-svr4.h"
+#include "bsd-uthread.h"
 
 /* Signal trampolines.  */
 
@@ -143,6 +146,88 @@ sparc32obsd_sigtramp_frame_sniffer (struct frame_info *next_frame)
 }
 
 
+/* Offset wthin the thread structure where we can find %fp and %i7.  */
+#define SPARC32OBSD_UTHREAD_FP_OFFSET	128
+#define SPARC32OBSD_UTHREAD_PC_OFFSET	132
+
+static void
+sparc32obsd_supply_uthread (struct regcache *regcache,
+			    int regnum, CORE_ADDR addr)
+{
+  CORE_ADDR fp, fp_addr = addr + SPARC32OBSD_UTHREAD_FP_OFFSET;
+  gdb_byte buf[4];
+
+  gdb_assert (regnum >= -1);
+
+  fp = read_memory_unsigned_integer (fp_addr, 4);
+  if (regnum == SPARC_SP_REGNUM || regnum == -1)
+    {
+      store_unsigned_integer (buf, 4, fp);
+      regcache_raw_supply (regcache, SPARC_SP_REGNUM, buf);
+
+      if (regnum == SPARC_SP_REGNUM)
+	return;
+    }
+
+  if (regnum == SPARC32_PC_REGNUM || regnum == SPARC32_NPC_REGNUM
+      || regnum == -1)
+    {
+      CORE_ADDR i7, i7_addr = addr + SPARC32OBSD_UTHREAD_PC_OFFSET;
+
+      i7 = read_memory_unsigned_integer (i7_addr, 4);
+      if (regnum == SPARC32_PC_REGNUM || regnum == -1)
+	{
+	  store_unsigned_integer (buf, 4, i7 + 8);
+	  regcache_raw_supply (regcache, SPARC32_PC_REGNUM, buf);
+	}
+      if (regnum == SPARC32_NPC_REGNUM || regnum == -1)
+	{
+	  store_unsigned_integer (buf, 4, i7 + 12);
+	  regcache_raw_supply (regcache, SPARC32_NPC_REGNUM, buf);
+	}
+
+      if (regnum == SPARC32_PC_REGNUM || regnum == SPARC32_NPC_REGNUM)
+	return;
+    }
+
+  sparc_supply_rwindow (regcache, fp, regnum);
+}
+
+static void
+sparc32obsd_collect_uthread(const struct regcache *regcache,
+			    int regnum, CORE_ADDR addr)
+{
+  CORE_ADDR sp;
+  gdb_byte buf[4];
+
+  gdb_assert (regnum >= -1);
+
+  if (regnum == SPARC_SP_REGNUM || regnum == -1)
+    {
+      CORE_ADDR fp_addr = addr + SPARC32OBSD_UTHREAD_FP_OFFSET;
+
+      regcache_raw_collect (regcache, SPARC_SP_REGNUM, buf);
+      write_memory (fp_addr,buf, 4);
+    }
+
+  if (regnum == SPARC32_PC_REGNUM || regnum == -1)
+    {
+      CORE_ADDR i7, i7_addr = addr + SPARC32OBSD_UTHREAD_PC_OFFSET;
+
+      regcache_raw_collect (regcache, SPARC32_PC_REGNUM, buf);
+      i7 = extract_unsigned_integer (buf, 4) - 8;
+      write_memory_unsigned_integer (i7_addr, 4, i7);
+
+      if (regnum == SPARC32_PC_REGNUM)
+	return;
+    }
+
+  regcache_raw_collect (regcache, SPARC_SP_REGNUM, buf);
+  sp = extract_unsigned_integer (buf, 4);
+  sparc_collect_rwindow (regcache, sp, regnum);
+}
+
+
 static void
 sparc32obsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
@@ -154,6 +239,10 @@ sparc32obsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   set_gdbarch_skip_solib_resolver (gdbarch, obsd_skip_solib_resolver);
 
   frame_unwind_append_sniffer (gdbarch, sparc32obsd_sigtramp_frame_sniffer);
+
+  /* OpenBSD provides a user-level threads implementation.  */
+  bsd_uthread_set_supply_uthread (gdbarch, sparc32obsd_supply_uthread);
+  bsd_uthread_set_collect_uthread (gdbarch, sparc32obsd_collect_uthread);
 }