From patchwork Tue Dec 27 17:53:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 9489747 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 16CB4601D2 for ; Tue, 27 Dec 2016 17:54:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 102CA1FF26 for ; Tue, 27 Dec 2016 17:54:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 051332094F; Tue, 27 Dec 2016 17:54:56 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 3E7AF201BC for ; Tue, 27 Dec 2016 17:54:54 +0000 (UTC) Received: from localhost ([::1]:55243 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cLvxd-0008Vv-3A for patchwork-qemu-devel@patchwork.kernel.org; Tue, 27 Dec 2016 12:54:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cLvwy-0008UN-Vs for qemu-devel@nongnu.org; Tue, 27 Dec 2016 12:54:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cLvwu-00007B-O4 for qemu-devel@nongnu.org; Tue, 27 Dec 2016 12:54:13 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:55103) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cLvwu-00006r-CA for qemu-devel@nongnu.org; Tue, 27 Dec 2016 12:54:08 -0500 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LxXtj-1caxgD34Kh-017GRd; Tue, 27 Dec 2016 18:54:06 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 27 Dec 2016 18:53:53 +0100 Message-Id: <1482861241-17678-5-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482861241-17678-1-git-send-email-laurent@vivier.eu> References: <1482861241-17678-1-git-send-email-laurent@vivier.eu> X-Provags-ID: V03:K0:roXkj18IIyP50/fk3iJFHyMtT6NRdb7x2Mfe7S1ZaHNR5T9MDHe JYwOaJUB8svpCIbDvZFNCmB61pFRXIEWAprwBoEC635pR2deo+B3DWSkI4G3a68yl4mHtqD hg00IRfKbjHHQze7EEJ8kSi5+0ZFHyQVamHFJEh+h/2dBLtBXPJcianpq0PuJQlShDAoWqA dVyUX8zo7H7k9F4r9LHIg== X-UI-Out-Filterresults: notjunk:1; V01:K0:rYvKgfNh2A8=:gaoDRv9IwX6RHHEy+nJIT6 9D7sK1X/J+H3WlaCPtX/oWgocMi9D9EZEZNWgjzKHDDhZsWjuzhAGPr3gYIvRFGjNqUtLqxLy 4amrhFmwy5VZ6cBB1FqlOwHFgNeRUgw4G7jYN1NQLJtv/lMdGUfZhl+RXh0UlaxW2JdLfpRgm UKZbOIvxnSsnPfbUNlJYI1+2n44OfRPO8OTDMfsJKGai93phWwzPhziiZJXCb7g3IRjNQGGCf r++5AMLWqeVznyrvYCT3V0TkS+7GcEJgvZfzhl/tJ+AwDw44VVYkMWYY3QZ+gPFrl2e9nYwaG gj+h1ZR7+JSPS+kZlZ2EWzEe8/UdwVW2luPNm6EAY/kyO+94TX9ufd28cFXal3QQc0+FhBeWr QHrfToNqcqvQy2aC+87RDY2ycnoivhCLSY4dAszxQc6ec2KP7PT8xrucdvTW0S1uPSZHoAk6l QHSxnnJU1IvEnJYkQIKLRQmH1gw5UOWwvaRTCv2mqF91uzStGA9g4IkNd0kkHJN0nYScOPbgM y3r0hawwBvoY92dyOKHjQ2OmohXH0MLQxeBvFL62jUSn6JZoQHxvnvOvPF6brSg1fEEAHFSch PgtLLIySklRJjwQsFtYGUbOrQpTIRMwGXNQ9k9vQipe+SqkMZEvRaxxY43tGlkH7JCm5coG80 95Vc0Xtv3fdq0zMgG/A7H10IXisnJ9QHVXiYXAtuiOGhr/gzj5KWJsJBdCixLX4yq8Aw= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PULL v2 04/12] 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/translate.c | 62 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 50 insertions(+), 12 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 97edb7b..6678b57 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -1863,24 +1863,62 @@ 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(QREG_CC_Z, QREG_CC_N, src1, DREG(ext, 12)); + } else { + tcg_gen_mulu2_i32(QREG_CC_Z, QREG_CC_N, src1, DREG(ext, 12)); + } + /* if Dl == Dh, 68040 returns low word */ + tcg_gen_mov_i32(DREG(ext, 0), QREG_CC_N); + tcg_gen_mov_i32(DREG(ext, 12), QREG_CC_Z); + tcg_gen_or_i32(QREG_CC_Z, QREG_CC_Z, QREG_CC_N); + + tcg_gen_movi_i32(QREG_CC_V, 0); + tcg_gen_movi_i32(QREG_CC_C, 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)