From patchwork Fri Jun 19 04:16:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 486570 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 8B9D51401F0 for ; Fri, 19 Jun 2015 14:17:20 +1000 (AEST) Received: from localhost ([::1]:55769 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5njy-0004Gu-Eq for incoming@patchwork.ozlabs.org; Fri, 19 Jun 2015 00:17:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58365) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5njG-0002ud-DE for qemu-devel@nongnu.org; Fri, 19 Jun 2015 00:16:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5njC-0003WK-D1 for qemu-devel@nongnu.org; Fri, 19 Jun 2015 00:16:34 -0400 Received: from mail-bn1bon0082.outbound.protection.outlook.com ([157.56.111.82]:21027 helo=na01-bn1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5njC-0003W8-7D for qemu-devel@nongnu.org; Fri, 19 Jun 2015 00:16:30 -0400 Received: from BL2FFO11FD015.protection.gbl (10.173.160.31) by BL2FFO11HUB052.protection.gbl (10.173.161.128) with Microsoft SMTP Server (TLS) id 15.1.190.9; Fri, 19 Jun 2015 04:16:28 +0000 Authentication-Results: spf=fail (sender IP is 149.199.60.96) smtp.mailfrom=xilinx.com; gmail.com; 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 BL2FFO11FD015.mail.protection.outlook.com (10.173.160.223) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Fri, 19 Jun 2015 04:16:27 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:35742 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1Z5nj9-0005ZP-5r; Thu, 18 Jun 2015 21:16:27 -0700 Received: from [127.0.0.1] (port=41363 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1Z5nj8-0004mq-Sd; Thu, 18 Jun 2015 21:16:26 -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 t5J4C4lo013548; Thu, 18 Jun 2015 21:12:04 -0700 Received: from [172.19.5.153] (port=42891 helo=xsjrdevl46.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1Z5nj7-0004mn-ME; Thu, 18 Jun 2015 21:16:25 -0700 From: Alistair Francis To: , Date: Thu, 18 Jun 2015 21:16:25 -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-21620.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; BL2FFO11FD015; 1:KMlNCFWz9E5HciN3EL7pDjdVS3lWqkefy1Da9+F4zjFbcUEtsTPoXy1uHiqk3Ku/r7pUsYLUYBnPJVOMP1g4GZGqMRULfYhjXBl9iqXgbvg957jXd0Fg+XYFZi5/FKQayUh5efMBr5rx4wjMm0aaPG2fYJgvtEf35rLB93yOcij3xhTmPenwnKIrfht1Bn/5gm5p6VS20lYfcDhGfGpNpYZ7A8owFKYBOslerARrYaAkGkLGiTs35rsf1EHB9Z77gaSeG6qTzCPR9cFD2Y2QSdtkRjMy8XRpXu+a1NlIRwYirAecX1awFuNA8r0cbEyTAISl8Q+UCk7hGN1XA5YrNw== X-Forefront-Antispam-Report: CIP:149.199.60.96; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(339900001)(189002)(199003)(107886002)(189998001)(106466001)(118296001)(50466002)(229853001)(36756003)(5003600100002)(5001770100001)(5001960100002)(85426001)(92566002)(81156007)(33646002)(19580405001)(19580395003)(6806004)(87936001)(575784001)(46102003)(105606002)(47776003)(50226001)(77156002)(64026002)(77096005)(86362001)(50986999)(48376002)(2950100001)(62966003)(71366001)(76176999)(107986001)(4001430100001)(4001450100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BL2FFO11HUB052; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:unknown-60-96.xilinx.com; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11HUB052; 2:9HCagfWVqGIeYr85vxQnc5pc46uMtIzWIL3U9YIN4KEjcRdLF8U4BIwoFPce+uSX; 2:Ew+2dRyf2leEdRp4eUxP59q5NflPT1QAnxQV0LRRzE0DAp/vpgoRduRYIx5Fi/0tyRg2EkQ1YeBjgq1Uyv9EW4ecR+jXxDyc6jY3tbui3do0gQhrNmT8aJVgvs7azhrVMRcZCHICwQOo5dGkYu13jo4k1XCVW1lo7m0AVuf5XDoHQbkYxIeVjljDXWS+e1j5V+/aqOpXgjd5UfGA2qyA19lM7FkVqXJJ28A9BhP6MLI=; 6:dhIOBtWUjRfW2+JVAy/pb0xRcw6Rd32T0ZI6wAFOl5uiW1q/ZRvrJ/cy0UFYxX2mJ98E3G3x+7WZ9iR6XTNER8vBy5ax4QF1NqCzg5l4XZr305nanfJ560NgAtYMEWgh+Xg/bjZlDTNyk0x3qnH84nYLnY47DJZr7ADitzB+UL76pzLmcl6DjXuabz89YDtBnyiJmviSZjxzVSpk5qm+MEnTpDPEXM1cjMve6475jZcIHY0a+s2aUeK78vDIbdHYAocEQbtNuBJoXQ3yfDC6X7yAunH82Y2VMC1apD3Um1cxHI6/zVC+JcFHs9duGV36m5mBDFIYJShvspqF5m3mb2iIuifuvGbQ/JQlXXJSdh0GQfoA2bktsj0IHD29bMVtLspl2mZZhMcV6+4Sgobi+5aS57/FNXQvOsHuERPSD//nrL+sFDnSfSu5+GA+1MOSI7L97BiRm8p7j0Z3v0Cn3Vd8VrVQcGKd9V/h7HDKioC5Nd00f9mxq2n13QBn/Qno X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2FFO11HUB052; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:BL2FFO11HUB052; BCL:0; PCL:0; RULEID:; SRVR:BL2FFO11HUB052; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11HUB052; 3:o+dIQOt/kMlo6m5dNOwaAUpzNKUAqnWk1oEI0kwhjVwNP3P4Aw6z976zQwiyki9WPD2HMczMQuJXQI7ls3jcAOW39IAgymqL0uGg4wqYyMH5m5E4GnH1AnPjfaFr1RvaiC1g3HDWtUsY6TPEroTPiN87bbOkH2Snwv7eUQPAVuGeV9BMsAh6pYH5ocyPgE6I2XzqGQHVDY8ytP/FIy2O426x9w8KB4quyOMw0iCCQ8X3IGXyCrFkSixBY6FS0yn5Pdygr6VvuZbCBR3obkfRz+9/mhuLkRFpVQec6X5MCQw= X-Forefront-PRVS: 0612E553B4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BL2FFO11HUB052; 9:qgOImzeDq5icFpDsiMyLiB/6mbXqN+76Ljnycuhcc?= =?us-ascii?Q?cDWUPhblY5y8Fs9c60P6a/2tXKa1WCXDmLeNXg/GuFF7BH+VJuqdfWv0kFnh?= =?us-ascii?Q?IMNcX0iAmWb+N+L425tEec7Ckx1BiVNWKWrgTU4vLC8RjZ/LlgKMZ+UtOmb3?= =?us-ascii?Q?lWr7fFIApT7F4bfw4ec1F2u33m2u+wsdqBTwqOWvJmaqsxBhXXTt7AwYGfhV?= =?us-ascii?Q?YaqLJpupwfaqypg59aQNJnj5OUOPA7aN/+GV1VaRqOsIVUL7MwVKPekNFx2I?= =?us-ascii?Q?pxR7AlnEEpRS+XX5O5S9DgEvbzGyTvcsEgLfOm0jtWkNViqqnhwLM7KoVGOY?= =?us-ascii?Q?E8hK3rNPIX75fy/LlcoGDFpBnR1fvTfDJ3WLYcW26pQMRJGGxyPXlblE0dGy?= =?us-ascii?Q?zzWlX2agsiTa5tfwIgKGA+IpvX4wKAqhe78brcyPuRgYzkPg/vjYKBK7rgko?= =?us-ascii?Q?b70unsejSmHUrlub7Y8WBl9OkW/hnr+8xm8afIZUOvdWQzR61Pz0Td5yjjIX?= =?us-ascii?Q?kQJn+JHtGyFFoJ/AD7qQbQHgGEb6R1Y72qvQOqr1yX9dWwNxk0bTYxWSN2Fc?= =?us-ascii?Q?aOwDoF6OJPVQR9jWPTOUJCHftUzBG+ktRJUYom7HRJE1n88gMK/GftpR+SU4?= =?us-ascii?Q?Kp+05QbrTsTKJNh5UrDFMkLSpWTh876i+9YZiQesA2tgkjJMn5tEd88fyu6w?= =?us-ascii?Q?jxt7GZhBl9Pa5j3U6dyD8IHHc7YZODgA1r3MGsSpfuoCIN3MWHvKFXY8YBHx?= =?us-ascii?Q?BuFtycWDkWBVtpC9px1nMP5Y1segy2Ret2UThNNler5gwxXPTtNYK874cO7h?= =?us-ascii?Q?HwqIRlVbJea417yXpHd12LnqC/Rs+1jL6825wb3Rufg7sQAMPPf9zN362vRv?= =?us-ascii?Q?gD6tRYSE6LZn9wUlpm3Ub9dY9bVpu35Tnpni/fXujkVv7VsOHvg98dw2fzu8?= =?us-ascii?Q?okKitGx4Y0ELX/A+WvmMpK4oryDV6ILt9b2xUz8DtaH2FI8rO+N0SumzKgRL?= =?us-ascii?Q?AsGugWjhhrhH+UXE/aJdyiy5IZ+LryX8wZ08n8Bz2gRpzA1usQdD4keFduX0?= =?us-ascii?Q?WAFakZX2Xbra9Glc7S+cgxXKADjzU3NetSYtpnwT4fDxrPDmQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11HUB052; 3:waustqamPTWG/34/HAUZQKP05apWkOWsQ9+sleDuXNVimF3H2B099JXnSVqSfEgvnXxj/yPfSakv5b85QNH+kCPHvVFfWRqxm2Z0ARn74K7jgAMANWAbzbak14+yVfjm0EL7/Gk3DldxhJRAmRtmsw==; 10:MkuCZ+ooNjOhPC3SLjqsurd0L7SkunNM09O81ERXPRQptEQXujot3+AQqFwm7vnq0zPYZCj+8LInfplLj9qOPXaDNFedUfv34GF+ldd7sUo= X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2015 04:16:27.9904 (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: BL2FFO11HUB052 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 157.56.111.82 Cc: edgar.iglesias@gmail.com, peter.crosthwaite@xilinx.com, alistair.francis@xilinx.com Subject: [Qemu-devel] [PATCH v4 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;