summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2015-04-07 11:42:09 +0100
committerPedro Alves <palves@redhat.com>2015-04-07 11:42:09 +0100
commitd9b67d9f4127191679c743d1f47d2421d6dcede7 (patch)
tree5d451af55a624cfccbd0741fdadaa583a7600ae7
parent337532fab150dc531c92a31e179df96b98a619c0 (diff)
downloadbinutils-gdb-d9b67d9f4127191679c743d1f47d2421d6dcede7.tar.gz
Displaced stepping debug: fetch the right regcache
Although not currently possible in practice when we get here, 'resume_ptid' can also be a wildcard throughout this function. It's clearer to fetch the regcache using the thread's ptid. gdb/ChangeLog: 2015-04-07 Pedro Alves <pedro@codesourcery.com> * infrun.c (resume) <displaced stepping debug output>: Get the leader thread's regcache, not resume_ptid's.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/infrun.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cfe79613412..ef9dd65a7b8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-07 Pedro Alves <pedro@codesourcery.com>
+
+ * infrun.c (resume) <displaced stepping debug output>: Get the
+ leader thread's regcache, not resume_ptid's.
+
2015-04-06 Doug Evans <xdje42@gmail.com>
* symtab.c (hash_symbol_entry): Hash STRUCT_DOMAIN symbols as
diff --git a/gdb/infrun.c b/gdb/infrun.c
index f5faa0a22af..607a6e4695c 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -2364,7 +2364,7 @@ resume (enum gdb_signal sig)
&& use_displaced_stepping (gdbarch)
&& tp->control.trap_expected)
{
- struct regcache *resume_regcache = get_thread_regcache (resume_ptid);
+ struct regcache *resume_regcache = get_thread_regcache (tp->ptid);
struct gdbarch *resume_gdbarch = get_regcache_arch (resume_regcache);
CORE_ADDR actual_pc = regcache_read_pc (resume_regcache);
gdb_byte buf[4];