fixed TB linking in case of code invalidation (fixes random segfaults)

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@469 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/cpu-exec.c b/cpu-exec.c
index 1f08934cb77ef4ab92f5d165d7de09f8532273b5..5bbace345ffbc0781d54b6f863a39be19322b582 100644 (file)
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -21,6 +21,8 @@
 #include "exec.h"
 #include "disas.h"
 
+int tb_invalidated_flag;
+
 //#define DEBUG_EXEC
 //#define DEBUG_SIGNAL
 
@@ -273,8 +275,17 @@ int cpu_exec(CPUState *env1)
                     tb->tc_ptr = tc_ptr;
                     tb->cs_base = (unsigned long)cs_base;
                     tb->flags = flags;
-                    /* XXX: an MMU exception can occur here */
+                    tb_invalidated_flag = 0;
                     cpu_gen_code(env, tb, CODE_GEN_MAX_SIZE, &code_gen_size);
+                    if (tb_invalidated_flag) {
+                        /* as some TB could have been invalidated because
+                           of memory exceptions while generating the code, we
+                           must recompute the hash index here */
+                        ptb = &tb_hash[tb_hash_func((unsigned long)pc)];
+                        while (*ptb != NULL)
+                            ptb = &(*ptb)->hash_next;
+                        T0 = 0;
+                    }
                     *ptb = tb;
                     tb->hash_next = NULL;
                     tb_link(tb);

diff --git a/exec-all.h b/exec-all.h
index 7d0972e862a59fe9e74b6e9053d1d653db8de568..2023cf225e9984c7032a57267efcdd032a9f478a 100644 (file)
--- a/exec-all.h
+++ b/exec-all.h
@@ -416,6 +416,7 @@ static inline int spin_trylock(spinlock_t *lock)
 
 extern spinlock_t tb_lock;
 
+extern int tb_invalidated_flag;
 
 #if defined(TARGET_I386) && !defined(CONFIG_USER_ONLY)
 

diff --git a/exec.c b/exec.c
index ca767e2af0cdbf2f96529a3cd5356160b5589bfa..9cc251f959f6060080a54cac75482fa8cb5973dc 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -362,6 +362,8 @@ static inline void tb_invalidate(TranslationBlock *tb, int parity)
     unsigned int h, n1;
     TranslationBlock *tb1, *tb2;
     
+    tb_invalidated_flag = 1;
+    
     /* remove the TB from the hash list */
     h = tb_hash_func(tb->pc);
     tb_remove(&tb_hash[h], tb,