commit fed3ffb9f157f33bc9b2b1c3ef68e710ee6b7b4b
author Edgar E. Iglesias <edgar.iglesias@xilinx.com> Thu May 01 15:24:45 2014 +0100
committer Peter Maydell <peter.maydell@linaro.org> Thu May 01 15:24:45 2014 +0100
tree af8772fca3cd07adf8fe320b6e838b388d3b4984
parent 252ec4057685cd9bf6a13f96528c843754af8fad

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>

target-arm/helper.c

diff --git a/target-arm/helper.c b/target-arm/helper.c
index 7c083c3..7823e8c 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -657,7 +657,7 @@
      * contexts. (ARMv8 would permit us to do no masking at all, but ARMv7
      * requires the bottom five bits to be RAZ/WI because they're UNK/SBZP.)
      */
-    env->cp15.c12_vbar = value & ~0x1Ful;
+    env->cp15.c12_vbar = value & ~0x1FULL;
 }
 
 static uint64_t ccsidr_read(CPUARMState *env, const ARMCPRegInfo *ri)