PATCH arm/netbsd a.out core file support

[Richard Earnshaw <rearnsha at arm dot com>]

We can now read a.out style core files on ARM/NetBSD.

Also fixed some whinges from the ARI script.

R.

2002-02-21  Richard Earnshaw  <rearnsha@arm.com>

	* armnbsd-nat.c: Include gdbcore.h.
	(FETCH_INFERIOR_REGISTERS): Just error if this isn't defined.
	(fetch_regs, fetch_fp_regs, store_regs, store_fp_regs): Add explicit
	'void' to declaration, to shut up ARI.
	(fetch_core_registers): Make static.  Rewrite using supply_register.
	(arm_netbsd_core_fns): New core-file type specification.
	(_initialize_arm_netbsd_nat): New function.


Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.159
diff -p -r1.159 Makefile.in
*** Makefile.in	2002/02/15 13:35:25	1.159
--- Makefile.in	2002/02/21 11:08:58
*************** arm-tdep.o: arm-tdep.c $(defs_h) $(frame
*** 1251,1257 ****
  	$(BFD_SRC)/elf-bfd.h $(INCLUDE_DIR)/coff/internal.h \
  	$(INCLUDE_DIR)/elf/arm.h 
  
! armnbsd-nat.o: armnbsd-nat.c $(defs_h) arm-tdep.h $(inferior_h) $(regcache_h)
  
  armnbsd-tdep.o: armnbsd-tdep.c $(defs_h) arm-tdep.h
  
--- 1251,1258 ----
  	$(BFD_SRC)/elf-bfd.h $(INCLUDE_DIR)/coff/internal.h \
  	$(INCLUDE_DIR)/elf/arm.h 
  
! armnbsd-nat.o: armnbsd-nat.c $(defs_h) arm-tdep.h $(inferior_h) $(regcache_h) \
! 	$(gdbcore_h)
  
  armnbsd-tdep.o: armnbsd-tdep.c $(defs_h) arm-tdep.h
  
Index: armnbsd-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/armnbsd-nat.c,v
retrieving revision 1.6
diff -p -r1.6 armnbsd-nat.c
*** armnbsd-nat.c	2002/02/19 17:26:27	1.6
--- armnbsd-nat.c	2002/02/21 11:08:59
***************
*** 21,35 ****
  
  #include "defs.h"
  
  #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"
  
  extern int arm_apcs_32;
  
--- 21,39 ----
  
  #include "defs.h"
  
+ #ifndef FETCH_INFERIOR_REGISTERS
+ #error Not FETCH_INFERIOR_REGISTERS 
+ #endif /* !FETCH_INFERIOR_REGISTERS */
+ 
  #include "arm-tdep.h"
  
  #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;
  
*************** fetch_register (int regno)
*** 78,84 ****
  }
  
  static void
! fetch_regs ()
  {
    struct reg inferior_registers;
    int ret;
--- 82,88 ----
  }
  
  static void
! fetch_regs (void)
  {
    struct reg inferior_registers;
    int ret;
*************** fetch_fp_register (int regno)
*** 138,144 ****
  }
  
  static void
! fetch_fp_regs ()
  {
    struct fpreg inferior_fp_registers;
    int ret;
--- 142,148 ----
  }
  
  static void
! fetch_fp_regs (void)
  {
    struct fpreg inferior_fp_registers;
    int ret;
*************** store_register (int regno)
*** 247,253 ****
  }
  
  static void
! store_regs ()
  {
    struct reg inferior_registers;
    int ret;
--- 251,257 ----
  }
  
  static void
! store_regs (void)
  {
    struct reg inferior_registers;
    int ret;
*************** store_fp_register (int regno)
*** 322,328 ****
  }
  
  static void
! store_fp_regs ()
  {
    struct fpreg inferior_fp_registers;
    int ret;
--- 326,332 ----
  }
  
  static void
! store_fp_regs (void)
  {
    struct fpreg inferior_fp_registers;
    int ret;
*************** struct md_core
*** 365,383 ****
    struct fpreg freg;
  };
  
! 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;
  
!   /* integer registers */
!   memcpy (&registers[REGISTER_BYTE (0)], &core_reg->intreg,
! 	  sizeof (struct reg));
!   /* floating point registers */
!   /* XXX */
  }
  
! #else
! #error Not FETCH_INFERIOR_REGISTERS 
! #endif /* !FETCH_INFERIOR_REGISTERS */
--- 369,416 ----
    struct fpreg freg;
  };
  
! 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.  */
+   for (regno = ARM_A1_REGNUM; regno < ARM_SP_REGNUM; regno++)
+     supply_register (regno, (char *) &core_reg->intreg.r[regno]);
+ 
+   supply_register (ARM_SP_REGNUM, (char *) &core_reg->intreg.r_sp);
+   supply_register (ARM_LR_REGNUM, (char *) &core_reg->intreg.r_lr);
+   /* This is ok: we're running native...  */
+   r_pc = ADDR_BITS_REMOVE (core_reg->intreg.r_pc);
+   supply_register (ARM_PC_REGNUM, (char *) &r_pc);
+ 
+   if (arm_apcs_32)
+     supply_register (ARM_PS_REGNUM, (char *) &core_reg->intreg.r_cpsr);
+   else
+     supply_register (ARM_PS_REGNUM, (char *) &core_reg->intreg.r_pc);
  
!   /* Floating-point registers.  */
!   for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++)
!     supply_register
!       (regno, (char *) &core_reg->freg.fpr[regno - ARM_F0_REGNUM]);
! 
!   supply_register (ARM_FPS_REGNUM, (char *) &core_reg->freg.fpr_fpsr);
  }
  
! 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
! };
! 
! void
! _initialize_arm_netbsd_nat (void)
! {
!   add_core_fns (&arm_netbsd_core_fns);
! }