From patchwork Sat Dec 24 11:40:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 708650 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 3tm3Jz1KMTz9t0X for ; Sat, 24 Dec 2016 22:42:27 +1100 (AEDT) Received: from localhost ([::1]:43127 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cKkiW-0000TO-Vy for incoming@patchwork.ozlabs.org; Sat, 24 Dec 2016 06:42:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45359) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cKkgw-0007KF-Cm for qemu-devel@nongnu.org; Sat, 24 Dec 2016 06:40:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cKkgt-0007xg-0L for qemu-devel@nongnu.org; Sat, 24 Dec 2016 06:40:46 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:55326) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cKkgs-0007xH-Ej for qemu-devel@nongnu.org; Sat, 24 Dec 2016 06:40:42 -0500 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MMWH0-1cCTDi1zHK-008G1C; Sat, 24 Dec 2016 12:40:40 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Sat, 24 Dec 2016 12:40:25 +0100 Message-Id: <1482579633-3393-5-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482579633-3393-1-git-send-email-laurent@vivier.eu> References: <1482579633-3393-1-git-send-email-laurent@vivier.eu> X-Provags-ID: V03:K0:5YgefFG5uKweZxxBohS9C32K6YzuIgac+uKWATRiZdgkc1WRSYU /i71eEYIRlGOlfC207BuqSn6zh9eiFF7BPfNd3yfy+zOYAKqAxll9EjEDQGD+pskA0r2jno LVxRIKRGsDvDvlUlIWMeVZkatXd/PvQlM/t3etV7YJikitd0uXwrOQKzK44KB3pK2PvwtZf nfCXFNVxA5ZQ1SUDYi9dQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:IbR1Os3WN4c=:VLSn7e5DZyQTNy6+Mh2R5f rOgYXW19J5wd5kAEGPgeErwbLBWpVWUXbu1ezUqV2PKoDXItc2njBXHSATW1D5OAbiPyfNCSN o+doIfLV69eI1SNJuTIRzO/Zq0a4FI2vuzWb0olpkT7JZN1VGjC8VKjJ/UVZV2iGkCmkbeFgD x/XU4A4kC6+2VthYzsPyMZohzOgpEk5zkUJevRECAw/9d2GJjFiu6Mk4PFY5r/ST2/GU16er1 /Yt+D57qaTQ/3xskJvL3hHepWyaYAMeC6GcdAykgyByQv2sO57a84BZAQOYdI6fnK15WlDoYF G0tzeOmpy/4ZJjp8YBMDVv0Y5ZwKSsr/xSrbd+eCj4lZgd2FD6udoHdPYA3cZj8Q98BcH2K/9 xNSHyKTIKL6ySuhBMdsmVkFh5jueLQuv18c9I0udn+dQ9W4p/5EvDYjCffpVxuAvWxb30oeni q5eSoz6c1QWdQvfeGegnv3AOCM37swFkUP3z5w5tbYAPk9ltYQoA1NnSICHt2GpAm2tWGvVYZ YaLmI9nkMRKbQwo5PVQZuqUj1Rb2lmAhn8E8DvNfmyt2eFYKjQDVPuTNXJn1SUHfIMh/Gnkol SUiMxmplqpu/YxvwFMPt7AHCgqqTdVlpkzfvl2/k8exZDvSlR1oz00mBqnKbTssPXVDgblBrE DjlS/DHJbv/rBUmp6NsT2jf1J9oUF7Sw+cjRMLoW/LmdxCKVptBTU8d3T/iqL8eXUXBc= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.74 Subject: [Qemu-devel] [PULL 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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)