From: Pedro Alves <palves@redhat.com>
Date: Tue, 7 Apr 2015 10:42:09 +0000 (+0100)
Subject: Displaced stepping debug: fetch the right regcache
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d9b67d9f4127191679c743d1f47d2421d6dcede7;p=binutils-gdb.git

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.
---

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];