commit 730dce73a94ca51ad8f49861996058771dcd98b2
author David 'Digit' Turner <digit@google.com> Tue Mar 18 16:54:13 2014 +0100
committer David 'Digit' Turner <digit@google.com> Wed Apr 09 19:43:20 2014 +0200
tree 32e43accecb7d5c5ed4e4a3dbcc6b89f0583dc40
parent 2afeb4c534203d6ab9ce2b003315ff8c25083a31

tcg: Reload local variables after return from longjmp

Upstream 0d10193870b5a81c3bce13a602a5403c3a55cf6c

Change-Id: I5c0bb1ea9d5cb053b4c36a115a1d1fbb2fa1c3ee

cpu-exec.c

diff --git a/cpu-exec.c b/cpu-exec.c
index 17bc910..58d6e5d 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -627,6 +627,10 @@
                 /* reset soft MMU for next block (it can currently
                    only be set by a memory fault) */
             } /* for(;;) */
+        } else {
+            /* Reload env after longjmp - the compiler may have smashed all
+             * local variables as longjmp is marked 'noreturn'. */
+            env = cpu_single_env;
         }
     } /* for(;;) */