Commit 5661ae6b authored by Peter Maydell's avatar Peter Maydell
Browse files

target-arm: Add ULL suffix to calculation of page size 



The maximum block size for AArch64 address translation is 2GB. This means
that we need a ULL suffix on our shift to avoid shifting into the sign
bit of a signed 32 bit integer.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarPeter Crosthwaite <peter.crosthwaite@xilinx.com>
Message-id: 1402171881-14343-2-git-send-email-peter.maydell@linaro.org
parent 0062609f

target-arm/helper.c

+1 −1
Original line number Diff line number Diff line
@@ -3952,7 +3952,7 @@ static int get_phys_addr_lpae(CPUARMState *env, target_ulong address, 
         * These are basically the same thing, although the number

         * of bits we pull in from the vaddr varies.

         */

        page_size = (1 << ((granule_sz * (4 - level)) + 3));

        page_size = (1ULL << ((granule_sz * (4 - level)) + 3));

        descaddr |= (address & (page_size - 1));

        /* Extract attributes from the descriptor and merge with table attrs */

        attrs = extract64(descriptor, 2, 10)