From patchwork Mon Oct 31 09:50:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 689236 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3t6qQ75WrLz9t17 for ; Mon, 31 Oct 2016 20:51:43 +1100 (AEDT) Received: from localhost ([::1]:34263 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c19Fk-0005tN-PU for incoming@patchwork.ozlabs.org; Mon, 31 Oct 2016 05:51:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57204) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c19Eo-0005Eu-30 for qemu-devel@nongnu.org; Mon, 31 Oct 2016 05:50:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c19Ej-0005hg-T4 for qemu-devel@nongnu.org; Mon, 31 Oct 2016 05:50:42 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:59350) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c19Ej-0005ec-HB for qemu-devel@nongnu.org; Mon, 31 Oct 2016 05:50:37 -0400 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue103) with ESMTPSA (Nemesis) id 0Mdo4b-1cFEe71xpV-00PeMj; Mon, 31 Oct 2016 10:50:34 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 31 Oct 2016 10:50:31 +0100 Message-Id: <1477907431-10008-3-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477907431-10008-1-git-send-email-laurent@vivier.eu> References: <1477907431-10008-1-git-send-email-laurent@vivier.eu> X-Provags-ID: V03:K0:kt7EA39wSvcJONqz+FUOlastMmu2GUsVHqWVI6xY80WHdnx2JuW OKG78CxYBoueiJOkAyw5OcAe65B+k8FdOdeWkcm6+Ld0NDyKpzLGnCLAjVCOFU5Djpc8NIO +luCKnFHqZKKzLKI205OLBmhFsY3yuK45oD32cnPwGSjyvcruqPAdsY0lkMvo1K4hnZrJ5O JMI0gzXn7LcjnPDYIPvcQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:H9t6hOk0ZnQ=:mfZ8RzB2utM4lw5nKSvwEc CtGFioRzBcTGseQko+6SfmJS144s/MFMjASOt3TdmopEJndepqMy/vX3x156fVtwjuECEoKAI 70RF/gtaruv4eFwrHr8r2kWv7Cbfu27f1jm5XMjFizL6Ok8eyHtfDxPyZZGDmIf/fZLoIqOeT JOSI2AklRv5sRvFGF9kmv02T0uD5WS+wLyjLvfJx7Lm7ECyY96GlTUr1zfmpyWdPsbpfM/c98 FXcaQOMHjW2JIagJeFovJeD3ISSaTp47Ewo/Fivro4GBfDYTxCpHSiAxWDoqejCsKrM+5wNJC IV7g2qj4xyHL/+GN4/RWfX5Deg3f5+38xnqXwzmOJslrFbwpTz5jtVmrddhUtZce2mxAiRYwN Gwa7oUeWkQ59U3dowSGnvLPWZFWHUQi2CFXKZvtvPN4Ua4ogTEoW9GIeyf/Q7kka7z/ZiBy1e r7vYGHKFGhEO8iU9nk4NKedLQBH6EJmYE1gLXik0LhJh+Zsuzp0kox9aCSvoUeJSO5UkSdPpa bwur2j+vSVRWLixpG9Zjnat3NvQUfiM/pnvx9Sjjd4Q8zsAx3ssV0uawUiAv4c9tWmfNZcegj dtoctdOuTpboQB/QPxYl0H1FVW6rleSWLKm6pi2PIJ/Bx1hO9xRfodt3uD7oKWKPSqe91JlBa bF2DCJFtwW1u3+mgBD1/RICuOVCUIf+E/PF8Z90fgwLSWrAionBqfl29+mURqN7WVa3I= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.75 Subject: [Qemu-devel] [PULL 2/2] target-m68k: add 64bit mull 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 Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target-m68k/translate.c | 60 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 12 deletions(-) diff --git a/target-m68k/translate.c b/target-m68k/translate.c index 92e67eb..75d8c05 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -1812,24 +1812,60 @@ DISAS_INSN(tas) DISAS_INSN(mull) { uint16_t ext; - TCGv reg; TCGv src1; - TCGv dest; + int sign; - /* The upper 32 bits of the product are discarded, so - muls.l and mulu.l are functionally equivalent. */ ext = read_im16(env, s); - if (ext & 0x87ff) { - gen_exception(s, s->pc - 4, EXCP_UNSUPPORTED); + + sign = ext & 0x800; + + if (ext & 0x400) { + if (!m68k_feature(s->env, M68K_FEATURE_QUAD_MULDIV)) { + gen_exception(s, s->pc - 4, EXCP_UNSUPPORTED); + return; + } + + SRC_EA(env, src1, OS_LONG, 0, NULL); + + if (sign) { + tcg_gen_muls2_i32(DREG(ext, 12), DREG(ext, 0), src1, DREG(ext, 12)); + } else { + tcg_gen_mulu2_i32(DREG(ext, 12), DREG(ext, 0), src1, DREG(ext, 12)); + } + + tcg_gen_movi_i32(QREG_CC_V, 0); + tcg_gen_movi_i32(QREG_CC_C, 0); + tcg_gen_mov_i32(QREG_CC_N, DREG(ext, 0)); + tcg_gen_or_i32(QREG_CC_Z, DREG(ext, 12), DREG(ext, 0)); + + set_cc_op(s, CC_OP_FLAGS); return; } - reg = DREG(ext, 12); SRC_EA(env, src1, OS_LONG, 0, NULL); - dest = tcg_temp_new(); - tcg_gen_mul_i32(dest, src1, reg); - tcg_gen_mov_i32(reg, dest); - /* Unlike m68k, coldfire always clears the overflow bit. */ - gen_logic_cc(s, dest, OS_LONG); + if (m68k_feature(s->env, M68K_FEATURE_M68000)) { + tcg_gen_movi_i32(QREG_CC_C, 0); + if (sign) { + tcg_gen_muls2_i32(QREG_CC_N, QREG_CC_V, src1, DREG(ext, 12)); + /* QREG_CC_V is -(QREG_CC_V != (QREG_CC_N >> 31)) */ + tcg_gen_sari_i32(QREG_CC_Z, QREG_CC_N, 31); + tcg_gen_setcond_i32(TCG_COND_NE, QREG_CC_V, QREG_CC_V, QREG_CC_Z); + } else { + tcg_gen_mulu2_i32(QREG_CC_N, QREG_CC_V, src1, DREG(ext, 12)); + /* QREG_CC_V is -(QREG_CC_V != 0), use QREG_CC_C as 0 */ + tcg_gen_setcond_i32(TCG_COND_NE, QREG_CC_V, QREG_CC_V, QREG_CC_C); + } + tcg_gen_neg_i32(QREG_CC_V, QREG_CC_V); + tcg_gen_mov_i32(DREG(ext, 12), QREG_CC_N); + + tcg_gen_mov_i32(QREG_CC_Z, QREG_CC_N); + + set_cc_op(s, CC_OP_FLAGS); + } else { + /* The upper 32 bits of the product are discarded, so + muls.l and mulu.l are functionally equivalent. */ + tcg_gen_mul_i32(DREG(ext, 12), src1, DREG(ext, 12)); + gen_logic_cc(s, DREG(ext, 12), OS_LONG); + } } static void gen_link(DisasContext *s, uint16_t insn, int32_t offset)