From patchwork Tue Oct 25 19:03:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 686683 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3t3Nd76Pssz9s3s for ; Wed, 26 Oct 2016 06:34:19 +1100 (AEDT) Received: from localhost ([::1]:57765 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bz7UI-0006Qs-0R for incoming@patchwork.ozlabs.org; Tue, 25 Oct 2016 15:34:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46731) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bz718-0006HP-04 for qemu-devel@nongnu.org; Tue, 25 Oct 2016 15:04:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bz716-00087z-Rn for qemu-devel@nongnu.org; Tue, 25 Oct 2016 15:04:10 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:57939) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bz716-00086e-HO for qemu-devel@nongnu.org; Tue, 25 Oct 2016 15:04:08 -0400 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue101) with ESMTPSA (Nemesis) id 0M89c9-1ctyzU2f57-00vdOg; Tue, 25 Oct 2016 21:03:41 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 25 Oct 2016 21:03:16 +0200 Message-Id: <1477422199-11208-21-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477422199-11208-1-git-send-email-laurent@vivier.eu> References: <1477422199-11208-1-git-send-email-laurent@vivier.eu> X-Provags-ID: V03:K0:mLg+3QaKmxoP72G4XwecQInB4XtGzt/vx9hN7TL6msmHCk2lJB5 daolkGlt4aJEgfkDfPPKuWYG5/32NIkfSEYVpIIKGNCi4cmOupOaP020PAxkzwhjCG0VqtP xvvdMmratOX6utSjMll5OPdSNR3mCkzxyW41+D/vKJJWhmvqVJhyz0rt0SRNsp7Hn/HgmqI bowy6TWeeitcsWDJX8h7A== X-UI-Out-Filterresults: notjunk:1; V01:K0:+8+HbagGOBk=:lm2nxG3xSGfDHPSl3G0wnV Rx7kQcSBrrx5DojNx+mblFe6lnaOb4ZQzJp4icuIlRNDq+xrNGsDKFQ2cegsW1UK/DB1kXECp kscKtiRBRznAYVCltSzKyGegDdNtMJ9OHIAd/9FVGP9WUx92984FAnYKXmbxld6NA+Nq7YJ+b 8OE1IC88uuy9qi1Ms5Kk0mUQpcNxlqLuBMouEd0ihIsWcyvIxNQkwjBeZAWm44zww52dJNK1t rrgVDwq5tn4+YxSreL4V82GYij9C53dBVqzNR8jbXN/5H4iVjRoEGXmkM4z7m9AHZ95TTXmmA yWVg7CIfUpa1NSpB+oQbOC/ArstfeN0itDZxq+To5Q9qtwz8tpM0+CaXZDUoDBLO4IV/WGp28 b4UsDZ7avqfpKwMPwnhZO8C3J7RKlOVaS0Xi0LsG5kNuig0lfJf/rOctfRaQiMI9E4cQt/06I 6h++5awWklhrbKLeih/Ifu2w+xHHlMXCtBfxz3hzed5QFgwWVrMsUTPp7oed1mqdzjv3bn986 Gb+4+v3iNDBTx8pT1pqiZTshP5cFQ6qmhw9f4YC8wp76u8L+yyyyTr5VEhvLTVY8+A8GfbgNY YWW+xUhcQ4SKRWxxSPiOEZ2xFxTaLymcir9pJafzUJrz6dwMyQn7qzBmDjkJ7ohOuX5DLaUcN w355CqEaO302pq4zbigf+bUGIG2bQ7pWUr3Nlplm9skGXMA3TnA/gxRdZA2IOCf898zc= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.13 Subject: [Qemu-devel] [PULL 20/23] target-m68k: Introduce DisasCompare X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , gerg@uclinux.org, schwab@linux-m68k.org, agraf@suse.de, Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Signed-off-by: Richard Henderson Signed-off-by: Laurent Vivier --- target-m68k/translate.c | 85 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 61 insertions(+), 24 deletions(-) diff --git a/target-m68k/translate.c b/target-m68k/translate.c index 85d5c95..4a650e1 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -759,8 +759,15 @@ static TCGv gen_ea(CPUM68KState *env, DisasContext *s, uint16_t insn, return NULL_QREG; } -/* This generates a conditional branch, clobbering all temporaries. */ -static void gen_jmpcc(DisasContext *s, int cond, TCGLabel *l1) +typedef struct { + TCGCond tcond; + bool g1; + bool g2; + TCGv v1; + TCGv v2; +} DisasCompare; + +static void gen_cc_cond(DisasCompare *c, DisasContext *s, int cond) { TCGv tmp, tmp2; TCGCond tcond; @@ -768,61 +775,92 @@ static void gen_jmpcc(DisasContext *s, int cond, TCGLabel *l1) /* TODO: Optimize compare/branch pairs rather than always flushing flag state to CC_OP_FLAGS. */ gen_flush_flags(s); - update_cc_op(s); + + c->g1 = 1; + c->g2 = 0; + c->v2 = tcg_const_i32(0); + switch (cond) { case 0: /* T */ - tcg_gen_br(l1); - return; case 1: /* F */ - return; + c->v1 = c->v2; + tcond = TCG_COND_NEVER; + break; case 2: /* HI (!C && !Z) -> !(C || Z)*/ case 3: /* LS (C || Z) */ - tmp = tcg_temp_new(); - tcg_gen_setcondi_i32(TCG_COND_EQ, tmp, QREG_CC_Z, 0); + c->v1 = tmp = tcg_temp_new(); + c->g1 = 0; + tcg_gen_setcond_i32(TCG_COND_EQ, tmp, QREG_CC_Z, c->v2); tcg_gen_or_i32(tmp, tmp, QREG_CC_C); - tcond = (cond & 1 ? TCG_COND_NE : TCG_COND_EQ); + tcond = TCG_COND_NE; break; case 4: /* CC (!C) */ case 5: /* CS (C) */ - tmp = QREG_CC_C; - tcond = (cond & 1 ? TCG_COND_NE : TCG_COND_EQ); + c->v1 = QREG_CC_C; + tcond = TCG_COND_NE; break; case 6: /* NE (!Z) */ case 7: /* EQ (Z) */ - tmp = QREG_CC_Z; - tcond = (cond & 1 ? TCG_COND_EQ : TCG_COND_NE); + c->v1 = QREG_CC_Z; + tcond = TCG_COND_EQ; break; case 8: /* VC (!V) */ case 9: /* VS (V) */ - tmp = QREG_CC_V; - tcond = (cond & 1 ? TCG_COND_LT : TCG_COND_GE); + c->v1 = QREG_CC_V; + tcond = TCG_COND_LT; break; case 10: /* PL (!N) */ case 11: /* MI (N) */ - tmp = QREG_CC_N; - tcond = (cond & 1 ? TCG_COND_LT : TCG_COND_GE); + c->v1 = QREG_CC_N; + tcond = TCG_COND_LT; break; case 12: /* GE (!(N ^ V)) */ case 13: /* LT (N ^ V) */ - tmp = tcg_temp_new(); + c->v1 = tmp = tcg_temp_new(); + c->g1 = 0; tcg_gen_xor_i32(tmp, QREG_CC_N, QREG_CC_V); - tcond = (cond & 1 ? TCG_COND_LT : TCG_COND_GE); + tcond = TCG_COND_LT; break; case 14: /* GT (!(Z || (N ^ V))) */ case 15: /* LE (Z || (N ^ V)) */ - tmp = tcg_temp_new(); - tcg_gen_setcondi_i32(TCG_COND_EQ, tmp, QREG_CC_Z, 0); + c->v1 = tmp = tcg_temp_new(); + c->g1 = 0; + tcg_gen_setcond_i32(TCG_COND_EQ, tmp, QREG_CC_Z, c->v2); tcg_gen_neg_i32(tmp, tmp); tmp2 = tcg_temp_new(); tcg_gen_xor_i32(tmp2, QREG_CC_N, QREG_CC_V); tcg_gen_or_i32(tmp, tmp, tmp2); - tcond = (cond & 1 ? TCG_COND_LT : TCG_COND_GE); + tcg_temp_free(tmp2); + tcond = TCG_COND_LT; break; default: /* Should ever happen. */ abort(); } - tcg_gen_brcondi_i32(tcond, tmp, 0, l1); + if ((cond & 1) == 0) { + tcond = tcg_invert_cond(tcond); + } + c->tcond = tcond; +} + +static void free_cond(DisasCompare *c) +{ + if (!c->g1) { + tcg_temp_free(c->v1); + } + if (!c->g2) { + tcg_temp_free(c->v2); + } +} + +static void gen_jmpcc(DisasContext *s, int cond, TCGLabel *l1) +{ + DisasCompare c; + + gen_cc_cond(&c, s, cond); + update_cc_op(s); + tcg_gen_brcond_i32(c.tcond, c.v1, c.v2, l1); + free_cond(&c); } DISAS_INSN(scc) @@ -1678,7 +1716,6 @@ DISAS_INSN(branch) /* bsr */ gen_push(s, tcg_const_i32(s->pc)); } - update_cc_op(s); if (op > 1) { /* Bcc */ l1 = gen_new_label();