From patchwork Mon Jun 26 22:03:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 780884 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 3wxNPq3NPXz9s4q for ; Tue, 27 Jun 2017 08:04:29 +1000 (AEST) Received: from localhost ([::1]:49198 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dPc7N-00075C-HS for incoming@patchwork.ozlabs.org; Mon, 26 Jun 2017 18:04:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56716) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dPc6y-00071s-7H for qemu-devel@nongnu.org; Mon, 26 Jun 2017 18:04:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dPc6v-00058z-3m for qemu-devel@nongnu.org; Mon, 26 Jun 2017 18:04:00 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:59778) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dPc6u-00058X-PI for qemu-devel@nongnu.org; Mon, 26 Jun 2017 18:03:57 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LwG3q-1dpS0U04f0-0187QQ; Tue, 27 Jun 2017 00:03:36 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 27 Jun 2017 00:03:25 +0200 Message-Id: <20170626220330.6785-3-laurent@vivier.eu> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170626220330.6785-1-laurent@vivier.eu> References: <20170626220330.6785-1-laurent@vivier.eu> X-Provags-ID: V03:K0:hY3eldKqtI4oRjjIUS4O0wsnszB9cec1iBJoWrnTx8Ssw+w1ZxU 9/5LYw1p/SlbaQlLQQW7ieDkXcJOC+F36m2fxE1w31/LTxdnYM7epzwaZcc1WXXM21DAqRj TlWnvVbsumWFQEUEIeP1WDJGqg0PD85IgwrsQ4XPzy54Wxf9uPBLYmY4HYwuzTGN/D4PPT1 PzBI8WbssjSYZ9as3GNfQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:VfDnUQSt5BQ=:wY7jCXgBfwKjMRYVROztwX SjK0DG/9EZGfjdSEg7Xr8Qi+i9xfHhZpsCvfxMKYeDqnM5nLOavIGKPt9TyVw+yangfMkiqrZ kfVOXXjRqTseatO++iIReMcqTqvHw9LMAFz+0s16z2LmB3Xc1GfPF6JcnZTI2waV/lN0Y4IY8 SIbxA9hK6OkqbwaulUeQFM94HUXVbW6/iMRl5fK2NSPQiBAmDJn2u72XoYgDXKzOjXucnGCsH HURFzH96PXC23pNx9ZaIlw7KkSrmtiQOQqgy7oveNjxhKRzPH7aB994OD5yznRzbNToryXBG6 M8fLVEgUji43zUdlUtSjE9iMF+LS3tilOzxmo0cWwaGdEoJfzfLHFKP3ryEF1YdWvaBVdW6yM l4vHb7koO50E2dQhGLYMmextjBm/gnsdBr4m8dkXVnnzcWK67pXQRcnqhQw2UmCTt0wqFEno4 ErAdIzZa9fnS+NULNSQWZQSHaZMhd3y6bjqIiC8Wc/SFMPSmgTnduNOCwcP6lNmvG6YBlBAp+ 7jT8yd8NxqhvOMqbgxTRwjcANmM949BR4w7jMc8VgYLEO5F2S8ctJl/7/F7Y0V3sR9GWWV2Gq VVllmAwdBIN5qH6P+SKRnj55h7ipRrVkbufF0JgA+fH40JLpV/lzCyXv04p7z3jNRydhNUBqM cw+iWvCeVRQhKRCE4YIEhi+pP0KwkeerIQyFuSnsSP5EnvHIJob7clt65mXC1IvxIBqY= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PATCH v2 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 --- target/m68k/fpu_helper.c | 30 ++++++++++++++++++++++++++++++ target/m68k/helper.h | 1 + target/m68k/translate.c | 13 ++++++++++++- 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index a9e17f5..912c0b7 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -23,6 +23,31 @@ #include "exec/helper-proto.h" #include "exec/exec-all.h" +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 +229,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 8824f81..ab2fe50 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -4510,6 +4510,7 @@ static void gen_op_fmove_fcr(CPUM68KState *env, DisasContext *s, DISAS_INSN(fpu) { uint16_t ext; + uint8_t rom_offset; int opmode; TCGv tmp32; int opsize; @@ -4518,10 +4519,20 @@ 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 */ + rom_offset = ext & 0x7f; + cpu_dest = gen_fp_ptr(REG(ext, 7)); + gen_helper_fconst(cpu_env, cpu_dest, tcg_const_i32(rom_offset)); + tcg_temp_free_ptr(cpu_dest); + return; + } + break; case 3: /* fmove out */ cpu_src = gen_fp_ptr(REG(ext, 7)); opsize = ext_opsize(ext, 10);