Renamed config/te-netbsd532.h to te-nbsd532.h.

[binutils.git] / gdb / coredep.c

diff --git a/gdb/coredep.c b/gdb/coredep.c
index bb26b081e17c950474981b0ecdd6552878c90c07..678785d0f5d1f346b73739d01ce5124a13382eee 100644 (file)
--- a/gdb/coredep.c
+++ b/gdb/coredep.c
@@ -21,20 +21,34 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
    this file is more machine-specific.  */
 
 #include "defs.h"
+#include <sys/types.h>
+#include <sys/param.h>
 #include "gdbcore.h"
-#include <stdio.h>
+#include "value.h" /* For supply_register.  */
+#include "inferior.h" /* For ARCH_NUM_REGS. */
 
 /* These are needed on various systems to expand REGISTER_U_ADDR.  */
-#include <sys/types.h>
-#include <sys/param.h>
 #ifndef USG
 #include <sys/dir.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/user.h>
-#include <sys/ptrace.h>
+#ifndef NO_PTRACE_H
+# ifdef PTRACE_IN_WRONG_PLACE
+#  include <ptrace.h>
+# else /* !PTRACE_IN_WRONG_PLACE */
+#  include <sys/ptrace.h>
+# endif /* !PTRACE_IN_WRONG_PLACE */
+#endif /* NO_PTRACE_H */
 #endif
 
+#ifndef CORE_REGISTER_ADDR
+#define CORE_REGISTER_ADDR(regno, regptr) register_addr(regno, regptr)
+#endif /* CORE_REGISTER_ADDR */
+
+#ifdef NEED_SYS_CORE_H
+#include <sys/core.h>
+#endif
 
 /* Extract the register values out of the core file and store
    them where `read_register' will find them.
@@ -60,21 +74,20 @@ fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
   register unsigned int addr;
   int bad_reg = -1;
   register reg_ptr = -reg_addr;                /* Original u.u_ar0 is -reg_addr. */
+  int numregs = ARCH_NUM_REGS;
 
   /* If u.u_ar0 was an absolute address in the core file, relativize it now,
      so we can use it as an offset into core_reg_sect.  When we're done,
      "register 0" will be at core_reg_sect+reg_ptr, and we can use
-     register_addr to offset to the other registers.  If this is a modern
+     CORE_REGISTER_ADDR to offset to the other registers.  If this is a modern
      core file without a upage, reg_ptr will be zero and this is all a big
      NOP.  */
   if (reg_ptr > core_reg_size)
     reg_ptr -= KERNEL_U_ADDR;
-  if (reg_ptr > core_reg_size)
-    fprintf (stderr, "Can't find registers in core file\n");
 
-  for (regno = 0; regno < NUM_REGS; regno++)
+  for (regno = 0; regno < numregs; regno++)
     {
-      addr = register_addr (regno, reg_ptr);
+      addr = CORE_REGISTER_ADDR (regno, reg_ptr);
       if (addr >= core_reg_size) {
        if (bad_reg < 0)
          bad_reg = regno;
@@ -82,7 +95,7 @@ fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
        supply_register (regno, core_reg_sect + addr);
       }
     }
-  if (bad_reg > 0)
+  if (bad_reg >= 0)
     {
       error ("Register %s not found in core file.", reg_names[bad_reg]);
     }
@@ -101,7 +114,7 @@ register_addr (regno, blockend)
 {
   int addr;
 
-  if (regno < 0 || regno >= NUM_REGS)
+  if (regno < 0 || regno >= ARCH_NUM_REGS)
     error ("Invalid register number %d.", regno);
 
   REGISTER_U_ADDR (addr, blockend, regno);