Merge from gcc:

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

diff --git a/gdb/sparcobsd-tdep.c b/gdb/sparcobsd-tdep.c
index 66d15ec503b74a164039b65bd77081e641428299..26968326650929d5b3e1da2715e703906a831c40 100644 (file)
--- a/gdb/sparcobsd-tdep.c
+++ b/gdb/sparcobsd-tdep.c
@@ -1,12 +1,12 @@
 /* Target-dependent code for OpenBSD/sparc.
 
-   Copyright 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -15,22 +15,24 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #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"
 
 #include "gdb_assert.h"
 
+#include "obsd-tdep.h"
 #include "sparc-tdep.h"
+#include "solib-svr4.h"
+#include "bsd-uthread.h"
 
 /* Signal trampolines.  */
 
@@ -39,7 +41,7 @@
    detecting it won't work.
 
    The signal trampoline will be mapped at an address that is page
-   aligned.  We recognize the signal trampoline by the looking for the
+   aligned.  We recognize the signal trampoline by looking for the
    sigreturn system call.  */
 
 static const int sparc32obsd_page_size = 4096;
@@ -142,6 +144,88 @@ sparc32obsd_sigtramp_frame_sniffer (struct frame_info *next_frame)
 }
 \f
 
+/* 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);
+}
+\f
+
 static void
 sparc32obsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
@@ -150,7 +234,13 @@ sparc32obsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   /* OpenBSD/sparc is very similar to NetBSD/sparc ELF.  */
   sparc32nbsd_elf_init_abi (info, 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);
 }
 
 \f