From patchwork Tue Feb 7 00:59: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: 9559025 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 2037760236 for ; Tue, 7 Feb 2017 01:10:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0DE152074F for ; Tue, 7 Feb 2017 01:10:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 02192269DA; Tue, 7 Feb 2017 01:10:20 +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.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 90AA32074F for ; Tue, 7 Feb 2017 01:10:20 +0000 (UTC) Received: from localhost ([::1]:51365 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cauIV-0004GD-Mo for patchwork-qemu-devel@patchwork.kernel.org; Mon, 06 Feb 2017 20:10:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33083) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cau95-0005E2-RJ for qemu-devel@nongnu.org; Mon, 06 Feb 2017 20:00:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cau91-0006Bd-Hu for qemu-devel@nongnu.org; Mon, 06 Feb 2017 20:00:35 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:61872) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cau91-0006BA-6J for qemu-devel@nongnu.org; Mon, 06 Feb 2017 20:00:31 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0M6AQg-1cDQvP1ePq-00y889; Tue, 07 Feb 2017 01:59:41 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 7 Feb 2017 01:59:25 +0100 Message-Id: <20170207005930.28327-12-laurent@vivier.eu> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170207005930.28327-1-laurent@vivier.eu> References: <20170207005930.28327-1-laurent@vivier.eu> X-Provags-ID: V03:K0:gwBc78xZ0DvYsGPPZqJAkUHXqLTUFMIhVt76wLzzp9cxWs8IkhF BKqFVXbeziznf9d/UzATudBWxwL5ryba4n0RNq1cizP0OeO+1BAH8p4YajQHrZKe2R8dtw5 I3aiX3wwGM3Y99cXy5ClGWyWn5TWmKOnYobX2Zy5gsN91GhZV4VAnnyZiKULPDZlA9Kydlm JtbZuzHy6IGQxQPrKRfQQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:VImX7yO1WBQ=:Jc0kYPwbNltC02rmK5NTFL dQOH8UVx5dVxRdksYchCYoXtM4ztt/AwEDE4OifnyU3SRne8ze8bZKd8D1OBwz9vnetMt/fOM m4YeJddwdzD9ZVXBXES2HOyr41xx5jhT3lxgYANuQEwWWL+7oOUci/ryzsZLGzG/EeLCWERog +uwTKUz2T8ICDeXGjOk0+e/zwL+wKaVrKjl5zw/OIaA/pFVcEQfhl9NZ4l81pC1Y8zMYQWULE 0EasNhkOuliuDU+AAfazO3+6SC4pqFcg00V2ejS5cwr4alk+JtZ/tkAUMuRAeLCb/QZEBsMI5 /OtOCy05YU433C/vsCN39W3HnWrXWaAuWbw5QK8tG5Os/UFIXMxdKCYJg5PRlobk7BzaTP76r ni7RPaNS2uhwjfV6vf1tMc6G1tGjQPMKDZhsVHpHA15XGEtX0ij4u3pWa0US7KejBHsm7GQDW BppXrN/itQJbePG3RZUvyQcxYGBu9RHA/P3kB6M6PSM3wXFBxNmgQ66bE7L9Sl0qFcHwU+ycF mrDLAwWnwHfCpsWToVBTdfWe17q5Nn2GMmc9V9HIA0/S2FBrm+EZr07/2Ll3vGrNd8CKl4Nck aWwUkyGnkcYd/a7pdvFACOvL6fOOA5kPLRnG42o+TRo5M99z16GQvUEJ+LEPkfRtb51KWwskK e7izLCDaxBANxUG6s+XVyuyUtILMCR0wzmFwiqflFYoPu1EHRV84SBR76pNbUHV4TpW8= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PATCH v3 11/16] 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 , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 | 31 +++++++++++++++++++++++++++++++ target/m68k/helper.h | 1 + target/m68k/translate.c | 12 +++++++++++- 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index aadfc82..d8145e0 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -24,6 +24,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 */ +}; + static floatx80 FP0_to_floatx80(CPUM68KState *env) { return (floatx80){ .low = env->fp0l, .high = env->fp0h }; @@ -427,3 +452,9 @@ void HELPER(fmovem)(CPUM68KState *env, uint32_t opsize, { fprintf(stderr, "MISSING HELPER fmovem\n"); } + +void HELPER(const_FP0)(CPUM68KState *env, uint32_t offset) +{ + env->fp0l = fpu_rom[offset].low; + env->fp0h = fpu_rom[offset].high; +} diff --git a/target/m68k/helper.h b/target/m68k/helper.h index 58bc273..4927324 100644 --- a/target/m68k/helper.h +++ b/target/m68k/helper.h @@ -32,6 +32,7 @@ DEF_HELPER_2(set_fpcr, void, env, i32) DEF_HELPER_1(tst_FP0, void, env) DEF_HELPER_1(update_fpstatus, void, env) DEF_HELPER_4(fmovem, void, env, i32, i32, i32) +DEF_HELPER_2(const_FP0, void, env, 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 3fdb672..23eac63 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -4555,16 +4555,26 @@ static void gen_op_fmovem(CPUM68KState *env, DisasContext *s, DISAS_INSN(fpu) { uint16_t ext; + uint8_t rom_offset; int opmode; int opsize; 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; + gen_helper_const_FP0(cpu_env, tcg_const_i32(rom_offset)); + gen_op_store_fpr_FP0(REG(ext, 7)); + return; + } + break; case 3: /* fmove out */ gen_op_load_fpr_FP0(REG(ext, 7)); opsize = ext_opsize(ext, 10);