From patchwork Tue Oct 25 19:03:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 9395267 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A140660233 for ; Tue, 25 Oct 2016 19:24:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E3BBA2972D for ; Tue, 25 Oct 2016 19:24:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D82A029730; Tue, 25 Oct 2016 19:24:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 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 mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 56A702972D for ; Tue, 25 Oct 2016 19:24:14 +0000 (UTC) Received: from localhost ([::1]:57712 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bz7KX-0005iv-Hq for patchwork-qemu-devel@patchwork.kernel.org; Tue, 25 Oct 2016 15:24:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46613) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bz70t-000637-GN for qemu-devel@nongnu.org; Tue, 25 Oct 2016 15:03:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bz70s-0007xZ-BB for qemu-devel@nongnu.org; Tue, 25 Oct 2016 15:03:55 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:54832) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bz70s-0007wn-0y for qemu-devel@nongnu.org; Tue, 25 Oct 2016 15:03:54 -0400 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue101) with ESMTPSA (Nemesis) id 0MPXwP-1c3FsS2u5B-004lh8; Tue, 25 Oct 2016 21:03:33 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 25 Oct 2016 21:03:07 +0200 Message-Id: <1477422199-11208-12-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:Kvvc2J1rhf5y0txsP+7CZM03QAO1d39hJxfhFASCHxaKW2loxRD oXwYrpQdhqtEvIeJYL9TtGXPaNAyDeqex90U8niRMv+sTqnswNHzUVi7cCIL0Q5w3vpIXk+ b/ICnlwS3gf+imoIFBxaBIPEDCPiIMlzLWJmY3Vi0B23NMUHWKZun8QuoqMwGcXJDBJDUIr 6XJEyv5ycgvdE2YpCR4GA== X-UI-Out-Filterresults: notjunk:1; V01:K0:zl/3j6ro57g=:ntf47eWcuUwUxuvkwzSFyJ CZhGY1Huwplpyy2J4mdk/++zxAlLz+JIZLcByCv6iV9QPWUE99VjFd4QlANO+pgBGEmHm609j 15Ej0X0dmIopEjOLwI0iCPzqWcjNJ7pc88QGpiBaTyJu28jqpnokYq6B6GJ2owVzf+JLI9xs8 gwlNxjc/25NdSyRJVyjemLsaNd2dMq3VCZWuHEcz3YMvPSIMzZhTeCkWP1DKKjzSUJCU79/ur w5326vy0RzWfmhOsRMgAclvQwVsgAmhKjzJEH9k9Uc1J8d40uIyVk+LFr13mUDb5AsTvPPRZN 0JbrIAZq4E9trVccCnmudcubMpDwOVkBQSQnpv7Ml9HjXPeNJhyiyADLvNJLDyy/yUPiiDtlP VkRiXHd/AQRiez55xwN+6KjyvV6QmYvxuPOt6AFREQxs9jrObhiD2OO1Poru7PkhKYeerTf9Q voQebLChQNVN1j7EJMP5EwBmosdGaG09eVIaZ0qh55hqcelvYr4CBtnHxZDd7F5BdBBDx4RbA 88gzrucU41Et6bkifJy16RW/I7v2+FNH7XOqCeXje9Aw5hB8TfkEbr5tqBnb/kHoe0zkL//XB krBkCepdus8jY7L/WM8RSFTCJM8pju/cKGteo/kt9yA8rgzDFvzUXRSDwdLMf8+kWm85/F682 MHgYmxMwZq6M+wMr9PaV20O8Ez1nckrqnX0VKoULXjxrPvBsnOY7ojsaYIikKtYu1LjA= 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 11/23] target-m68k: Replace helper_xflag_lt with setcond 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Richard Henderson Signed-off-by: Richard Henderson Signed-off-by: Laurent Vivier --- target-m68k/helper.c | 5 ----- target-m68k/helper.h | 1 - target-m68k/translate.c | 14 +++++++------- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/target-m68k/helper.c b/target-m68k/helper.c index 4fe36b8..dc55a7a 100644 --- a/target-m68k/helper.c +++ b/target-m68k/helper.c @@ -464,11 +464,6 @@ uint32_t HELPER(addx_cc)(CPUM68KState *env, uint32_t op1, uint32_t op2) return res; } -uint32_t HELPER(xflag_lt)(uint32_t a, uint32_t b) -{ - return a < b; -} - void HELPER(set_sr)(CPUM68KState *env, uint32_t val) { env->sr = val & 0xffff; diff --git a/target-m68k/helper.h b/target-m68k/helper.h index f4e5fdf..c24ace5 100644 --- a/target-m68k/helper.h +++ b/target-m68k/helper.h @@ -8,7 +8,6 @@ DEF_HELPER_3(subx_cc, i32, env, i32, i32) DEF_HELPER_3(shl_cc, i32, env, i32, i32) DEF_HELPER_3(shr_cc, i32, env, i32, i32) DEF_HELPER_3(sar_cc, i32, env, i32, i32) -DEF_HELPER_2(xflag_lt, i32, i32, i32) DEF_HELPER_2(set_sr, void, env, i32) DEF_HELPER_3(movec, void, env, i32, i32) diff --git a/target-m68k/translate.c b/target-m68k/translate.c index e2f176e..650c141 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -1032,10 +1032,10 @@ DISAS_INSN(addsub) } if (add) { tcg_gen_add_i32(dest, tmp, src); - gen_helper_xflag_lt(QREG_CC_X, dest, src); + tcg_gen_setcond_i32(TCG_COND_LTU, QREG_CC_X, dest, src); s->cc_op = CC_OP_ADD; } else { - gen_helper_xflag_lt(QREG_CC_X, tmp, src); + tcg_gen_setcond_i32(TCG_COND_LTU, QREG_CC_X, tmp, src); tcg_gen_sub_i32(dest, tmp, src); s->cc_op = CC_OP_SUB; } @@ -1248,7 +1248,7 @@ DISAS_INSN(arith_im) break; case 2: /* subi */ tcg_gen_mov_i32(dest, src1); - gen_helper_xflag_lt(QREG_CC_X, dest, tcg_const_i32(im)); + tcg_gen_setcond_i32(TCG_COND_LTU, QREG_CC_X, dest, tcg_const_i32(im)); tcg_gen_subi_i32(dest, dest, im); gen_update_cc_add(dest, tcg_const_i32(im)); s->cc_op = CC_OP_SUB; @@ -1257,7 +1257,7 @@ DISAS_INSN(arith_im) tcg_gen_mov_i32(dest, src1); tcg_gen_addi_i32(dest, dest, im); gen_update_cc_add(dest, tcg_const_i32(im)); - gen_helper_xflag_lt(QREG_CC_X, dest, tcg_const_i32(im)); + tcg_gen_setcond_i32(TCG_COND_LTU, QREG_CC_X, dest, tcg_const_i32(im)); s->cc_op = CC_OP_ADD; break; case 5: /* eori */ @@ -1387,7 +1387,7 @@ DISAS_INSN(neg) tcg_gen_neg_i32(reg, src1); s->cc_op = CC_OP_SUB; gen_update_cc_add(reg, src1); - gen_helper_xflag_lt(QREG_CC_X, tcg_const_i32(0), src1); + tcg_gen_setcond_i32(TCG_COND_LTU, QREG_CC_X, tcg_const_i32(0), src1); s->cc_op = CC_OP_SUB; } @@ -1633,12 +1633,12 @@ DISAS_INSN(addsubq) } else { src2 = tcg_const_i32(val); if (insn & 0x0100) { - gen_helper_xflag_lt(QREG_CC_X, dest, src2); + tcg_gen_setcond_i32(TCG_COND_LTU, QREG_CC_X, dest, src2); tcg_gen_subi_i32(dest, dest, val); s->cc_op = CC_OP_SUB; } else { tcg_gen_addi_i32(dest, dest, val); - gen_helper_xflag_lt(QREG_CC_X, dest, src2); + tcg_gen_setcond_i32(TCG_COND_LTU, QREG_CC_X, dest, src2); s->cc_op = CC_OP_ADD; } gen_update_cc_add(dest, src2);