* mips-tdep.c (mips_single_step_through_delay): Put back check for

breakpoint lost with the introduction of this function.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b1e9a7c2db8b4d3f7aed716e954f091f8ffe71d6..91ee65ed4808d040b439f54f083ead4edc996a10 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-17  Mark Kettenis  <[email protected]>
+
+       * mips-tdep.c (mips_single_step_through_delay): Put back check for
+       breakpoint lost with the introduction of this function.
+
 2005-03-17  Paul Brook  <[email protected]>
 
        * amd64-tdep.c (amd64_dwarf_reg_to_regnum): Fix broken logic.

diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 64e3cc19b85b32b679baec0b1efd90f1f51a1f27..803883721bf682af04dac9de61539073b643f577 100644 (file)
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -4148,6 +4148,9 @@ mips_single_step_through_delay (struct gdbarch *gdbarch,
   if (mips_pc_is_mips16 (pc))
     return 0;
 
+  if (!breakpoint_here_p (pc + 4))
+    return 0;
+
   if (!safe_frame_unwind_memory (frame, pc, buf, sizeof buf))
     /* If error reading memory, guess that it is not a delayed
        branch.  */