From patchwork Wed Jun 28 20:42:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 781929 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 3wyZXH4w65z9s65 for ; Thu, 29 Jun 2017 06:44:15 +1000 (AEST) Received: from localhost ([::1]:35578 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQJor-0005tp-AW for incoming@patchwork.ozlabs.org; Wed, 28 Jun 2017 16:44:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39801) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQJo5-0005Yw-K4 for qemu-devel@nongnu.org; Wed, 28 Jun 2017 16:43:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQJo3-0003Y5-8p for qemu-devel@nongnu.org; Wed, 28 Jun 2017 16:43:25 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:51901) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dQJo2-0003XG-UD for qemu-devel@nongnu.org; Wed, 28 Jun 2017 16:43:23 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LfSYr-1e6YRz3foH-00p3FA; Wed, 28 Jun 2017 22:42:47 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 28 Jun 2017 22:42:36 +0200 Message-Id: <20170628204241.32106-3-laurent@vivier.eu> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170628204241.32106-1-laurent@vivier.eu> References: <20170628204241.32106-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K0:HgPjIycXY+eyi4gFAUQZHTM97wiOgTfnkdD33ih3TjbeCysnUFD NU6AYJ9DDW6HSSk15jt5qSBPA50bgA1SgI+szMHA2cj7f7+fPcyNE7y9QDHN98B7Lc+NX9h omnFEkkopDSn/6A+AdEkH/hUJuAtyaTZf23UKnZNTdXWZyUgJh0mIFPNsYCCnaE7xnhZ4Eb It/KyfWqxNSzqMtXDMhxQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:M2OZa0+SsHU=:0Btv5sVhZaUrg35UK0UzNY rCi8j0LwIIakAc/Z801o9S9qBxF5QnReNJj0Sr8AlXF4wUvR6RJ34XEdBoBht0Vr/Cn6QA9dt VEP0uXd3DWnvsyht3LWMBDnq0Dq0F5UT8ZZyIIT7m29zkUXOLC3HHogkjhrqziMqlXU0sNvOh m/R+WaZc9hJPRgRlkRBXtO3Vu95lIx4ysmpKoeHSBphmFPkGj8WHesynr9ApFF9PnMZ0gIi84 wV8K2/1o3eSyAdPyNefaeYc2iHGSgPr2Wsnucj1bB43ku9XzDT6BaZ0lnD9QmjtGF4YsEBCzW qDCadxCwyliVS4Er6WrZaYhDpxOn7M0Qk46845r5WiSo5zCBJjLMIau8qiW3xafzIclGYI5BU WWUlqX9Yq7T7K4QVTiLgzNAOzq6UxOtTQFctIgnUZVD47l/O9JK1Ont0bvuhZIhZY0BxW8MDE cNtoBQDeoZrPf/D7XDGU6ulxAPSdx36+yfvSVvjz3cTgf8zn8vSXCOFNgWXk6l8272dNAql39 r62RAmSxkJt2w65ZKTXPrImAkaZ9dGZvf1x1u1dwYnouicLIFDVtdDWPcsfVDwrqodNK+L5pH WNMz8o6JMsFaYsmoTGMMLkWW6fQsIHckLX5zHko9M/Kge2gOHbFDe0zS5dZeo/ZuOSLtdlKIA snE416i0a1MDpFD3eFMt3eRym6xdJ1Kp3IN2FZYqY7xPY+k7CBSSpEdk1cm/ktLdqqdUS/7z8 xUu4TYYIyiYzfSSq X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.75 Subject: [Qemu-devel] [PATCH v4 2/7] target/m68k: add fmovecr 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" fmovecr moves a floating point constant from the FPU ROM to a floating point register. Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- target/m68k/fpu_helper.c | 34 ++++++++++++++++++++++++++++++++++ target/m68k/helper.h | 1 + target/m68k/translate.c | 13 ++++++++++++- 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index a9e17f5..4c14a1f 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -23,6 +23,35 @@ #include "exec/helper-proto.h" #include "exec/exec-all.h" +/* Undefined offsets may be different on various FPU. + * On 68040 they return 0.0 (floatx80_zero) + */ + +static const floatx80 fpu_rom[128] = { + [0x00] = floatx80_pi, /* Pi */ + [0x0b] = make_floatx80(0x3ffd, 0x9a209a84fbcff798ULL), /* Log10(2) */ + [0x0c] = make_floatx80(0x4000, 0xadf85458a2bb4a9aULL), /* e */ + [0x0d] = make_floatx80(0x3fff, 0xb8aa3b295c17f0bcULL), /* Log2(e) */ + [0x0e] = make_floatx80(0x3ffd, 0xde5bd8a937287195ULL), /* Log10(e) */ + [0x0f] = floatx80_zero, /* Zero */ + [0x30] = floatx80_ln2, /* ln(2) */ + [0x31] = make_floatx80(0x4000, 0x935d8dddaaa8ac17ULL), /* ln(10) */ + [0x32] = floatx80_one, /* 10^0 */ + [0x33] = make_floatx80(0x4002, 0xa000000000000000ULL), /* 10^1 */ + [0x34] = make_floatx80(0x4005, 0xc800000000000000ULL), /* 10^2 */ + [0x35] = make_floatx80(0x400c, 0x9c40000000000000ULL), /* 10^4 */ + [0x36] = make_floatx80(0x4019, 0xbebc200000000000ULL), /* 10^8 */ + [0x37] = make_floatx80(0x4034, 0x8e1bc9bf04000000ULL), /* 10^16 */ + [0x38] = make_floatx80(0x4069, 0x9dc5ada82b70b59eULL), /* 10^32 */ + [0x39] = make_floatx80(0x40d3, 0xc2781f49ffcfa6d5ULL), /* 10^64 */ + [0x3a] = make_floatx80(0x41a8, 0x93ba47c980e98ce0ULL), /* 10^128 */ + [0x3b] = make_floatx80(0x4351, 0xaa7eebfb9df9de8eULL), /* 10^256 */ + [0x3c] = make_floatx80(0x46a3, 0xe319a0aea60e91c7ULL), /* 10^512 */ + [0x3d] = make_floatx80(0x4d48, 0xc976758681750c17ULL), /* 10^1024 */ + [0x3e] = make_floatx80(0x5a92, 0x9e8b3b5dc53d5de5ULL), /* 10^2048 */ + [0x3f] = make_floatx80(0x7525, 0xc46052028a20979bULL), /* 10^4096 */ +}; + int32_t HELPER(reds32)(CPUM68KState *env, FPReg *val) { return floatx80_to_int32(val->d, &env->fp_status); @@ -204,3 +233,8 @@ void HELPER(ftst)(CPUM68KState *env, FPReg *val) } env->fpsr = (env->fpsr & ~FPSR_CC_MASK) | cc; } + +void HELPER(fconst)(CPUM68KState *env, FPReg *val, uint32_t offset) +{ + val->d = fpu_rom[offset]; +} diff --git a/target/m68k/helper.h b/target/m68k/helper.h index 98cbf18..d6e80e4 100644 --- a/target/m68k/helper.h +++ b/target/m68k/helper.h @@ -35,6 +35,7 @@ DEF_HELPER_4(fdiv, void, env, fp, fp, fp) DEF_HELPER_FLAGS_3(fcmp, TCG_CALL_NO_RWG, void, env, fp, fp) DEF_HELPER_FLAGS_2(set_fpcr, TCG_CALL_NO_RWG, void, env, i32) DEF_HELPER_FLAGS_2(ftst, TCG_CALL_NO_RWG, void, env, fp) +DEF_HELPER_3(fconst, void, env, fp, i32) DEF_HELPER_3(mac_move, void, env, i32, i32) DEF_HELPER_3(macmulf, i64, env, i32, i32) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 5f4bedc..5b93d3f 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -4518,10 +4518,21 @@ DISAS_INSN(fpu) ext = read_im16(env, s); opmode = ext & 0x7f; switch ((ext >> 13) & 7) { - case 0: case 2: + case 0: break; case 1: goto undef; + case 2: + if (insn == 0xf200 && (ext & 0xfc00) == 0x5c00) { + /* fmovecr */ + TCGv rom_offset = tcg_const_i32(opmode); + cpu_dest = gen_fp_ptr(REG(ext, 7)); + gen_helper_fconst(cpu_env, cpu_dest, rom_offset); + tcg_temp_free_ptr(cpu_dest); + tcg_temp_free(rom_offset); + return; + } + break; case 3: /* fmove out */ cpu_src = gen_fp_ptr(REG(ext, 7)); opsize = ext_opsize(ext, 10);