From patchwork Fri Oct 28 22:39:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 688657 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 3t5Jd024spz9t1F for ; Sat, 29 Oct 2016 09:40:51 +1100 (AEDT) Received: from localhost ([::1]:52188 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c0FpQ-00031D-E3 for incoming@patchwork.ozlabs.org; Fri, 28 Oct 2016 18:40:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59945) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c0FoU-0002Ok-LP for qemu-devel@nongnu.org; Fri, 28 Oct 2016 18:39:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c0FoR-0003ot-Jd for qemu-devel@nongnu.org; Fri, 28 Oct 2016 18:39:50 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:50503) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c0FoR-0003oM-AO for qemu-devel@nongnu.org; Fri, 28 Oct 2016 18:39:47 -0400 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue003) with ESMTPSA (Nemesis) id 0MK5c9-1c159r0YMf-001TsL; Sat, 29 Oct 2016 00:39:38 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Sat, 29 Oct 2016 00:39:33 +0200 Message-Id: <1477694374-24325-2-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477694374-24325-1-git-send-email-laurent@vivier.eu> References: <1477694374-24325-1-git-send-email-laurent@vivier.eu> X-Provags-ID: V03:K0:Vy7EBdC7Zz9yeTsygzLctGSlwisHAz4V8RfyUWU4IMj7tCAdO9z r2t02Cs7w3khoefb9G77d0nW5ZxYcHT86BqL2OEYdnqqICrzLzyATjYHQLWmbVsL7a166rx OoURIzsO6GdiiJq6rcESTifZkd1O23QF7r85iXmAUpp+0+N7ZV1vnTX1pQ87Yqws7Ztm1Rz xH/lbENH4R57TendAEHMQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:Kd5OMTSpbho=:V5BtKaO10uVany1DDkceyu AggfBNCVVYyl53abPDmQPdWzDejqrSscrIZHOLSTWOiAn+3rgtxl7uR1o2uES3eaFvyNSBNPc YWsMduvafiq8XGwRzIcsvrbdhkTLpkqlsH7C//V4iudNr2TTVkkv6rS6MhsFkIfWfhdEiRJiV 6hiBn5xsPfeCTVPzWKiI5LpKNeyUqrjMq1nQDBJsw7Xz1GHUoGQI+iZl9uxWBEqjjZiVOlJ0u oPBBrhaXXJWqvskGUQmQba1hrwdqXATJ0G+GJxNHfXFGKDr2Dr0LdokLVS4ZjoCTewei2DuI5 N+yM9L0/vKqHLnbhfKxq+4oVGWR0iSk2SqiQBigu/786wlIecl3s4kV2PRS/GNnbw0mVOorKy AKOY3Qb8McQ3XVjeqBiy4IuVhRAberZM0NHIiGa+9NbPcld62DioqvX+FwJcNljz5RgqUKfua v9fj5kk+vkYNSS/N8Ugfb7X1XU9Eb2cxBc/ayI3dQ7FQLoWajIMxhQ0pPlm6hlnItlJhuqg0Z Zj3oJjNV7DYVKsiFss30uIf1SXqWFy4+/IxEo9Vc3h4k+CNzCCEXufj+3zYZPUcz4weNxLaK1 2D5FLJCVFNcn4HvbWvGUdkbhGbj+U/U5PFGZI9BVaLp6q0cR4tdnrvwtC55G7XWbUKamtT8N2 DyfxDHGh7hYmkGZZ9h80dI7kDAlXLJ4NDFAyZ0WPraS01gjFWkktZqiJhjCRRe8AIMok= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.131 Subject: [Qemu-devel] [PATCH 1/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 , 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" 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 c00978d..d612a82 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_mov_i32(QREG_CC_C, QREG_CC_V); + 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)