From patchwork Tue Jun 16 01:16:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 484753 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 98E941401F6 for ; Tue, 16 Jun 2015 11:17:05 +1000 (AEST) Received: from localhost ([::1]:37063 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4fUt-000838-NQ for incoming@patchwork.ozlabs.org; Mon, 15 Jun 2015 21:17:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4fUJ-0006ve-9n for qemu-devel@nongnu.org; Mon, 15 Jun 2015 21:16:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4fUF-0002o3-8c for qemu-devel@nongnu.org; Mon, 15 Jun 2015 21:16:27 -0400 Received: from mail-bl2on0096.outbound.protection.outlook.com ([65.55.169.96]:60730 helo=na01-bl2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4fUF-0002nt-2i for qemu-devel@nongnu.org; Mon, 15 Jun 2015 21:16:23 -0400 Received: from BY2FFO11OLC013.protection.gbl (10.1.14.34) by BY2FFO11HUB017.protection.gbl (10.1.14.91) with Microsoft SMTP Server (TLS) id 15.1.190.9; Tue, 16 Jun 2015 01:16:21 +0000 Authentication-Results: spf=fail (sender IP is 149.199.60.96) smtp.mailfrom=xilinx.com; nongnu.org; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of xilinx.com does not designate 149.199.60.96 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.96; helo=xsj-tvapsmtpgw01; Received: from xsj-tvapsmtpgw01 (149.199.60.96) by BY2FFO11OLC013.mail.protection.outlook.com (10.1.15.25) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Tue, 16 Jun 2015 01:16:21 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:43007 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1Z4fUD-0001YJ-5n for qemu-devel@nongnu.org; Mon, 15 Jun 2015 18:16:21 -0700 Received: from [127.0.0.1] (port=48629 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1Z4fUC-0007xh-W1; Mon, 15 Jun 2015 18:16:21 -0700 Received: from xsj-tvapsmtp02 (xsj-tvapsmtp02.xilinx.com [172.16.1.203]) by tsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id t5G1BxXi029418; Mon, 15 Jun 2015 18:11:59 -0700 Received: from [172.19.5.153] (port=45524 helo=xsjrdevl46.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1Z4fUB-0007xe-VN; Mon, 15 Jun 2015 18:16:20 -0700 From: Alistair Francis To: , Date: Mon, 15 Jun 2015 18:16:19 -0700 Message-ID: X-Mailer: git-send-email 2.1.1 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-MML: disable X-TM-AS-Product-Ver: IMSS-7.1.0.1679-8.0.0.1202-21614.005 X-TM-AS-Result: No--3.834-7.0-31-10 X-imss-scan-details: No--3.834-7.0-31-10 X-TMASE-MatchedRID: PxV5NVtgs8TMHUInqqZ02mNW0DAjL5p+NlIAWlNSq37uc7XfuTYENvlY oV6p/cSxI1/Ds5nW8XCiU7jrBMnacQ+9QmShUWvCZg1i2wTmScMEa8g1x8eqF3Rylc22tUP9ctQ SgRYgOLPi8zVgXoAltsIJ+4gwXrEtWBd6ltyXuvv8u+LtyF6YF0KUvB1DiqEWMq/xwfWEeQbrWm xFgyQqsQmmaDXmxKG5sdH6pEUK5eeeU9/lKzoEbhufMAgPc+ratqhp7l+cqsFLv5Eyr/YIrqsDh ztRXZ9Cm+LY9A78UVCLPa6Os9XH3AncqsF+GX35ftwZ3X11IV0= X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC013; 1:PJcFZw8kEFrRtQoZdlYhPqIukhpEBGaLOYpt/00HU1sGogDycsJQxRP/If8nemQK8egOSPlzIGHYN3xXO6SRf0FooEzKiNeWobHj2fJNoZ+bT0bChQ1h5bYiBxvpGwRVui3iB7I4K4ClxwYdqixgGJDbUUMCHKy12rmrVlosexO8hJfSW7jp9fG8ahQ1nawOfDESyQvK358apSQcXOgm6HyFkpe9bTtgIMxK0tyz5aFtgGuCw8sov9Y3lWbnTSeKqGNSEnxcGshqFzVQ5VasBggOGyfBxdVGMToqF5qNM6w= X-Forefront-Antispam-Report: CIP:149.199.60.96; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(339900001)(199003)(189002)(50466002)(5003600100002)(76176999)(64026002)(71366001)(85426001)(450100001)(50986999)(48376002)(5001770100001)(105606002)(47776003)(87936001)(46102003)(92566002)(189998001)(33646002)(50226001)(36756003)(86362001)(575784001)(118296001)(77096005)(2950100001)(106466001)(19580395003)(19580405001)(229853001)(6806004)(62966003)(77156002)(107886002)(5001960100002)(107986001)(4001430100001)(4001450100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2FFO11HUB017; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11HUB017; 2:EUCoKlUm0WX102DxhMVA1H8uoY6urn8nVjai6Ew3WXiXZTYssu8jrntDaIkSLtlw; 2:hxOHok2PyTIxgYgUhuf2zaRcjDm2OeudHoA9r1jBPw7rc3QvCZOIVjKi1vcct3RTSES2j3lvfQ0ptX59E62PAp+HmdMCOJ9dmmYyV7QrydYB2fQyBrrCb64girog0baG3drbibJseTlln8sIzhA0bd9Lq3WnzOyxCKLfN3RUMHxfIzG898d16L8SWasf+3hHLep34FzgTfN1xesc30XgENRZnflkwCoYN76g65TGvow=; 6:XMNLfCcfSRbIlR9KrUe0EIQC/XY4Ax/0bHlHSETEIvdZlBF+3mXqFEkPDwe3BJ+GCUsWPusNk3NAIJObVmnFC5w7YadldJqRY/dKhXu1nFd+T+PS5dos5/gKSHeaWiCz2dLRBl8tzZME6i8LRpqU2yLn1htpvTbNp6GQ8bmA+MRWdbYb41WkwIVxGDpfvIcXZe3UaZ4Q13SMfM0yuNt2zYJdwPBFQiDQvGlRXEjr8gh3W5hC0dCICO8rFU+PX9BFiwVFXzxwZrF49vurYr6j3lNSNoxCLbh6r9IcxYP+qnQbQadCoZZn9zgfmj4sJrCMdB8VulRhze9A1H8gIi+NI7AXEY4FHNiPC/gc+udDHY8BVkmCnxGSyVrnekC0wL1dqNHMEjRNoVaeT2KTB3T9JlIcrl/yjRIhHjyPVxcp2HxfdUVYW0iQHmJlKCwhLKV8Es6gbbmBXR05QFYC3HkxMZ3eS7GJkloQyHEzvdezfFadKDOlw3ywf1KpAdyFWDaR X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2FFO11HUB017; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(520003)(3002001); SRVR:BY2FFO11HUB017; BCL:0; PCL:0; RULEID:; SRVR:BY2FFO11HUB017; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11HUB017; 3:PIMPX8yGSEe77qyXuhvUH78SdQKuU4u7uCOM33vK5R6guxdeiNj15BlpHF4TQsYKHDe+pb870xDW87ANbvlqFFamrqVv9vfaO/yZ71eYYIrF+n5JrNvED4Llmy3/W0j9PexJllwK4yU+IbHIW4WRHuJazslqT9R6PxR8KVcYfv0QSfUDDRKHzTd0pcvW03W7hCID1PGXQoh7i9ylqRi5aW71bMMSY3m0bvCgly64wF9D6RKgMqYimbBzkmcykRGEDeJ8UYg5fWfIw3tFT9shEgyO42hi9/BTiTTDWcNpTQ27rdIghE+VPI8Mb4PdmjgU X-Forefront-PRVS: 06098A2863 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2FFO11HUB017; 9:WRuQTi1BZMaQhzfcj/wSJXo1p90s1lUMKo7Virsa7?= =?us-ascii?Q?KlngjpkTJJV7V28ha+qU1pUQhJFKSrA8yZXKH2GDBsepM9tksJSzuOdbb4l8?= =?us-ascii?Q?9pXPwQUxExQe5ol9ZAOubMT8+gTezoh/dqnrMWmwPZRnpLPqBOc0vz1JsLc0?= =?us-ascii?Q?FYeN1v4QZydxf3oOVnUcoCOKlW81H4ZOCrXWVyEfOtqypmDjhUPIkV+SboHP?= =?us-ascii?Q?3Akv+uqHvaoNjhjZwzDzGaB2N+gZorB0HiULCqS7JJTlPrmJR4YGcgZsm79I?= =?us-ascii?Q?vK9n2qVtdGsBP70oy6RvJGNKcmwCSMRuFTrHV7GDbSXhNCAc52WUrigtsLXc?= =?us-ascii?Q?9wtZrQ6L6vp6Xq3LJSxdH6V0JqETDRoBAHHNWIeUoVlLNRen4e6cSTxvLf2Y?= =?us-ascii?Q?fZqy+pSGnUZWvNSzGqtsshCNgDP48CvCQGplL67QS+8vMYAXMpPrOl/jG2Er?= =?us-ascii?Q?hUxI6IJOjKMujWAPrZVg8WT6i/hJCWwbbgqMyEg6WtOY1fCHa2rYpc/Qd/ly?= =?us-ascii?Q?vX+tLBKEObUY9gI3LbusyNYYy4OtBKqfsxhsvEJMD9e1ZfAFp1zLDwCqPv9g?= =?us-ascii?Q?h995EYY2HNmxOMipbPqV0W+3VzQxgSpWNrQpiDjzNiEmXG0ao4DmhZ+dGhu7?= =?us-ascii?Q?ynlgonFZhc7sP22wm9UG3zITfLsxX9ZbZkKNxYvRXD2QE5eofl7BB/aFBb5f?= =?us-ascii?Q?/YLFHummNnzEoQAb0pkyBe2iwavcOccjKWErZoQKymSMLTiGJStDk4j2KBZC?= =?us-ascii?Q?QSKhCdQ4Pf6WCr/dBzx8KDf8O2neEeotdTdAu843ztTrWaualTfsQ/ALMkqZ?= =?us-ascii?Q?IBWIT5V25gvCInYFp6FrUwFfVqXMpb6q1qIGSg+uhdSapiYsTaCahMLwFud5?= =?us-ascii?Q?9t1U7EE5L2adimf7C89YlhTucwUNhIUxa9IhdN90ojCaQVUVIsEYjYH+tWkg?= =?us-ascii?Q?tAXDmFVGx35sXxtrRXUzkhwlOu0Yv8cJJRbMaaGHj4zNRg5C4LAAMqaYUs2q?= =?us-ascii?Q?UTsDI7r42G5C70GQeld57Fn7Xs9JO7tOH7+bD9QDIQdQ+V+h6+FMyFEoVV6M?= =?us-ascii?Q?gI1fLYsRsHl1QDrAalmDnSVCqKA?= X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11HUB017; 3:QxOD99sQIYIZBffkYUfFMlYjqrMthO9oiZLX4/YvpPZz+J9BC015ZTld3stzBSL4MfcD0i7gYURf9oHorHQLAm5ti3ajGo+HbkekLaNosM3bWOpPVqR+r71K0OBfwN2HdU95lsMoFUQb65kxTXljIw==; 10:lVDWMkLLaALNhpTQBmQZQTdEcG3WGOBtDD2sIBoLJz0LH4+hbpq5hckraz4Iw2cqesXqbLlKiiD53lHYLPSL0Bo0T4t7O3MZ3LQfNknHpMU= X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2015 01:16:21.5832 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.96]; Helo=[xsj-tvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2FFO11HUB017 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (barebone) [generic] [fuzzy] X-Received-From: 65.55.169.96 Cc: peter.crosthwaite@xilinx.com, alistair.francis@xilinx.com Subject: [Qemu-devel] [PATCH v3 1/9] target-microblaze: Rename the usefpu variable X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Rename the usefpu variable to use_fpu. Signed-off-by: Alistair Francis Reviewed-by: Peter Crosthwaite --- target-microblaze/cpu-qom.h | 2 +- target-microblaze/cpu.c | 8 ++++---- target-microblaze/translate.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/target-microblaze/cpu-qom.h b/target-microblaze/cpu-qom.h index a6474f9..aa9c032 100644 --- a/target-microblaze/cpu-qom.h +++ b/target-microblaze/cpu-qom.h @@ -63,7 +63,7 @@ typedef struct MicroBlazeCPU { struct { bool stackprot; uint32_t base_vectors; - uint8_t usefpu; + uint8_t use_fpu; } cfg; CPUMBState env; diff --git a/target-microblaze/cpu.c b/target-microblaze/cpu.c index 13ae49a..a6b6fd7 100644 --- a/target-microblaze/cpu.c +++ b/target-microblaze/cpu.c @@ -114,10 +114,10 @@ static void mb_cpu_realizefn(DeviceState *dev, Error **errp) | 0; env->pvr.regs[0] |= (cpu->cfg.stackprot ? PVR0_SPROT_MASK : 0) | - (cpu->cfg.usefpu ? PVR0_USE_FPU_MASK : 0); + (cpu->cfg.use_fpu ? PVR0_USE_FPU_MASK : 0); - env->pvr.regs[2] |= (cpu->cfg.usefpu ? PVR2_USE_FPU_MASK : 0) | - (cpu->cfg.usefpu > 1 ? PVR2_USE_FPU2_MASK : 0); + env->pvr.regs[2] |= (cpu->cfg.use_fpu ? PVR2_USE_FPU_MASK : 0) | + (cpu->cfg.use_fpu > 1 ? PVR2_USE_FPU2_MASK : 0); env->pvr.regs[10] = 0x0c000000; /* Default to spartan 3a dsp family. */ env->pvr.regs[11] = PVR11_USE_MMU | (16 << 17); @@ -167,7 +167,7 @@ static Property mb_properties[] = { * If use-fpu = 2 - Floating point conversion and square root instructions * are enabled */ - DEFINE_PROP_UINT8("use-fpu", MicroBlazeCPU, cfg.usefpu, 2), + DEFINE_PROP_UINT8("use-fpu", MicroBlazeCPU, cfg.use_fpu, 2), DEFINE_PROP_END_OF_LIST(), }; diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c index 8187700..1f5fe9a 100644 --- a/target-microblaze/translate.c +++ b/target-microblaze/translate.c @@ -1411,11 +1411,11 @@ static void dec_rts(DisasContext *dc) static int dec_check_fpuv2(DisasContext *dc) { - if ((dc->cpu->cfg.usefpu != 2) && (dc->tb_flags & MSR_EE_FLAG)) { + if ((dc->cpu->cfg.use_fpu != 2) && (dc->tb_flags & MSR_EE_FLAG)) { tcg_gen_movi_tl(cpu_SR[SR_ESR], ESR_EC_FPU); t_gen_raise_exception(dc, EXCP_HW_EXCP); } - return (dc->cpu->cfg.usefpu == 2) ? 0 : PVR2_USE_FPU2_MASK; + return (dc->cpu->cfg.use_fpu == 2) ? 0 : PVR2_USE_FPU2_MASK; } static void dec_fpu(DisasContext *dc) @@ -1424,7 +1424,7 @@ static void dec_fpu(DisasContext *dc) if ((dc->tb_flags & MSR_EE_FLAG) && (dc->cpu->env.pvr.regs[2] & PVR2_ILL_OPCODE_EXC_MASK) - && (dc->cpu->cfg.usefpu != 1)) { + && (dc->cpu->cfg.use_fpu != 1)) { tcg_gen_movi_tl(cpu_SR[SR_ESR], ESR_EC_ILLEGAL_OP); t_gen_raise_exception(dc, EXCP_HW_EXCP); return;