aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdgar E. Iglesias <edgar.iglesias@xilinx.com>2014-05-01 15:24:45 +0100
committerMichael Roth <mdroth@linux.vnet.ibm.com>2014-07-20 22:16:25 -0500
commitc2d37222ae82ab1f9d528e19b2ca7103f66e3542 (patch)
tree82b9f061f7a41ac559d04130ec6750604716a14b
parente40585f8f1c522d1ca38601d0a4b5dbcfc8d9589 (diff)
downloadqemu-c2d37222ae82ab1f9d528e19b2ca7103f66e3542.zip
qemu-c2d37222ae82ab1f9d528e19b2ca7103f66e3542.tar.gz
qemu-c2d37222ae82ab1f9d528e19b2ca7103f66e3542.tar.bz2
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) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r--target-arm/helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 55077ed..420a66d 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -632,7 +632,7 @@ static void vbar_write(CPUARMState *env, const ARMCPRegInfo *ri,
* 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)