Re: Fix foll-fork.exp foll-vfork.exp fork-child-threads.exp

Pedro Alves
2008-11-20T15:06:42Z

[-- Attachment #1: Type: text/plain, Size: 435 bytes --]

On Thursday 20 November 2008 14:28:24, Ulrich Weigand wrote:

> I guess the "regcache" and "gdbarch" variables now also contain stale
> information. That's not an actual problem right now, as regcache is
> (currently) not used after this point, and gdbarch (today) will never
> actually change -- but in order to reduce potential future problems,
> I think those should also be reset.

Right, how about the attached?

--
Pedro Alves

[-- Attachment #2: foll_fork_dang2.diff --]
[-- Type: text/x-diff, Size: 1241 bytes --]

2008-11-20 Pedro Alves <pedro@codesourcery.com>

* infrun.c (resume): If following a fork, also reset regcache,
gdbarch and pc.

---
gdb/infrun.c | 6 ++++++
1 file changed, 6 insertions(+)

Index: src/gdb/infrun.c
===================================================================
--- src.orig/gdb/infrun.c 2008-11-20 14:59:05.000000000 +0000
+++ src/gdb/infrun.c 2008-11-20 15:03:21.000000000 +0000
@@ -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 con
/* 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;