From: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Date: Thu, 1 May 2014 14:24:45 +0000 (+0100)
Subject: target-arm: Make vbar_write 64bit friendly on 32bit hosts
X-Git-Tag: v1.7.2~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c569521833786a502ca0861e2f7885d2e2e3428;p=thirdparty%2Fqemu.git

target-arm: Make vbar_write 64bit friendly on 32bit hosts

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 1398926097-28097-2-git-send-email-edgar.iglesias@gmail.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
(cherry picked from commit fed3ffb9f157f33bc9b2b1c3ef68e710ee6b7b4b)

Conflicts:
	target-arm/helper.c

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/target-arm/helper.c b/target-arm/helper.c
index 34458134655..c3e491006f9 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -546,7 +546,7 @@ static int pmintenclr_write(CPUARMState *env, const ARMCPRegInfo *ri,
 static int vbar_write(CPUARMState *env, const ARMCPRegInfo *ri,
                       uint64_t value)
 {
-    env->cp15.c12_vbar = value & ~0x1Ful;
+    env->cp15.c12_vbar = value & ~0x1FULL;
     return 0;
 }