From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NVhl4-0003nz-DJ for qemu-devel@nongnu.org; Fri, 15 Jan 2010 03:42:18 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NVhl0-0003jm-TY for qemu-devel@nongnu.org; Fri, 15 Jan 2010 03:42:18 -0500 Received: from [199.232.76.173] (port=38979 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NVhl0-0003je-Mh for qemu-devel@nongnu.org; Fri, 15 Jan 2010 03:42:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48372) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NVhl0-0003vC-48 for qemu-devel@nongnu.org; Fri, 15 Jan 2010 03:42:14 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0F8gDGY001780 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 15 Jan 2010 03:42:13 -0500 Received: from localhost.localdomain (vpn2-8-52.ams2.redhat.com [10.36.8.52]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0F8gAib030958 for ; Fri, 15 Jan 2010 03:42:12 -0500 From: Paolo Bonzini Date: Fri, 15 Jan 2010 09:42:08 +0100 Message-Id: <1263544930-18620-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1263544930-18620-1-git-send-email-pbonzini@redhat.com> References: <1263544930-18620-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 2/4] add assertions about env->current_tb List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- cpu-exec.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/cpu-exec.c b/cpu-exec.c index 9128df9..d974141 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -22,6 +22,8 @@ #include "tcg.h" #include "kvm.h" +#include + #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) */ -- 1.6.5.2