* ppcobsd-nat.c: Include "gdbcore.h", <sys/signal.h>,

<machine/frame.h>, <machine/pcb.h> and "bsd-kvm.h".
(ppcobsd_supply_pcb): New function.
(_initialize_ppcobsd_nat): Enable libkvm interface.
* Makefile.in (ppcobsd-nat.o): Update dependencies.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1565a2473db7e43776639b7ed205ff87a22df0ce..4a8158bc303c6e2f0ab1aa752b0e60a611a9cc7f 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-24  Mark Kettenis  <kettenis@gnu.org>
+
+       * ppcobsd-nat.c: Include "gdbcore.h", <sys/signal.h>,
+       <machine/frame.h>, <machine/pcb.h> and "bsd-kvm.h".
+       (ppcobsd_supply_pcb): New function.
+       (_initialize_ppcobsd_nat): Enable libkvm interface.
+       * Makefile.in (ppcobsd-nat.o): Update dependencies.
+
 2005-06-24  Corinna Vinschen  <vinschen@redhat.com>
 
        * i386-tdep.c (struct i386_frame_cache): Define sp_offset as LONGEST.

diff --git a/gdb/ppcobsd-nat.c b/gdb/ppcobsd-nat.c
index 0a4aaf3728faec6e5d4cf4f2cc0ea7ca8a97cb1b..c0088c7460cb232429af2fd0304c6836367c4c7d 100644 (file)
--- a/gdb/ppcobsd-nat.c
+++ b/gdb/ppcobsd-nat.c
@@ -20,17 +20,22 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
+#include "gdbcore.h"
 #include "inferior.h"
 #include "regcache.h"
 
 #include <stddef.h>
 #include <sys/types.h>
 #include <sys/ptrace.h>
+#include <sys/signal.h>
+#include <machine/frame.h>
+#include <machine/pcb.h>
 #include <machine/reg.h>
 
 #include "ppc-tdep.h"
 #include "ppcobsd-tdep.h"
 #include "inf-ptrace.h"
+#include "bsd-kvm.h"
 
 /* OpenBSD/powerpc doesn't have PT_GETFPREGS/PT_SETFPREGS like
    NetBSD/powerpc and FreeBSD/powerpc.  */
@@ -72,6 +77,43 @@ ppcobsd_store_registers (int regnum)
 }
 \f
 
+static int
+ppcobsd_supply_pcb (struct regcache *regcache, struct pcb *pcb)
+{
+  struct gdbarch_tdep *tdep = gdbarch_tdep (get_regcache_arch (regcache));
+  struct switchframe sf;
+  struct callframe cf;
+  int i, regnum;
+
+  /* The following is true for OpenBSD 3.7:
+
+     The pcb contains %r1 (the stack pointer) at the point of the
+     context switch in cpu_switch().  At that point we have a stack
+     frame as described by `struct switchframe', and below that a call
+     frame as described by `struct callframe'.  From this information
+     we reconstruct the register state as it would look when we are in
+     cpu_switch().  */
+
+  /* The stack pointer shouldn't be zero.  */
+  if (pcb->pcb_sp == 0)
+    return 0;
+
+  read_memory (pcb->pcb_sp, (gdb_byte *)&sf, sizeof sf);
+  regcache_raw_supply (regcache, SP_REGNUM, &sf.sp);
+  regcache_raw_supply (regcache, tdep->ppc_cr_regnum, &sf.cr);
+  regcache_raw_supply (regcache, tdep->ppc_gp0_regnum + 2, &sf.fixreg2);
+  for (i = 0, regnum = tdep->ppc_gp0_regnum + 13; i < 19; i++, regnum++)
+    regcache_raw_supply (regcache, regnum, &sf.fixreg[i]);
+
+  read_memory (sf.sp, (gdb_byte *)&cf, sizeof cf);
+  regcache_raw_supply (regcache, PC_REGNUM, &cf.lr);
+  regcache_raw_supply (regcache, tdep->ppc_gp0_regnum + 30, &cf.r30);
+  regcache_raw_supply (regcache, tdep->ppc_gp0_regnum + 31, &cf.r31);
+
+  return 1;
+}
+\f
+
 /* Provide a prototype to silence -Wmissing-prototypes.  */
 void _initialize_ppcobsd_nat (void);
 
@@ -104,4 +146,7 @@ _initialize_ppcobsd_nat (void)
   ppcobsd_reg_offsets.vr0_offset = offsetof (struct vreg, vreg);
   ppcobsd_reg_offsets.vscr_offset = offsetof (struct vreg, vscr);
   ppcobsd_reg_offsets.vrsave_offset = offsetof (struct vreg, vrsave);
+
+  /* Support debugging kernel virtual memory images.  */
+  bsd_kvm_add_target (ppcobsd_supply_pcb);
 }