From patchwork Thu Jul 23 15:13:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 499448 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 CDFE8140D31 for ; Fri, 24 Jul 2015 01:14:34 +1000 (AEST) Received: from localhost ([::1]:41777 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZIICc-00035F-NP for incoming@patchwork.ozlabs.org; Thu, 23 Jul 2015 11:14:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZIICH-0002mw-LP for qemu-devel@nongnu.org; Thu, 23 Jul 2015 11:14:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZIIC9-0008UN-Pr for qemu-devel@nongnu.org; Thu, 23 Jul 2015 11:14:08 -0400 Received: from mail-bl2on0066.outbound.protection.outlook.com ([65.55.169.66]:60256 helo=na01-bl2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZIIC9-0008RM-LW for qemu-devel@nongnu.org; Thu, 23 Jul 2015 11:14:01 -0400 Received: from BN1BFFO11FD038.protection.gbl (10.58.144.30) by BN1BFFO11HUB011.protection.gbl (10.58.144.158) with Microsoft SMTP Server (TLS) id 15.1.213.8; Thu, 23 Jul 2015 15:13:58 +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 BN1BFFO11FD038.mail.protection.outlook.com (10.58.144.101) with Microsoft SMTP Server (TLS) id 15.1.213.8 via Frontend Transport; Thu, 23 Jul 2015 15:13:58 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:51853 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1ZIIC5-0002h6-Pf; Thu, 23 Jul 2015 08:13:57 -0700 Received: from [127.0.0.1] (port=52837 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1ZIIC5-0003V0-KA; Thu, 23 Jul 2015 08:13:57 -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 t6NF9N6F023015; Thu, 23 Jul 2015 08:09:23 -0700 Received: from [172.19.5.153] (port=48627 helo=xsjrdevl46.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1ZIIC4-0003Ux-Lf; Thu, 23 Jul 2015 08:13:56 -0700 From: Alistair Francis To: Date: Thu, 23 Jul 2015 08:13:56 -0700 Message-ID: <5eded8311c4c16ac22956810a68497424d9ee62c.1437612120.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.1.1 X-RCIS-Action: ALLOW X-TM-AS-MML: disable X-TM-AS-Product-Ver: IMSS-7.1.0.1679-8.0.0.1202-21698.005 X-TM-AS-Result: No--8.340-7.0-31-10 X-imss-scan-details: No--8.340-7.0-31-10 X-TMASE-MatchedRID: X6QxN4fiJm9b8Ol7R+ysilVN8laWo90MU2r14C44t4juc7XfuTYENvlY oV6p/cSxO86I5zECmW1ZIiTk3HCtfqtL0wBaA/G+7spMO3HwKCBT4DtiSkMnWDqI/Q1zONHShJD aXmsbdjTi8zVgXoAltsIJ+4gwXrEtec3QM3secWZYOFTc7SJElLFBtPpmmI+3bAt3IqYaWih7Kg HiB19EQnXklPKhjRPDlExlQIQeRG0= X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD038; 1:SdCDiyPsPYUTot8rDXUAfaC4HSKMR9pRGbRHA3hLXG9TIoevLRvUUmfcA/0J73QSdGSa5B8PEafJoR5NGieV2f0I8ApSKRgjDCBQhZxn33veg+KDMjaOYFbhnIdIordRy/8Eec4FdYB0oVWIaM1MGZBVXcahVprTlttBFgGDA3rblpnfklOCCHXyXsnouz69npwDAhetXINOBmwmc9e79+2QYE1Ip4jhRm3jvBJRCIbm2gDcPgwV07RlR29g8cZEMVmp/qlLyKMO2earrHShMiT97FIUvGnO8RgKqjS7xq70KQO+O7JHRLJbLvW+wN4h1fyULfHWtZUCYTWVJFCY/smTGmLjsiJmjc0Z1abtnXtPafoZCpj0bEgLPZlZg7NtMJ0bHWrHZsojLgLcESuL7l4mRpTHxw/LORBIufw8gXc= X-Forefront-Antispam-Report: CIP:149.199.60.96; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(339900001)(199003)(189002)(106466001)(50986999)(33646002)(50226001)(229853001)(64026002)(105606002)(77096005)(575784001)(46102003)(2351001)(47776003)(71366001)(36756003)(19580405001)(19580395003)(5003600100002)(62966003)(50466002)(6806004)(87936001)(86362001)(77156002)(110136002)(85426001)(92566002)(5003940100001)(118296001)(48376002)(107886002)(5001960100002)(189998001)(107986001)(4001430100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1BFFO11HUB011; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; MLV:nov; A:1; MX:1; PTR:unknown-60-96.xilinx.com; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11HUB011; 2:wa/R9YSQS4Agy2i3c3ca8wa2zT154Mxh5Z4N1Lasf+qqQzewKzP9KCVR6VC04+to; 3:nFX2m/Vn76fEjBwfKek83L9NY+cgGexugrtv3kgCNZUwe6+87UfWNps0Wo5RtoqE0Ok7PcN0uqQvHTo8IU3UP28MxYkp+t8EvC0peiAfoCwBBsq1Wzcnv0Ac438DCXLhSSyQRr8ouHQ+inM89rOhdtyqhdTxK3WU5teLZtYUVUhKCKzf1xAS+2kLIe72rx6tppkKjn4sHW801PJbtyVeh0AYsqM5b/kuNGnU9qiiyLA=; 25:49/2uutaOC/B/WVJMwD4ay9259HBlEgQGDzJzOnPqsMxC01+5jHhW0WRyoXJhG0c7xJwpXaZcMXJnpgcTmg4By8yJZip5KDxbSDE7iBb0702+1WYjOEmmKf8zqXu3ke23jYM5ynvkvrs4NiHd39GyKMU9841G0N6sVrB6nrxAmDew9lGdUyY5LNww6dC2bd8S1PYlKCVipVemLhAGZXF9Qubxvew+9RlC2c73qJE/PgG8N9MA5KqWAPq8ja0YD11 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN1BFFO11HUB011; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11HUB011; 20:GWDAhfgeaY0bBOBL08mA6vxBQMNNTay5Wihh4mJ9TSoag+7IvduzWmJgCOYukyhlIWfAvFagved8EpWCtuKO3VmhJbWRF3vUmgS1A2ScVpSdFpJCeerjtyrDzlqSNTiE39htHFM3hfT03dn8d5oe24O+48KXk01n0pMRjlJ4yed9m/0QQGH25uEwGvgvIi58zjTPNC0z7dlLlXZ3aQVJAjj8rU56zmoq+6FkABJwRtBa3lC4LmU8zEU2yEDhLo/W9q1VgVr6FUzdN/7eQgHewba+nwGALmjRnDw8a4d/F5SAZRV3Cz48GyxVWza6OSgImWGc4Q2KTIEm3UhO8w5kTQxUvU4UXSAMWmFEHZu88JxTzVVT+wf8rlx/xJpPauMI8DREcvIE2EOBau91xvoiOYXy9b3uCiqo8hgfHUArAMWqC9cENudffqBbrVsZBaDrqwFFL6FirezDleai8FPwIEOLiumKWkp1xtbWot3mWCWziYrX6bhNsU/ILJgRr1SD; 4:uftj9Z3XEwHa7d7enhrAZ/n/sd9C7bbVowYoTns0KA7LvH2wAGJojmUlvVMw0JQtdvG5ZOqvLYiDMQWkq12NIDeWZc2QA0DtXZ2msLvxjwq3pH9f6yTaqo3DPtJXx1pFsEL5thJYD6ZmACI0klTlYc+9hSstStWs9ffWRydYmGik9Qv5J49pLQVlBoddUC7cg+dHH8rkFaWIVCSbi38TJWfi4kwizmsSMgreRx0EfFGfIgMKJmtyjsfDAks77KNUfVQHGjH3gKWVHzE/LKyWfRaYXVc498pBsoyBm2sJNH0= BN1BFFO11HUB011: X-MS-Exchange-Organization-RulesExecuted 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:BN1BFFO11HUB011; BCL:0; PCL:0; RULEID:; SRVR:BN1BFFO11HUB011; X-Forefront-PRVS: 06469BCC91 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1BFFO11HUB011; 23:xhD9SeBgJoNzAvucELOGqRon6pJwD95WMbdQ96K?= =?us-ascii?Q?xpLAStgENmfQ/HHdL9zzWZOLK7qD0nwYNxy8/DQHDViMo84KoBlLf8KuTCS0?= =?us-ascii?Q?Zlxbw0mEuyx4FVCAw4BgMKGj5PsChQYer8p+6bIEkrSSqB3oTWS0HmltHSTV?= =?us-ascii?Q?wxhxIVkZRuT8h9BQafm1GVoSvilrGjsSyqIC5yvzUD7zDOt3zAeW5q3kTrka?= =?us-ascii?Q?SRfrWbwQ3kmDMfprOLZwIDUof2vTivJb98aFY074mxls1EG3qhGwNRSHHiA0?= =?us-ascii?Q?6DtCH/Logzm2oWMdT78LzCFtqWwZFoowz/rQCTp2Of3Cad1jZd/W1p5vn6rQ?= =?us-ascii?Q?HahMwuk0c1MKgQfh3h6bNDEq5DGc8xej8g1Bkhp3/EF9/8i/zvI2CRLSc4hv?= =?us-ascii?Q?1soRRGakL5JbNYYK9RnC7th2eYjd+CLlViuHbJAZS+34Xi3tWw2Uc11y+3o+?= =?us-ascii?Q?5RAbnJ8LV8d080xCgzNhIAt8sMDzO+fAdewCTKTxfs0D9u/147jieWs6sYJw?= =?us-ascii?Q?vQ1NKkVJ30K/z9ELgIZb9stcs7MqKVbUdnQtFwatYPs90FQfYxTpEzpQhhvQ?= =?us-ascii?Q?UDtX6ZNfhi6u4C/bGYnXM2dB2MBa0TiwCpyzAA9rfVNdHpNt2PlFRg44LViM?= =?us-ascii?Q?pNKvOC0xOlRxQ+qZUp/hZRwR/tRNC1JxXPvY700d6XF8SBzQY6O90kt9tjBS?= =?us-ascii?Q?lRiKb/yhL95HTbh4VjP/TIzBbkJ1l9z5mrD6sL0695vut/XYtoMKTqIqaB6B?= =?us-ascii?Q?n8Stk+Y/ZQ1gg8aFBwrm6t8iomD5nvhvzfEUIOEtwAFLIUq/8MAnol4ZtODE?= =?us-ascii?Q?3TCRNX1O3LT9TYpwSsa7eVmRQHPcH5FiIG63/TaV4NcF/Lzgw24gh847jBxT?= =?us-ascii?Q?8DosOjVo4lUBLeuanYvgYbvM8Cy+Iz2ziQadsgqpBjyotMN+/yVFViiNpbSo?= =?us-ascii?Q?uVbuInHM210psiZFWff6VRt2rOxkHsRrs64tfPUb5nWI3o1J/SmbNFBzi+4p?= =?us-ascii?Q?qpyVUU3+9tBxtv38ukqHAHmoI2Thng2Q76hyfGyK8RUieIg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11HUB011; 5:J5NUtzhOTCKmEAziXdpiZQYf9hIxQH6MUe7egxgyihoM32DxLV7SMCCToHGFq6lAnxaIwMGoT/Mbi2VzFrN2i2TQVnOAcLutmFuwfrUv5Ite9beRuh4X8mzG5DK0kUCH9sDuq5YQ66dD3FfSilNLOg==; 24:48y4fhfsXyR+vjhaVkiHwmH5Xbg1/wjqNshndVMpM9/a5FYm1l7m0NEfYj1sLO2oQWQLBFgdTbvsjwY2Ot1XkfEp+OxDiI2XN1EIfrm5bqA= X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jul 2015 15:13:58.5752 (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: BN1BFFO11HUB011 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 65.55.169.66 Cc: edgar.iglesias@xilinx.com, edgar.iglesias@gmail.com, crosthwaitepeter@gmail.com, alistair.francis@xilinx.com Subject: [Qemu-devel] [PATCH v1 1/1] target-microblaze: Set the PC in reset instead of realize 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 Set the Microblaze CPU PC in the reset instead of setting it in the realize. This is required as the PC is zeroed in the reset function and causes problems in some situations. Signed-off-by: Alistair Francis Reviewed-by: Edgar E. Iglesias --- target-microblaze/cpu.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target-microblaze/cpu.c b/target-microblaze/cpu.c index 9ac509a..cbd84a2 100644 --- a/target-microblaze/cpu.c +++ b/target-microblaze/cpu.c @@ -107,6 +107,8 @@ static void mb_cpu_reset(CPUState *s) /* Disable stack protector. */ env->shr = ~0; + env->sregs[SR_PC] = cpu->cfg.base_vectors; + #if defined(CONFIG_USER_ONLY) /* start in user mode with interrupts enabled. */ env->sregs[SR_MSR] = MSR_EE | MSR_IE | MSR_VM | MSR_UM; @@ -183,8 +185,6 @@ static void mb_cpu_realizefn(DeviceState *dev, Error **errp) env->pvr.regs[10] = 0x0c000000; /* Default to spartan 3a dsp family. */ env->pvr.regs[11] = PVR11_USE_MMU | (16 << 17); - env->sregs[SR_PC] = cpu->cfg.base_vectors; - mcc->parent_realize(dev, errp); }