From patchwork Sat Sep 22 00:18:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 186010 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EB7B42C008B for ; Sat, 22 Sep 2012 11:18:50 +1000 (EST) Received: from localhost ([::1]:40373 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TFDRP-0006hf-JR for incoming@patchwork.ozlabs.org; Fri, 21 Sep 2012 20:19:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60347) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TFDQX-0004kg-4F for qemu-devel@nongnu.org; Fri, 21 Sep 2012 20:18:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TFDQW-000170-2I for qemu-devel@nongnu.org; Fri, 21 Sep 2012 20:18:33 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:41851) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TFDQV-00015F-Km for qemu-devel@nongnu.org; Fri, 21 Sep 2012 20:18:31 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp12so8738004pbb.4 for ; Fri, 21 Sep 2012 17:18:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=GxT1bAbkfQi2HWilNBa11NlqgJ0oaEuX7bAsAiIkpKA=; b=OfbQ01DL3V/2HHnu59Q4CmKFmMx/nZSgCb6YMPFuaafot+0q1i4t0VWFfWzppQttyg wmppxLYDJxwshHU96ylRkV820/WXKpxJ2TzIh8m2u/giOvCH6esQZ6wxKLLbv8uJxw9V oaukI+d2XsSp1APXRRxT3ggaI6Ys9P9u7IaZV3yVbORN0SlCXkn6xZWD6F5dRYiv1D4A 3vz5A1TAkkmzQe5EmeVvkEbZVqE+HyQlS2u7OXLRNZl2jquCp2t37KagH4RnWg+H9qqs K9rjO1lyANp67FzZNAAqe7xsPPgDdjaW/CD2GUrWWfDWCg6ib7qfPaDB2q4ram2GnBW3 JWDA== Received: by 10.66.84.6 with SMTP id u6mr16639200pay.75.1348273111291; Fri, 21 Sep 2012 17:18:31 -0700 (PDT) Received: from anchor.twiddle.home.com ([173.160.232.49]) by mx.google.com with ESMTPS id j9sm4837761pav.15.2012.09.21.17.18.30 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Sep 2012 17:18:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 21 Sep 2012 17:18:16 -0700 Message-Id: <1348273096-1495-9-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1348273096-1495-1-git-send-email-rth@twiddle.net> References: <1348273096-1495-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: Max Filippov , aurelien@aurel32.net Subject: [Qemu-devel] [PATCH 8/8] tcg: Sanity check goto_tb input X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Checking that we don't try for idx != [01] is trivial. Checking that we don't issue more than one of any index requires a tad more data and some ifdefs protecting that new variable. Signed-off-by: Richard Henderson Cc: Max Filippov Tested-by: Max Filippov Reviewed-by: Aurelien Jarno --- tcg/tcg-op.h | 11 +++++++++-- tcg/tcg.c | 4 ++++ tcg/tcg.h | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/tcg/tcg-op.h b/tcg/tcg-op.h index ecb1ac3..9bfed48 100644 --- a/tcg/tcg-op.h +++ b/tcg/tcg-op.h @@ -2275,8 +2275,15 @@ static inline void tcg_gen_exit_tb(tcg_target_long val) tcg_gen_op1i(INDEX_op_exit_tb, val); } -static inline void tcg_gen_goto_tb(int idx) -{ +static inline void tcg_gen_goto_tb(unsigned idx) +{ + /* We only support two chained exits. */ + tcg_debug_assert(idx <= 1); +#ifdef CONFIG_DEBUG_TCG + /* Verify that we havn't seen this numbered exit before. */ + tcg_debug_assert((tcg_ctx.goto_tb_issue_mask & (1 << idx)) == 0); + tcg_ctx.goto_tb_issue_mask |= 1 << idx; +#endif tcg_gen_op1i(INDEX_op_goto_tb, idx); } diff --git a/tcg/tcg.c b/tcg/tcg.c index bb9c995..a703e1e 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -299,6 +299,10 @@ void tcg_func_start(TCGContext *s) s->nb_labels = 0; s->current_frame_offset = s->frame_start; +#ifdef CONFIG_DEBUG_TCG + s->goto_tb_issue_mask = 0; +#endif + gen_opc_ptr = gen_opc_buf; gen_opparam_ptr = gen_opparam_buf; } diff --git a/tcg/tcg.h b/tcg/tcg.h index 4501c15..af7464a 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -390,6 +390,7 @@ struct TCGContext { #ifdef CONFIG_DEBUG_TCG int temps_in_use; + int goto_tb_issue_mask; #endif };