From patchwork Mon Sep 4 21:23:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kamil Rytarowski X-Patchwork-Id: 809847 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) 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 3xmNSZ5YHVz9s4q for ; Tue, 5 Sep 2017 07:35:56 +1000 (AEST) Received: from localhost ([::1]:55773 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1doz29-0000Ll-OY for incoming@patchwork.ozlabs.org; Mon, 04 Sep 2017 17:35:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43466) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1doz1h-0000H5-IG for qemu-devel@nongnu.org; Mon, 04 Sep 2017 17:35:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1doz1c-0005WY-MM for qemu-devel@nongnu.org; Mon, 04 Sep 2017 17:35:25 -0400 Received: from mout.gmx.net ([212.227.17.22]:55103) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1doz1c-0005WH-B4 for qemu-devel@nongnu.org; Mon, 04 Sep 2017 17:35:20 -0400 Received: from localhost.localdomain ([185.58.161.191]) by mail.gmx.com (mrgmx103 [212.227.17.174]) with ESMTPSA (Nemesis) id 0MIMyZ-1dlxYS3Jeh-004G1n; Mon, 04 Sep 2017 23:35:16 +0200 From: Kamil Rytarowski To: laurent@vivier.eu Date: Mon, 4 Sep 2017 23:23:06 +0200 Message-Id: <20170904212306.3020-1-n54@gmx.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170904173226.25252-1-n54@gmx.com> References: <20170904173226.25252-1-n54@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K0:rzyzto1gVQzGmaDT03JD1F/P0kkeqMfbf6UzLYgdlqJgYmLJdFj e6Ye3BBQkIDnmF4DV8MQc6AAqVBGPOO5sC7X+N2HJIzMaH8zWkD5hGM8MPiHSCLe3Yjw630 +uuFmY8IaNZRVO/ThKShnLkwDrwyVfd7UiSKFADXhO0+A1nmsEPxi+fUOPQ2eAdHxgj6WsO 3KPj5XeQ+gZJAmRi6Vuuw== X-UI-Out-Filterresults: notjunk:1; V01:K0:Lz2GnGfBCUw=:3udqqOXtFB0zjzk0XLU7AM XEznvIw9MdLSshwKeig5Fl++y+aqZnSvWs89GzWhz9JLqJoPOIVcFbTjTGvNIMvvu3uKum790 GG7TaLVSDPoEmAPiGjoLpEoALNa6tF8CpVvi7E68DQYLuX5PR9+cWqvXbm4U1KfSLt/GG9Ll9 yWxto4qNA/rGlfl5zhSYnjkoXPRRL2kW4OdVP6/2cv/Oy3CCkiSeDXwgiYaaUk1Lv0jDfcbkZ 4kGIrjPrV8ALZAbRRLbnhbqQf4vUoRaY/HZsZO2IbFLj+Ky+A7+Lsb97unwqmMQpf0b+LYhit 3/mC9l6x208rNXQkduEigtBt60a+WJ6acG0n/1Fsp1La3uq6CM03BRYmO5PnE++8PHP02YclL 0/yQ94SYin/4w79bKNjB12Hhts5yGOjHxIR2eaUoqeoFVO6Rs1HF6A4+gtq17z0WtZ4YeTjP/ KmeoAIWHK236zuB7auk9yTlaN9NhWQNm1a3LqpyAHiIWmZOTWhxOhg1yVIawQzqR1CS+ntv98 X+Fh1QfvIIsLrM3BoT9rhJl1peXzzteBB1Chw6GnKzYVqu1kl5WfRCP3OmvuXiWNyGgpJiGWk wCopO4H8joel+nBXu0Q8yLWNzYv3J6tdPvpmnVUMIE55fGYrcS83qCZ0RY1qiP3uBvpuuRjU3 v2oIeGvpFCm9PWHNBdtM9mhl+7jXafzQWb9NonmO1B1Jg/eGf4WlipGY1SpSG8tgvTqhgI8mB ovWxJdsILUEw+Ja7UuXQ51o1XP/27BPJKhLwyW8Sqqk/VRopV9qVk4GAf1MMS8b1x2sB18+zV np5CN/en0OnHu0cUWEZqvglZDQ1INW2hrrBJi1fJ1TbYG4Ebec= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.22 Subject: [Qemu-devel] [PATCH v4] target/m68k: Switch fpu_rom from make_floatx80() to make_floatx80_init() 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: peter.maydell@linaro.org, Kamil Rytarowski , qemu-devel@nongnu.org, f4bug@amsat.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" GCC 4.7.2 on SunOS reports that the values assigned to array members are not real constants: target/m68k/fpu_helper.c:32:5: error: initializer element is not constant target/m68k/fpu_helper.c:32:5: error: (near initialization for 'fpu_rom[0]') rules.mak:66: recipe for target 'target/m68k/fpu_helper.o' failed Convert the array to make_floatx80_init() to fix it. Replace floatx80_pi-like constants with make_floatx80_init() as they are defined as make_floatx80(). This fixes build on SmartOS (Joyent). Signed-off-by: Kamil Rytarowski Reviewed-by: Philippe Mathieu-Daudé --- target/m68k/fpu_helper.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index bdfc537c68..665e7609af 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -29,28 +29,28 @@ */ 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 */ + [0x00] = make_floatx80_init(0x4000, 0xc90fdaa22168c235ULL), /* Pi */ + [0x0b] = make_floatx80_init(0x3ffd, 0x9a209a84fbcff798ULL), /* Log10(2) */ + [0x0c] = make_floatx80_init(0x4000, 0xadf85458a2bb4a9aULL), /* e */ + [0x0d] = make_floatx80_init(0x3fff, 0xb8aa3b295c17f0bcULL), /* Log2(e) */ + [0x0e] = make_floatx80_init(0x3ffd, 0xde5bd8a937287195ULL), /* Log10(e) */ + [0x0f] = make_floatx80_init(0x0000, 0x0000000000000000ULL), /* Zero */ + [0x30] = make_floatx80_init(0x3ffe, 0xb17217f7d1cf79acULL), /* ln(2) */ + [0x31] = make_floatx80_init(0x4000, 0x935d8dddaaa8ac17ULL), /* ln(10) */ + [0x32] = make_floatx80_init(0x3fff, 0x8000000000000000ULL), /* 10^0 */ + [0x33] = make_floatx80_init(0x4002, 0xa000000000000000ULL), /* 10^1 */ + [0x34] = make_floatx80_init(0x4005, 0xc800000000000000ULL), /* 10^2 */ + [0x35] = make_floatx80_init(0x400c, 0x9c40000000000000ULL), /* 10^4 */ + [0x36] = make_floatx80_init(0x4019, 0xbebc200000000000ULL), /* 10^8 */ + [0x37] = make_floatx80_init(0x4034, 0x8e1bc9bf04000000ULL), /* 10^16 */ + [0x38] = make_floatx80_init(0x4069, 0x9dc5ada82b70b59eULL), /* 10^32 */ + [0x39] = make_floatx80_init(0x40d3, 0xc2781f49ffcfa6d5ULL), /* 10^64 */ + [0x3a] = make_floatx80_init(0x41a8, 0x93ba47c980e98ce0ULL), /* 10^128 */ + [0x3b] = make_floatx80_init(0x4351, 0xaa7eebfb9df9de8eULL), /* 10^256 */ + [0x3c] = make_floatx80_init(0x46a3, 0xe319a0aea60e91c7ULL), /* 10^512 */ + [0x3d] = make_floatx80_init(0x4d48, 0xc976758681750c17ULL), /* 10^1024 */ + [0x3e] = make_floatx80_init(0x5a92, 0x9e8b3b5dc53d5de5ULL), /* 10^2048 */ + [0x3f] = make_floatx80_init(0x7525, 0xc46052028a20979bULL), /* 10^4096 */ }; int32_t HELPER(reds32)(CPUM68KState *env, FPReg *val)