summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@gnu.org>2005-03-17 18:07:46 +0000
committerMark Kettenis <kettenis@gnu.org>2005-03-17 18:07:46 +0000
commit0eb5c8f34536887df8d630212824b8135ac8b090 (patch)
treecee864e06ef1b0bad51a7d234828653396a86e88
parentd6e5fd7484618b927c3977fd37ae6a5231fbd56b (diff)
downloadgdb-0eb5c8f34536887df8d630212824b8135ac8b090.tar.gz
* mips-tdep.c (mips_single_step_through_delay): Put back check for
breakpoint lost with the introduction of this function.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/mips-tdep.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b1e9a7c2db8..91ee65ed480 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 64e3cc19b85..803883721bf 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. */