Allow for the possibility that the local labels won't be in the objdump output.

[deliverable/binutils-gdb.git] / gdb / infptrace.c

diff --git a/gdb/infptrace.c b/gdb/infptrace.c
index 4841e9c6a0aae2b55d6853a2beacf5a8453bb723..e41ca030d5ccaba388d6ddd03a5d881b4b659ba8 100644 (file)
--- a/gdb/infptrace.c
+++ b/gdb/infptrace.c
@@ -1,5 +1,6 @@
 /* Low level Unix child interface to ptrace, for GDB when running under Unix.
-   Copyright 1988, 89, 90, 91, 92, 93, 94, 95, 96, 1998, 2001 
+   Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998,
+   1999, 2000, 2001
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -24,6 +25,7 @@
 #include "inferior.h"
 #include "target.h"
 #include "gdb_string.h"
+#include "regcache.h"
 
 #include "gdb_wait.h"
 
@@ -271,8 +273,8 @@ child_resume (int pid, int step, enum target_signal signal)
 
   if (step)
     {
-      if (SOFTWARE_SINGLE_STEP_P)
-       abort ();               /* Make sure this doesn't happen. */
+      if (SOFTWARE_SINGLE_STEP_P ())
+       internal_error (__FILE__, __LINE__, "failed internal consistency check");               /* Make sure this doesn't happen. */
       else
        ptrace (PT_STEP, pid, (PTRACE_ARG3_TYPE) 1,
                target_signal_to_host (signal));
@@ -421,7 +423,7 @@ fetch_inferior_registers (int regno)
     }
   else
     {
-      for (regno = 0; regno < ARCH_NUM_REGS; regno++)
+      for (regno = 0; regno < NUM_REGS; regno++)
        {
          fetch_register (regno);
        }
@@ -485,7 +487,7 @@ store_inferior_registers (int regno)
     }
   else
     {
-      for (regno = 0; regno < ARCH_NUM_REGS; regno++)
+      for (regno = 0; regno < NUM_REGS; regno++)
        {
          store_register (regno);
        }