This is the mail archive of the gdb-patches@sources.redhat.com mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

PATCH ARM/NetBSD handle elf core files



Now we can read elf core files on ARM/NetBSD as well.

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

	* Makefile.in (armnbsd-nat.o): Update dependencies.
	* armnbsd-nat.c (supply_gregset): New function.  Common code to
	supply the integer register set.
	(supply_fparegset): New function.  Similar for FPA registers.
	(fetch_regs, fetch_fp_regs): Use them.
	(fetch_core_registers): Likewise.
	(fetch_elfcore_registers): New function.
	(arm_netbsd_elfcore_fns): New core-file type specification.
	(_initialize_arm_netbsd_nat): Register it.


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 12:13:49
*************** 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.7
diff -p -r1.7 armnbsd-nat.c
*** armnbsd-nat.c	2002/02/21 11:15:41	1.7
--- armnbsd-nat.c	2002/02/21 12:13:52
***************
*** 38,43 ****
--- 38,77 ----
  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)
  {
    struct reg inferior_registers;
*************** fetch_regs (void)
*** 97,115 ****
        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);
  }
  
  static void
--- 131,137 ----
        return;
      }
  
!   supply_gregset (&inferior_registers);
  }
  
  static void
*************** fetch_fp_regs (void)
*** 157,167 ****
        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);
  }
  
  void
--- 179,185 ----
        return;
      }
  
!   supply_fparegset (&inferior_fp_registers);
  }
  
  void
*************** fetch_core_registers (char *core_reg_sec
*** 376,403 ****
    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 =
--- 394,441 ----
    struct md_core *core_reg = (struct md_core *) core_reg_sect;
    int regno;
    CORE_ADDR r_pc;
  
!   supply_gregset (&core_reg->intreg);
!   supply_fparegset (&core_reg->freg);
! }
  
! 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 =
*************** static struct core_fns arm_netbsd_core_f
*** 409,416 ****
--- 447,464 ----
    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);
  }

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]