aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/infrun.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0c48bd3..890131c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-13 Luis Machado <lgustavo@codesourcery.com>
+
+ * infrun.c (resume): Update PC address to the real PC after
+ preparing to do displaced stepping.
+
2012-04-12 Doug Evans <dje@google.com>
* dwarf2read.c (lookup_signatured_type): Remove arg "objfile", unused.
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 62f67c9..a7d6c3c 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -1789,6 +1789,10 @@ a command like `return' or `jump' to continue execution."));
return;
}
+ /* Update pc to reflect the new address from which we will execute
+ instructions due to displaced stepping. */
+ pc = regcache_read_pc (get_thread_regcache (inferior_ptid));
+
displaced = get_displaced_stepping_state (ptid_get_pid (inferior_ptid));
step = gdbarch_displaced_step_hw_singlestep (gdbarch,
displaced->step_closure);