From: Mark Kettenis <kettenis@gnu.org>
Date: Thu, 17 Mar 2005 18:07:46 +0000 (+0000)
Subject: * mips-tdep.c (mips_single_step_through_delay): Put back check for
X-Git-Tag: csl-arm-20050325-branchpoint~112
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=06648491d7c95ff1100c347d526f6ae76a14c9e5;p=external%2Fbinutils.git

* 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 b1e9a7c..91ee65e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-17  Mark Kettenis  <kettenis@gnu.org>
+
+	* 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  <paul@codesourcery.com>
 
 	* amd64-tdep.c (amd64_dwarf_reg_to_regnum): Fix broken logic.
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 64e3cc1..8038837 100644
--- 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.  */