From patchwork Mon May 18 01:13:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 473240 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 6941C14016A for ; Mon, 18 May 2015 11:15:46 +1000 (AEST) Received: from localhost ([::1]:38843 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yu9ei-0006Yc-IW for incoming@patchwork.ozlabs.org; Sun, 17 May 2015 21:15:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yu9cy-0003Xp-4N for qemu-devel@nongnu.org; Sun, 17 May 2015 21:13:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yu9cu-0003TN-6e for qemu-devel@nongnu.org; Sun, 17 May 2015 21:13:56 -0400 Received: from mail-bn1on0074.outbound.protection.outlook.com ([157.56.110.74]:35744 helo=na01-bn1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yu9ct-0003TB-Ul for qemu-devel@nongnu.org; Sun, 17 May 2015 21:13:52 -0400 Received: from BY2FFO11FD003.protection.gbl (10.1.14.34) by BY2FFO11HUB026.protection.gbl (10.1.14.112) with Microsoft SMTP Server (TLS) id 15.1.172.14; Mon, 18 May 2015 01:13:50 +0000 Authentication-Results: spf=fail (sender IP is 149.199.60.96) smtp.mailfrom=xilinx.com; twiddle.net; 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 BY2FFO11FD003.mail.protection.outlook.com (10.1.14.125) with Microsoft SMTP Server (TLS) id 15.1.172.14 via Frontend Transport; Mon, 18 May 2015 01:13:50 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:55118 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1Yu9cr-0008PZ-R6; Sun, 17 May 2015 18:13:49 -0700 Received: from [127.0.0.1] (port=36747 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1Yu9cr-0005TY-Lm; Sun, 17 May 2015 18:13:49 -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 t4I19cYf015229; Sun, 17 May 2015 18:09:38 -0700 Received: from [172.16.162.22] (port=51002 helo=xbreng02.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1Yu9cq-0005TU-Gy; Sun, 17 May 2015 18:13:48 -0700 From: Alistair Francis To: , Date: Mon, 18 May 2015 11:13:46 +1000 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-7.5.0.1018-21550.005 X-TM-AS-Result: No--6.540-7.0-31-10 X-imss-scan-details: No--6.540-7.0-31-10 X-TMASE-MatchedRID: Dcq+tTLukTqBUMn41L9aQBcanaCAqviGTJDl9FKHbrmtj24Xqh0yXEtH ojrK13E48eoBfgDeEI56egcNBFTNkVdI3z1FMme3o65WJt1k1O9x9T7TIgq5haMP1fF+gQ2OKhP nM1YfWBWDs++1HZnNBIAy6p60ZV62fJ5/bZ6npdiyO81X3yak81tR8ghJD84rWw3Q5szfBjNMCh QHWtuHd8tpMJfCnx/9mAU3d2A9609+3BndfXUhXQ== X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD003; 1:HQkTGT0njrez+BqeRIloRAUwjMWqx9qIPjPADBC8tl1IsgekncIv7p5cXBhTIqGYW2yJ5sylPPon9UiwtpnpseAAdZXWtK+UTI9E9WYdXQ+GOjysP/s1CtRCcQGfl4Kep8SBwznkf264K10HIEH5HD2O/mEPenQgg0xhsnFhJCoUAJ3WhPBHMxBXbaGz5nvEl3jQK2Coszu4sUplzLiDeW5wR2Aw2za9HgXX9Wu8ffFD1EjCC6TsuKotrtL0Hpjjj6OYxjipe67/fRf5TJlqeWFVveJypl999OevZ7GPzPHoEHi9P3j63N5O+0/6Us/c X-Forefront-Antispam-Report: CIP:149.199.60.96; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(339900001)(199003)(189002)(76176999)(575784001)(86362001)(46102003)(50986999)(229853001)(50226001)(33646002)(62966003)(77156002)(106466001)(36756003)(118296001)(105606002)(71366001)(2950100001)(64026002)(85426001)(5001830100001)(5001860100001)(5001920100001)(47776003)(189998001)(5001770100001)(87936001)(19580395003)(19580405001)(64706001)(6806004)(5001960100002)(48376002)(50466002)(92566002)(77096005)(4001540100001)(81156007)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2FFO11HUB026; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; PTR:unknown-60-96.xilinx.com; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11HUB026; 2:Qc2fSBqmKsz5l67+8+qJsr+iCMmNe8ljXzldPYQw1iJZacvjJ+pcq90KXVD7zV+d; 2:+XvDA4ygpujfs8lvMbJln5gK5r9GjqLwLL9eqeh+idEE0Wg8EpFG/07LFnHHBPaMB9ipuyB9R+LqSAmFzMIF3q5ONRigR3cKiN27msTvyL/CF7Y0Pi40tBY313imvA/TvbrHsGZ4MzdRxabOlPlD+K0UnHn4r4bj9r0PBCl6X85Cwg61+nhzHVYLGajIZMUGdy+AdjURsocPEBxr87h4h5xVEz10TFXn4ZiKZOhevJA=; 6:m/NGO9Yr18YMYuzdvvz5M6ekODMkx9m/DAss7QnC6jFXyTgx+ccUzfMdzRHHfQcklJdbT5cnj4hR8CSYdgAOv7Y/65mAeUcgN8yOWplj+graTXXIKzFG/SGCJM6pYnz/Z9JT89nQg46sxc756+fnsLMXMn2vXkH7SFKaDjWEHxwmVoEj7FJwF5Mfzt+BbifW//g1NbPECejd0CqTGnw4CKTUgRUBPJB2vNtelUu7S7gAchcThvrLrSgHRMbDzwXc8upAuriI+KGl5RKMtrZ2HZKRXAd/M/hkeT5QR3vYFyWS+SlfdaRET13TwjUtXHJReJVYdeCIg3QffaCtVedCq/zC2QrquCMUsfyV65SS34FD8Fn6fanKBhCgqYLS8ogieY12PW0VkvKk1nNj8C+uyyMmsTJcO/ZES+KEebd+lGCE/yVk8ElbT3B5Hp0AGj0tro6tiBmJXDdVUyEsNk3dl5jPM1/KpwmWXWkwXMaFjaELcanFmDasYhHQemYVDAAq X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2FFO11HUB026; 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:BY2FFO11HUB026; BCL:0; PCL:0; RULEID:; SRVR:BY2FFO11HUB026; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11HUB026; 3:RNwmXQu+xjKtSZ8ueu8ClPd7irtq8nUWkNzCgpNUKlMEwAYjziv7MfemLF31XV2UQ7R+Oe+So3fI+AUV3EZFpDxOsmoyavaeOMQ1wmuE7/gdnUU3kTICPR/B+3YYQ1QqLoFyZqnaowPtMTVhO8ZzhbwD5xZGsdowsHqxcYQvL6sDTgG/+8wOMnFYPAMAApTY+NKrF39JUQgH9jycPe1h46iSJMUJRxBgKaIcgJNyShj/W3R5x9RIy5uga+Yo6UIP7wf46ZvIjw459yi8/1SWOkCAcVvosD28grXQgG08xxI= X-Forefront-PRVS: 058043A388 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2FFO11HUB026; 9:DQ0it9Ka/9PVA+5umv/yZ+VIQXhAWjF3fktCH2UAy?= =?us-ascii?Q?J+HyQGb8xl8rOKVjrjzsztTznQ0gTjxZNEo6nNQihr0Boj5l0ATEVPx7RtCx?= =?us-ascii?Q?cTS6GWnYyVTjnBwclq3KZKTgb9kkcF/Wz7zO6byf/nhc558kuGNgks6qp+VJ?= =?us-ascii?Q?cwNdbcmnDSLNpgifvbzg8iM5i5vzExjNkkVzIpjC1RSLNr6y9+OP6VErSVv8?= =?us-ascii?Q?AIjYm73ny4jqqjTwJad2zEAOYemZCrCD/X5wODOSA0K/wKmY1gYY6j6a6azt?= =?us-ascii?Q?wyphBhFiYs6J40MLvQ5eqTM/ItPRCqmUaCgNUuM8ozWgAWIJkJEeaF9AFYw7?= =?us-ascii?Q?fGF4ZXDSkZTYm+xLwW1B3jYCFp16Anfdt5/4tjYOpq5q6fIu58rAWZt+vh1f?= =?us-ascii?Q?f2P8Wr8uxwzOq2QN5AlM3R7s5J/udMP22wkpW7yRPpOLUF+uy9ckkcAM8j1U?= =?us-ascii?Q?M6IjT3ZSQ33QpVFHNmvqm0B04kAUW+x2Lq2SgkjcD2yJv3ck2bQW8gVDbWmZ?= =?us-ascii?Q?hwkPg6EwPHvJ46IaYKXzm4xa/MPjmds9DvqjD4v1qI/FK02BkVmXaqsKpHKv?= =?us-ascii?Q?CwjmKw8zfW+eWonw0kVOqC5EHM/Y5Ibwcnoos7CJ95VrFtlCaSWGE6vExTd2?= =?us-ascii?Q?xGl8a29xH6EcgkA8b65UH7rcgW+2LJjU7giYGucw+g3fWuuNROlPpFvwI6PZ?= =?us-ascii?Q?wupiixEVcsELAoMqrj9QMrUT4bpZ2LRCwCVOZU8TlsHodZC63vMsHocU9Lrs?= =?us-ascii?Q?ZgMATBd8d8kuI5Yt9LqExj/hLwf90FJtluFHfbgtDzA5rz5DJDHZkoNn2tj6?= =?us-ascii?Q?tc/k8OBtZloXJDv8zKxOF9XFG43/GD9B0wK8e7d51xqxmMZW2cw1UCGxY0CB?= =?us-ascii?Q?unb/r8I0M9wlu+mZt7hnVXnAa1t2zqypJR8mzsShM8MVIl8SWCdvbJjeqddF?= =?us-ascii?Q?EyQQISYQmoVXzFckgWdhveAyr6EQ07SRkeqd2KXoTaaFuuYc+dDprZQxMWzE?= =?us-ascii?Q?kE6/NaTLx4eAMdbzIHwhcG0LsII/ClW5jExIYHW7ZPFrWUdjcbYt6L5pZSFx?= =?us-ascii?Q?QFbDXbB/XtQVAsiV3uCgvQXaqkuTZ7vSIL4NszBUkzqOral8w=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11HUB026; 3:BscKJ50QkZmXwP1NqHOE045R5KXObQhx8+tqoh+dC4JeT+MGpcdUDhTaLoyHmQcpaz13GZQhB4h4CYA2LfK/l8gniqY+5EB7tHTIBOPHeFTlAithovXQOamb+RImFZH8fawgShRJW7RVii3X2zHrjQ==; 10:sjIRqNU/uBBRcKc1gW5dJKF0pQvPECsJOlgzda1UxIxIBhcm1hQ7HqzjaNA27mGqH+6jdEsiopBLPPU47AM5IjbrN70t7uwOKtdrVf/6Cm8= X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2015 01:13:50.1915 (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: BY2FFO11HUB026 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 157.56.110.74 Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, rth@twiddle.net, alistair.francis@xilinx.com Subject: [Qemu-devel] [PATCH v1 4/5] target-microblaze: Tidy up the base-vectors property 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 "xlnx.base-vectors" string to "base-vectors" and move the base_vectors variable into the cfg struct. Signed-off-by: Alistair Francis Reviewed-by: Peter Crosthwaite --- target-microblaze/cpu-qom.h | 3 ++- target-microblaze/cpu.c | 4 ++-- target-microblaze/helper.c | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/target-microblaze/cpu-qom.h b/target-microblaze/cpu-qom.h index 7bc5b81..750ff3b 100644 --- a/target-microblaze/cpu-qom.h +++ b/target-microblaze/cpu-qom.h @@ -56,12 +56,13 @@ typedef struct MicroBlazeCPUClass { typedef struct MicroBlazeCPU { /*< private >*/ CPUState parent_obj; - uint32_t base_vectors; + /*< public >*/ /* Microblaze Configuration Settings */ struct { bool stackproc; + uint32_t base_vectors; } cfg; CPUMBState env; diff --git a/target-microblaze/cpu.c b/target-microblaze/cpu.c index 4deb256..c7ad5d5 100644 --- a/target-microblaze/cpu.c +++ b/target-microblaze/cpu.c @@ -123,7 +123,7 @@ 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->base_vectors; + env->sregs[SR_PC] = cpu->cfg.base_vectors; #if defined(CONFIG_USER_ONLY) env->pvr.regs[10] = 0x0c000000; /* Spartan 3a dsp. */ @@ -161,7 +161,7 @@ static const VMStateDescription vmstate_mb_cpu = { }; static Property mb_properties[] = { - DEFINE_PROP_UINT32("xlnx.base-vectors", MicroBlazeCPU, base_vectors, 0), + DEFINE_PROP_UINT32("base-vectors", MicroBlazeCPU, cfg.base_vectors, 0), DEFINE_PROP_BOOL("use-stack-protection", MicroBlazeCPU, cfg.stackproc, true), DEFINE_PROP_END_OF_LIST(), diff --git a/target-microblaze/helper.c b/target-microblaze/helper.c index 32896f4..69c3252 100644 --- a/target-microblaze/helper.c +++ b/target-microblaze/helper.c @@ -154,7 +154,7 @@ void mb_cpu_do_interrupt(CPUState *cs) env->sregs[SR_ESR], env->iflags); log_cpu_state_mask(CPU_LOG_INT, cs, 0); env->iflags &= ~(IMM_FLAG | D_FLAG); - env->sregs[SR_PC] = cpu->base_vectors + 0x20; + env->sregs[SR_PC] = cpu->cfg.base_vectors + 0x20; break; case EXCP_MMU: @@ -194,7 +194,7 @@ void mb_cpu_do_interrupt(CPUState *cs) env->sregs[SR_PC], env->sregs[SR_EAR], env->iflags); log_cpu_state_mask(CPU_LOG_INT, cs, 0); env->iflags &= ~(IMM_FLAG | D_FLAG); - env->sregs[SR_PC] = cpu->base_vectors + 0x20; + env->sregs[SR_PC] = cpu->cfg.base_vectors + 0x20; break; case EXCP_IRQ: @@ -235,7 +235,7 @@ void mb_cpu_do_interrupt(CPUState *cs) env->sregs[SR_MSR] |= t; env->regs[14] = env->sregs[SR_PC]; - env->sregs[SR_PC] = cpu->base_vectors + 0x10; + env->sregs[SR_PC] = cpu->cfg.base_vectors + 0x10; //log_cpu_state_mask(CPU_LOG_INT, cs, 0); break; @@ -254,7 +254,7 @@ void mb_cpu_do_interrupt(CPUState *cs) if (cs->exception_index == EXCP_HW_BREAK) { env->regs[16] = env->sregs[SR_PC]; env->sregs[SR_MSR] |= MSR_BIP; - env->sregs[SR_PC] = cpu->base_vectors + 0x18; + env->sregs[SR_PC] = cpu->cfg.base_vectors + 0x18; } else env->sregs[SR_PC] = env->btarget; break;