2003-05-31 Andrew Cagney <cagney@redhat.com>

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

diff --git a/gdb/armnbsd-nat.c b/gdb/armnbsd-nat.c
index 8a191673c1bb0b90c359bb5710386c435b76cbf5..88396c06a143d321bcf7e1a435112acef5f1e30f 100644 (file)
--- a/gdb/armnbsd-nat.c
+++ b/gdb/armnbsd-nat.c
@@ -21,18 +21,56 @@
 
 #include "defs.h"
 
+#ifndef FETCH_INFERIOR_REGISTERS
+#error Not FETCH_INFERIOR_REGISTERS 
+#endif /* !FETCH_INFERIOR_REGISTERS */
+
 #include "arm-tdep.h"
 
-#ifdef FETCH_INFERIOR_REGISTERS
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include <machine/reg.h>
 #include <machine/frame.h>
 #include "inferior.h"
 #include "regcache.h"
+#include "gdbcore.h"
 
 extern int arm_apcs_32;
 
+static void
+supply_gregset (struct reg *gregset)
+{
+  int regno;
+  CORE_ADDR r_pc;
+
+  /* Integer registers.  */
+  for (regno = ARM_A1_REGNUM; regno < ARM_SP_REGNUM; regno++)
+    supply_register (regno, (char *) &gregset->r[regno]);
+
+  supply_register (ARM_SP_REGNUM, (char *) &gregset->r_sp);
+  supply_register (ARM_LR_REGNUM, (char *) &gregset->r_lr);
+  /* This is ok: we're running native...  */
+  r_pc = ADDR_BITS_REMOVE (gregset->r_pc);
+  supply_register (ARM_PC_REGNUM, (char *) &r_pc);
+
+  if (arm_apcs_32)
+    supply_register (ARM_PS_REGNUM, (char *) &gregset->r_cpsr);
+  else
+    supply_register (ARM_PS_REGNUM, (char *) &gregset->r_pc);
+}
+
+static void
+supply_fparegset (struct fpreg *fparegset)
+{
+  int regno;
+
+  for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++)
+    supply_register
+      (regno, (char *) &fparegset->fpr[regno - ARM_F0_REGNUM]);
+
+  supply_register (ARM_FPS_REGNUM, (char *) &fparegset->fpr_fpsr);
+}
+
 static void
 fetch_register (int regno)
 {
@@ -78,7 +116,7 @@ fetch_register (int regno)
 }
 
 static void
-fetch_regs ()
+fetch_regs (void)
 {
   struct reg inferior_registers;
   int ret;
@@ -93,19 +131,7 @@ fetch_regs ()
       return;
     }
 
-  for (regno = ARM_A1_REGNUM; regno < ARM_SP_REGNUM; regno++)
-    supply_register (regno, (char *) &inferior_registers.r[regno]);
-
-  supply_register (ARM_SP_REGNUM, (char *) &inferior_registers.r_sp);
-  supply_register (ARM_LR_REGNUM, (char *) &inferior_registers.r_lr);
-  /* This is ok: we're running native... */
-  inferior_registers.r_pc = ADDR_BITS_REMOVE (inferior_registers.r_pc);
-  supply_register (ARM_PC_REGNUM, (char *) &inferior_registers.r_pc);
-
-  if (arm_apcs_32)
-    supply_register (ARM_PS_REGNUM, (char *) &inferior_registers.r_cpsr);
-  else
-    supply_register (ARM_PS_REGNUM, (char *) &inferior_registers.r_pc);
+  supply_gregset (&inferior_registers);
 }
 
 static void
@@ -138,7 +164,7 @@ fetch_fp_register (int regno)
 }
 
 static void
-fetch_fp_regs ()
+fetch_fp_regs (void)
 {
   struct fpreg inferior_fp_registers;
   int ret;
@@ -153,11 +179,7 @@ fetch_fp_regs ()
       return;
     }
 
-  for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++)
-    supply_register
-      (regno, (char *) &inferior_fp_registers.fpr[regno - ARM_F0_REGNUM]);
-
-  supply_register (ARM_FPS_REGNUM, (char *) &inferior_fp_registers.fpr_fpsr);
+  supply_fparegset (&inferior_fp_registers);
 }
 
 void
@@ -247,7 +269,7 @@ store_register (int regno)
 }
 
 static void
-store_regs ()
+store_regs (void)
 {
   struct reg inferior_registers;
   int ret;
@@ -322,7 +344,7 @@ store_fp_register (int regno)
 }
 
 static void
-store_fp_regs ()
+store_fp_regs (void)
 {
   struct fpreg inferior_fp_registers;
   int ret;
@@ -365,19 +387,78 @@ struct md_core
   struct fpreg freg;
 };
 
-void
+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;
+  int regno;
+  CORE_ADDR r_pc;
 
-  /* integer registers */
-  memcpy (&registers[REGISTER_BYTE (0)], &core_reg->intreg,
-         sizeof (struct reg));
-  /* floating point registers */
-  /* XXX */
+  supply_gregset (&core_reg->intreg);
+  supply_fparegset (&core_reg->freg);
 }
 
-#else
-#error Not FETCH_INFERIOR_REGISTERS 
-#endif /* !FETCH_INFERIOR_REGISTERS */
+static void
+fetch_elfcore_registers (char *core_reg_sect, unsigned core_reg_size,
+                        int which, CORE_ADDR ignore)
+{
+  struct reg gregset;
+  struct fpreg fparegset;
+
+  switch (which)
+    {
+    case 0:    /* Integer registers.  */
+      if (core_reg_size != sizeof (struct reg))
+       warning ("wrong size of register set in core file");
+      else
+       {
+         /* The memcpy may be unnecessary, but we can't really be sure
+            of the alignment of the data in the core file.  */
+         memcpy (&gregset, core_reg_sect, sizeof (gregset));
+         supply_gregset (&gregset);
+       }
+      break;
+
+    case 2:
+      if (core_reg_size != sizeof (struct fpreg))
+       warning ("wrong size of FPA register set in core file");
+      else
+       {
+         /* The memcpy may be unnecessary, but we can't really be sure
+            of the alignment of the data in the core file.  */
+         memcpy (&fparegset, core_reg_sect, sizeof (fparegset));
+         supply_fparegset (&fparegset);
+       }
+      break;
+
+    default:
+      /* Don't know what kind of register request this is; just ignore it.  */
+      break;
+    }
+}
+
+static struct core_fns arm_netbsd_core_fns =
+{
+  bfd_target_unknown_flavour,          /* core_flovour.  */
+  default_check_format,                        /* check_format.  */
+  default_core_sniffer,                        /* core_sniffer.  */
+  fetch_core_registers,                        /* core_read_registers.  */
+  NULL
+};
+
+static struct core_fns arm_netbsd_elfcore_fns =
+{
+  bfd_target_elf_flavour,              /* core_flovour.  */
+  default_check_format,                        /* check_format.  */
+  default_core_sniffer,                        /* core_sniffer.  */
+  fetch_elfcore_registers,             /* core_read_registers.  */
+  NULL
+};
+
+void
+_initialize_arm_netbsd_nat (void)
+{
+  add_core_fns (&arm_netbsd_core_fns);
+  add_core_fns (&arm_netbsd_elfcore_fns);
+}