* nto-tdep.h: Include osabi.h. Prototypes for generic Neutrino

[deliverable/binutils-gdb.git] / gdb / i386nbsd-nat.c

diff --git a/gdb/i386nbsd-nat.c b/gdb/i386nbsd-nat.c
index f8934cc24a79ce70bb592d08a4320211936d068b..22af0117e4e53370ce5b7691811c57f4aa34e20e 100644 (file)
--- a/gdb/i386nbsd-nat.c
+++ b/gdb/i386nbsd-nat.c
@@ -1,6 +1,6 @@
-/* Native-dependent code for NetBSD/i386, for GDB.
-   Copyright 1988, 1989, 1991, 1992, 1994, 1996, 2000, 2001, 2002
-   Free Software Foundation, Inc.
+/* Native-dependent code for NetBSD/i386.
+
+   Copyright 2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -20,113 +20,68 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
-#include <sys/types.h>
-#include <sys/ptrace.h>
-#include <machine/reg.h>
-#include <machine/frame.h>
-#include "inferior.h"
 #include "gdbcore.h"
 #include "regcache.h"
+#include "target.h"
 
-#ifndef HAVE_GREGSET_T
-typedef struct reg gregset_t;
-#endif
-
-#ifndef HAVE_FPREGSET_T
-typedef struct fpreg fpregset_t;
-#endif
-
-#include "gregset.h"
+#include "i386-tdep.h"
+#include "i386bsd-nat.h"
 
-/* Prototypes for i387_supply_fsave etc.  */
-#include "i387-tdep.h"  
-
-struct md_core
-{
-  struct reg intreg;
-  char freg[108];
-};
-
-static void
-fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which,
-                     CORE_ADDR ignore)
-{
-  struct md_core *core_reg = (struct md_core *) core_reg_sect;
+/* Support for debugging kernel virtual memory images.  */
 
-  /* We get everything from one section.  */
-  if (which != 0)
-    return;
-
-  /* Integer registers.  */
-  supply_gregset (&core_reg->intreg);
+#include <sys/types.h>
+#include <machine/frame.h>
+#include <machine/pcb.h>
 
-  /* Floating point registers.  */
-  i387_supply_fsave (core_reg->freg);
-}
+#include "bsd-kvm.h"
 
-static void
-fetch_elfcore_registers (char *core_reg_sect, unsigned core_reg_size, int which,
-                         CORE_ADDR ignore)
+static int
+i386nbsd_supply_pcb (struct regcache *regcache, struct pcb *pcb)
 {
-  gregset_t gregset;
-
-  switch (which)
-    {
-    case 0:  /* Integer registers.  */
-      if (core_reg_size != sizeof (struct reg))
-       warning ("Wrong size register set in core file.");
-      else
-       {
-         memcpy (&gregset, core_reg_sect, sizeof (gregset));
-         supply_gregset (&gregset);
-       }
-      break;
-
-    case 2:  /* Floating point registers.  */
-      if (core_reg_size != 108)
-       warning ("Wrong size FP register set in core file.");
-      else
-       i387_supply_fsave (core_reg_sect);
-      break;
-
-    case 3:  /* "Extended" floating point registers.  This is gdb-speak
-               for SSE/SSE2. */
-      if (core_reg_size != 512)
-       warning ("Wrong size XMM register set in core file.");
-      else
-       i387_supply_fxsave (core_reg_sect);
-      break;
-
-    default:
-      /* Don't know what kind of register request this is; just ignore it.  */
-      break;
-    }
+  struct switchframe sf;
+
+  /* The following is true for NetBSD 1.6.2:
+
+     The pcb contains %esp and %ebp at the point of the context switch
+     in cpu_switch().  At that point we have a stack frame as
+     described by `struct switchframe', which for NetBSD 1.6.2 has the
+     following layout:
+
+     interrupt level
+     %edi
+     %esi
+     %ebx
+     %eip
+
+     we reconstruct the register state as it would look when we just
+     returned from cpu_switch().  */
+
+  /* The stack pointer shouldn't be zero.  */
+  if (pcb->pcb_esp == 0)
+    return 0;
+
+  read_memory (pcb->pcb_esp, (char *) &sf, sizeof sf);
+  pcb->pcb_esp += sizeof (struct switchframe);
+  regcache_raw_supply (regcache, I386_EDI_REGNUM, &sf.sf_edi);
+  regcache_raw_supply (regcache, I386_ESI_REGNUM, &sf.sf_esi);
+  regcache_raw_supply (regcache, I386_EBP_REGNUM, &pcb->pcb_ebp);
+  regcache_raw_supply (regcache, I386_ESP_REGNUM, &pcb->pcb_esp);
+  regcache_raw_supply (regcache, I386_EBX_REGNUM, &sf.sf_ebx);
+  regcache_raw_supply (regcache, I386_EIP_REGNUM, &sf.sf_eip);
+
+  return 1;
 }
+\f
 
-/* Register that we are able to handle i386nbsd core file formats.
-   FIXME: is this really bfd_target_unknown_flavour? */
-
-static struct core_fns i386nbsd_core_fns =
-{
-  bfd_target_unknown_flavour,          /* core_flavour */
-  default_check_format,                        /* check_format */
-  default_core_sniffer,                        /* core_sniffer */
-  fetch_core_registers,                        /* core_read_registers */
-  NULL                                 /* next */
-};
-
-static struct core_fns i386nbsd_elfcore_fns =
-{
-  bfd_target_elf_flavour,              /* core_flavour */
-  default_check_format,                        /* check_format */
-  default_core_sniffer,                        /* core_sniffer */
-  fetch_elfcore_registers,             /* core_read_registers */
-  NULL                                 /* next */
-};
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+void _initialize_i386nbsd_nat (void);
 
 void
 _initialize_i386nbsd_nat (void)
 {
-  add_core_fns (&i386nbsd_core_fns);
-  add_core_fns (&i386nbsd_elfcore_fns);
+  /* We've got nothing to add to the common *BSD/i386 target.  */
+  add_target (i386bsd_target ());
+
+  /* Support debugging kernel virtual memory images.  */
+  bsd_kvm_add_target (i386nbsd_supply_pcb);
 }