From d9b67d9f4127191679c743d1f47d2421d6dcede7 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 7 Apr 2015 11:42:09 +0100 Subject: [PATCH] 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 * infrun.c (resume) : Get the leader thread's regcache, not resume_ptid's. --- gdb/ChangeLog | 5 +++++ gdb/infrun.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 + + * infrun.c (resume) : Get the + leader thread's regcache, not resume_ptid's. + 2015-04-06 Doug Evans * 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]; -- 2.30.2