From patchwork Mon Sep 4 16:46:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kamil Rytarowski X-Patchwork-Id: 9937427 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 44F97601EB for ; Mon, 4 Sep 2017 17:00:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 35928287F9 for ; Mon, 4 Sep 2017 17:00:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A0FB287FF; Mon, 4 Sep 2017 17:00:09 +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,FREEMAIL_FROM, 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 16DDD28806 for ; Mon, 4 Sep 2017 17:00:06 +0000 (UTC) Received: from localhost ([::1]:54913 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1doujF-000495-Jn for patchwork-qemu-devel@patchwork.kernel.org; Mon, 04 Sep 2017 13:00:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34186) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1douib-00048F-T2 for qemu-devel@nongnu.org; Mon, 04 Sep 2017 12:59:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1douiX-0001uh-17 for qemu-devel@nongnu.org; Mon, 04 Sep 2017 12:59:25 -0400 Received: from mout.gmx.net ([212.227.17.20]:65023) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1douiW-0001tW-N9 for qemu-devel@nongnu.org; Mon, 04 Sep 2017 12:59:20 -0400 Received: from localhost.localdomain ([185.58.161.191]) by mail.gmx.com (mrgmx102 [212.227.17.174]) with ESMTPSA (Nemesis) id 0Lxdfb-1dQysK25nP-017C80; Mon, 04 Sep 2017 18:59:15 +0200 From: Kamil Rytarowski To: laurent@vivier.eu Date: Mon, 4 Sep 2017 18:46:59 +0200 Message-Id: <20170904164659.26915-1-n54@gmx.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170903163130.14288-1-n54@gmx.com> References: <20170903163130.14288-1-n54@gmx.com> X-Provags-ID: V03:K0:udiB/vqD8LWfQeB/A62tS5Vk24iDRdvpnCIDy09xYFlZDhxTuwo ku8ncw46QSqvrtg7RfmZi5JKys2GzGkpANUrnRVVb9VdpZLXFg3TC8RqHrg4SiN/tJzV2XG GcFXIx61NWF3ZFXOBqHrh8BEwvMFv9Sg3OVyogOrgEmVTGukd7/8SQl10LrMuuHINvjga5J TCzt9eMwG4nUrxbTpipRg== X-UI-Out-Filterresults: notjunk:1; V01:K0:c6hfAzP7jTs=:+kjkrWnpiVjE5sluxYcRL+ KWGsmdMc0QIdxul8GOAhiSF0W1/VrrdKD/JJYqSAmwXI3FjWMdCw3g+iHdrKa73rY0T3CGxiq oqnptUvTMlwLaD8lzJpeckPWJHKwFBwI/5rg2kggOE9YYOpVRnQRwHPeZLcn/SpXsPE6BqI4w QxL70KF9Hoi5AfDAr6NlqW2sdDly5TOX4CBhD2z21F0NS86bn3xuc1+K5Vbql8eRDrcYi1hr1 yG045RNldB3XFsY6t5SOk/I7pL440xNZ5yXcCU7G68S4pasVsWFWfKoORXx9nv+fPD2/GV/E3 MQFXp3BqdOHOfJ+/memKV6ckdqTsOaa4DMZpClWjQhWkuMn/Bvgj+Saq9nqVYMOKorte+AuQ5 wXbYLYROgdOLJ+E3OTdV6fNxI8Qr/kD0jRSRVCoyEfnEvANMhuGQdMNWbWMmoxMI2nR2uWy7Y Dee6fHmafD5uI4zRkPVhD5kMxj3/RYF5CIKrWzYkQI8quU+P/hL38pc10CZhU1pp7D+uFvFuz /ip34CvgbS9qZcHZ8WBWiwRlpUMUlWcA0/kELH9q6250mwKPrp+9ZCdh0h3nEYfgeiQnE4zzR urM8ThavRh0l1EMyVpQqmdWqW8vymaL1pq5EUOQ8ZEYAKdE+V7/oe9Ab14hxpsIeMk8q/zNNd 8Os5mF6HlwQO6b9jb7qnpZnKAKJGSdvnruSjyILHqnZOp92kdQyTBMyMd40HfU5i7MF+sC9Hn fmv2DUPOTrNd4ysaXjfH5+8eGcfNddRHR0VFPs73vNBEWyfiyQnQrP4BsUZilzd9+MvPUBM6C mBoCwcPu9qG3ZGllRsFWPMAAzxTTA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.20 Subject: [Qemu-devel] [PATCH v2] 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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..8afd319ede 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, 0x0c90fdaa22168c235LL), /* 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, 0x00000000000000000LL), /* Zero */ + [0x30] = make_floatx80_init(0x3ffe, 0x0b17217f7d1cf79acLL), /* ln(2) */ + [0x31] = make_floatx80_init(0x4000, 0x935d8dddaaa8ac17ULL), /* ln(10) */ + [0x32] = make_floatx80_init(0x3fff, 0x08000000000000000LL), /* 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)