+ fp = read_memory_unsigned_integer (fp_addr, 4, byte_order);
+ if (regnum == SPARC_SP_REGNUM || regnum == -1)
+ {
+ store_unsigned_integer (buf, 4, byte_order, 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, byte_order);
+ if (regnum == SPARC32_PC_REGNUM || regnum == -1)
+ {
+ store_unsigned_integer (buf, 4, byte_order, i7 + 8);
+ regcache_raw_supply (regcache, SPARC32_PC_REGNUM, buf);
+ }
+ if (regnum == SPARC32_NPC_REGNUM || regnum == -1)
+ {
+ store_unsigned_integer (buf, 4, byte_order, 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)
+{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+ 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, byte_order) - 8;
+ write_memory_unsigned_integer (i7_addr, 4, byte_order, i7);
+
+ if (regnum == SPARC32_PC_REGNUM)
+ return;
+ }
+
+ regcache_raw_collect (regcache, SPARC_SP_REGNUM, buf);
+ sp = extract_unsigned_integer (buf, 4, byte_order);
+ sparc_collect_rwindow (regcache, sp, regnum);