From c7e8a53cdd5cd68ded1e80c52a691791fb28a0e4 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 20 Nov 2008 17:06:05 +0000 Subject: [PATCH] * infrun.c (resume): If following a fork, also reset regcache, gdbarch and pc. --- gdb/ChangeLog | 5 +++++ gdb/infrun.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 89f352dea29..3d8d441bcf1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2008-11-20 Pedro Alves + + * infrun.c (resume): If following a fork, also reset regcache, + gdbarch and pc. + 2008-11-20 Doug Evans * printcmd.c (sym_info): Don't print the offset if it's zero. diff --git a/gdb/infrun.c b/gdb/infrun.c index 93ee00bc00a..4043e75e5b3 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -965,10 +965,13 @@ resume (int step, enum target_signal sig) { int should_resume = 1; struct cleanup *old_cleanups = make_cleanup (resume_cleanups, 0); + + /* Note that these must be reset if we follow a fork below. */ struct regcache *regcache = get_current_regcache (); struct gdbarch *gdbarch = get_regcache_arch (regcache); struct thread_info *tp = inferior_thread (); CORE_ADDR pc = regcache_read_pc (regcache); + QUIT; if (debug_infrun) @@ -1057,6 +1060,9 @@ a command like `return' or `jump' to continue execution.")); /* Following a child fork will change our notion of current thread. */ tp = inferior_thread (); + regcache = get_current_regcache (); + gdbarch = get_regcache_arch (regcache); + pc = regcache_read_pc (regcache); break; case TARGET_WAITKIND_EXECD: -- 2.30.2