From patchwork Thu Jan 24 04:03:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 215213 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 9F0272C007C for ; Thu, 24 Jan 2013 15:28:16 +1100 (EST) Received: from localhost ([::1]:37414 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TyEQA-0003zK-L3 for incoming@patchwork.ozlabs.org; Wed, 23 Jan 2013 23:28:14 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56080) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TyEQ0-0003pp-7o for qemu-devel@nongnu.org; Wed, 23 Jan 2013 23:28:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TyE3O-0004QA-C9 for qemu-devel@nongnu.org; Wed, 23 Jan 2013 23:04:49 -0500 Received: from mail-pb0-f52.google.com ([209.85.160.52]:44336) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TyE3O-0004Q0-43 for qemu-devel@nongnu.org; Wed, 23 Jan 2013 23:04:42 -0500 Received: by mail-pb0-f52.google.com with SMTP id uo5so227371pbc.11 for ; Wed, 23 Jan 2013 20:04:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=R2QdRZTrUDHk/6AViDXp4zGlBI4vlNSftPggTjlx3G8=; b=AJ15heOW8U1dWyqbH/BPxLprBo41H86XjfLNxDoPTTfMGFRvSRPglfjOW/MwMH40Ti SxYmXnwQUaHhqgWcjQ+sGL98svOOCPcmXO2LPLagg60FfH34q+3/AQy+h3erxYBYobnh Z3x4QuVK1s733XinGF8clQ8DgJ6RCVcFeeM5vp2EN0RhHsA/FbfkNaObCP1wDcrlIwl+ oUwDzzZqZCvwPdZiLqhPn9TL3l+LUFOCgx269sR9WmLsm3MNaEfHLLCvhrd/iEBwfcJ1 bNfGXCmGsQTdFJroUBCTXQcQY2BmkQwemdSLnAmxaG6YUumW4G9Jj0G2oNoOaaZ9W+xt dCRw== X-Received: by 10.68.131.73 with SMTP id ok9mr1417919pbb.83.1359000281490; Wed, 23 Jan 2013 20:04:41 -0800 (PST) Received: from anchor.twiddle.home (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPS id ot3sm14027480pbb.38.2013.01.23.20.04.39 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 23 Jan 2013 20:04:40 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 23 Jan 2013 20:03:18 -0800 Message-Id: <1359000221-19834-35-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1359000221-19834-1-git-send-email-rth@twiddle.net> References: <1359000221-19834-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.160.52 Cc: Blue Swirl , Paolo Bonzini Subject: [Qemu-devel] [PATCH 34/57] target-i386: expand cmov via movcond 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 Signed-off-by: Richard Henderson --- target-i386/translate.c | 52 ++++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/target-i386/translate.c b/target-i386/translate.c index 2a220c1..9752c16 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -2410,33 +2410,37 @@ static inline void gen_jcc(DisasContext *s, int b, static void gen_cmovcc1(CPUX86State *env, DisasContext *s, int ot, int b, int modrm, int reg) { - int l1, mod = (modrm >> 6) & 3; - TCGv t0 = tcg_temp_local_new(); + CCPrepare cc; - if (mod != 3) { - int reg_addr, offset_addr; - gen_lea_modrm(env, s, modrm, ®_addr, &offset_addr); - gen_op_ld_v(ot + s->mem_index, t0, cpu_A0); - } else { - int rm = (modrm & 7) | REX_B(s); - gen_op_mov_v_reg(ot, t0, rm); - } + gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 0); - l1 = gen_new_label(); - gen_jcc1(s, b ^ 1, l1); -#ifdef TARGET_X86_64 - if (ot == OT_LONG) { - tcg_gen_mov_tl(cpu_regs[reg], t0); - gen_set_label(l1); - tcg_gen_ext32u_tl(cpu_regs[reg], cpu_regs[reg]); - } else -#endif - { - gen_op_mov_reg_v(ot, reg, t0); - gen_set_label(l1); - } + cc = gen_prepare_cc(s, b, cpu_T[1]); + switch (cc.cond) { + default: + if (cc.mask != -1) { + TCGv t0 = tcg_temp_new(); + tcg_gen_andi_tl(t0, cc.reg, cc.mask); + cc.reg = t0; + } + if (!cc.use_reg2) { + cc.reg2 = tcg_const_tl(cc.imm); + } - tcg_temp_free(t0); + tcg_gen_movcond_tl(cc.cond, cpu_T[0], cc.reg, cc.reg2, + cpu_T[0], cpu_regs[reg]); + + if (cc.mask != -1) { + tcg_temp_free(cc.reg); + } + if (!cc.use_reg2) { + tcg_temp_free(cc.reg2); + } + /* FALLTHRU */ + case TCG_COND_ALWAYS: + gen_op_mov_reg_T0(ot, reg); + case TCG_COND_NEVER: + break; + } } static inline void gen_op_movl_T0_seg(int seg_reg)