mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add assertions about env->current_tb

Browse Source 
By virtue of the previous patch env->current_tb will always be NULL at
the top of cpu_exec's outermost for loop, and at the end of the innermost
while loop.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Paolo Bonzini 2010-01-15 09:42:08 +01:00 committed by Anthony Liguori
parent 1c3569fe4e
commit 34dec6a560
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cpu-exec.c
View File

@ -22,6 +22,8 @@
#include "tcg.h"
#include "kvm.h"
#include <assert.h>
#if !defined(CONFIG_SOFTMMU)
#undef EAX
#undef ECX
@ -260,7 +262,7 @@ int cpu_exec(CPUState *env1)
env = cpu_single_env;
#define env cpu_single_env
#endif
env->current_tb = NULL;
assert (env->current_tb == NULL);
/* if an exception is pending, we execute it here */
if (env->exception_index >= 0) {
if (env->exception_index >= EXCP_INTERRUPT) {
@ -595,6 +597,7 @@ int cpu_exec(CPUState *env1)
}
spin_unlock(&tb_lock);
env->current_tb = tb;
assert (env->current_tb);
/* cpu_interrupt might be called while translating the
TB, but before it is linked into a potentially
@ -640,6 +643,7 @@ int cpu_exec(CPUState *env1)
cpu_loop_exit();
}
}
assert (env->current_tb == NULL);
}
/* reset soft MMU for next block (it can currently
only be set by a memory fault) */