From patchwork Thu Dec 17 18:38:20 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 41340 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5B082B6EEA for ; Fri, 18 Dec 2009 06:53:26 +1100 (EST) Received: from localhost ([127.0.0.1]:33334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NLMOb-0002l5-T6 for incoming@patchwork.ozlabs.org; Thu, 17 Dec 2009 14:52:21 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NLMCz-0006sG-Sd for qemu-devel@nongnu.org; Thu, 17 Dec 2009 14:40:22 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NLMCv-0006ph-Gc for qemu-devel@nongnu.org; Thu, 17 Dec 2009 14:40:19 -0500 Received: from [199.232.76.173] (port=50135 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NLMCu-0006p8-9b for qemu-devel@nongnu.org; Thu, 17 Dec 2009 14:40:16 -0500 Received: from are.twiddle.net ([75.149.56.221]:35337) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NLMCt-0004IG-UG for qemu-devel@nongnu.org; Thu, 17 Dec 2009 14:40:16 -0500 Received: by are.twiddle.net (Postfix, from userid 5000) id 83B67A32; Thu, 17 Dec 2009 11:40:12 -0800 (PST) Message-Id: <38131b3a03ff4872a19c52b5c042dd7d77341b75.1261078375.git.rth@twiddle.net> In-Reply-To: References: <761ea48b0912170620l534dcb02m8ea6b59524d76dbe@mail.gmail.com> From: Richard Henderson Date: Thu, 17 Dec 2009 10:38:20 -0800 To: qemu-devel@nongnu.org X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Laurent Desnogues Subject: [Qemu-devel] [PATCH 5/6] tcg-i386: Simplify brcond2. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Split out tcg_out_cond from tcg_out_brcond. Add "small" arguments to all branch functions for completeness. Unify all the calls to generate branches within brcond2 and pass on the small flag. Signed-off-by: Richard Henderson --- tcg/i386/tcg-target.c | 87 ++++++++++++++++++++++-------------------------- 1 files changed, 40 insertions(+), 47 deletions(-) diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.c index cc3d28f..f7b2416 100644 --- a/tcg/i386/tcg-target.c +++ b/tcg/i386/tcg-target.c @@ -355,9 +355,8 @@ static void tcg_out_jxx(TCGContext *s, int opc, int label_index, int small) } } -static void tcg_out_brcond(TCGContext *s, int cond, - TCGArg arg1, TCGArg arg2, int const_arg2, - int label_index) +static void tcg_out_cond(TCGContext *s, int cond, + TCGArg arg1, TCGArg arg2, int const_arg2) { if (const_arg2) { if (arg2 == 0) { @@ -369,68 +368,61 @@ static void tcg_out_brcond(TCGContext *s, int cond, } else { tcg_out_modrm(s, 0x01 | (ARITH_CMP << 3), arg2, arg1); } - tcg_out_jxx(s, tcg_cond_to_jcc[cond], label_index, 0); +} + +static void tcg_out_brcond(TCGContext *s, int cond, + TCGArg arg1, TCGArg arg2, int const_arg2, + int label_index, int small) +{ + tcg_out_cond(s, cond, arg1, arg2, const_arg2); + tcg_out_jxx(s, tcg_cond_to_jcc[cond], label_index, small); } /* XXX: we implement it at the target level to avoid having to handle cross basic blocks temporaries */ -static void tcg_out_brcond2(TCGContext *s, - const TCGArg *args, const int *const_args) +static void tcg_out_brcond2(TCGContext *s, const TCGArg *args, + const int *const_args, int small) { - int label_next; - label_next = gen_new_label(); - switch(args[4]) { + int label_next = gen_new_label(); + int label_dest = args[5]; + int cond = args[4], c1, c2, c3; + + switch (cond) { case TCG_COND_EQ: - tcg_out_brcond(s, TCG_COND_NE, args[0], args[2], const_args[2], label_next); - tcg_out_brcond(s, TCG_COND_EQ, args[1], args[3], const_args[3], args[5]); + c1 = -1, c2 = TCG_COND_NE, c3 = TCG_COND_EQ; break; case TCG_COND_NE: - tcg_out_brcond(s, TCG_COND_NE, args[0], args[2], const_args[2], args[5]); - tcg_out_brcond(s, TCG_COND_NE, args[1], args[3], const_args[3], args[5]); + c1 = TCG_COND_NE, c2 = -1, c3 = TCG_COND_NE; break; case TCG_COND_LT: - tcg_out_brcond(s, TCG_COND_LT, args[1], args[3], const_args[3], args[5]); - tcg_out_jxx(s, JCC_JNE, label_next, 1); - tcg_out_brcond(s, TCG_COND_LTU, args[0], args[2], const_args[2], args[5]); - break; - case TCG_COND_LE: - tcg_out_brcond(s, TCG_COND_LT, args[1], args[3], const_args[3], args[5]); - tcg_out_jxx(s, JCC_JNE, label_next, 1); - tcg_out_brcond(s, TCG_COND_LEU, args[0], args[2], const_args[2], args[5]); - break; - case TCG_COND_GT: - tcg_out_brcond(s, TCG_COND_GT, args[1], args[3], const_args[3], args[5]); - tcg_out_jxx(s, JCC_JNE, label_next, 1); - tcg_out_brcond(s, TCG_COND_GTU, args[0], args[2], const_args[2], args[5]); - break; - case TCG_COND_GE: - tcg_out_brcond(s, TCG_COND_GT, args[1], args[3], const_args[3], args[5]); - tcg_out_jxx(s, JCC_JNE, label_next, 1); - tcg_out_brcond(s, TCG_COND_GEU, args[0], args[2], const_args[2], args[5]); - break; case TCG_COND_LTU: - tcg_out_brcond(s, TCG_COND_LTU, args[1], args[3], const_args[3], args[5]); - tcg_out_jxx(s, JCC_JNE, label_next, 1); - tcg_out_brcond(s, TCG_COND_LTU, args[0], args[2], const_args[2], args[5]); + c1 = cond, c2 = TCG_COND_NE, c3 = TCG_COND_LTU; break; + case TCG_COND_LE: case TCG_COND_LEU: - tcg_out_brcond(s, TCG_COND_LTU, args[1], args[3], const_args[3], args[5]); - tcg_out_jxx(s, JCC_JNE, label_next, 1); - tcg_out_brcond(s, TCG_COND_LEU, args[0], args[2], const_args[2], args[5]); + c1 = cond, c2 = TCG_COND_NE, c3 = TCG_COND_LEU; break; + case TCG_COND_GT: case TCG_COND_GTU: - tcg_out_brcond(s, TCG_COND_GTU, args[1], args[3], const_args[3], args[5]); - tcg_out_jxx(s, JCC_JNE, label_next, 1); - tcg_out_brcond(s, TCG_COND_GTU, args[0], args[2], const_args[2], args[5]); + c1 = cond, c2 = TCG_COND_NE, c3 = TCG_COND_GTU; break; + case TCG_COND_GE: case TCG_COND_GEU: - tcg_out_brcond(s, TCG_COND_GTU, args[1], args[3], const_args[3], args[5]); - tcg_out_jxx(s, JCC_JNE, label_next, 1); - tcg_out_brcond(s, TCG_COND_GEU, args[0], args[2], const_args[2], args[5]); + c1 = cond, c2 = TCG_COND_NE, c3 = TCG_COND_GEU; break; default: - tcg_abort(); + tcg_abort (); + } + + tcg_out_cond(s, cond, args[1], args[3], const_args[3]); + if (c1 != -1) { + tcg_out_jxx(s, tcg_cond_to_jcc[c1], label_dest, small); } + if (c2 != -1) { + tcg_out_jxx(s, tcg_cond_to_jcc[c2], label_next, 1); + } + tcg_out_brcond(s, c3, args[0], args[2], const_args[2], label_dest, small); + tcg_out_label(s, label_next, (tcg_target_long)s->code_ptr); } @@ -1058,10 +1050,11 @@ static inline void tcg_out_op(TCGContext *s, int opc, tcg_out_modrm(s, 0x01 | (ARITH_SBB << 3), args[5], args[1]); break; case INDEX_op_brcond_i32: - tcg_out_brcond(s, args[2], args[0], args[1], const_args[1], args[3]); + tcg_out_brcond(s, args[2], args[0], args[1], const_args[1], + args[3], 0); break; case INDEX_op_brcond2_i32: - tcg_out_brcond2(s, args, const_args); + tcg_out_brcond2(s, args, const_args, 0); break; case INDEX_op_bswap16_i32: