Commit 74f1c6dd authored by Sergey Fedorov's avatar Sergey Fedorov Committed by Peter Maydell
Browse files

target-arm: fix TTBCR write masking 



Current implementation is not accurate according to ARMv7-AR reference
manual. See "B4.1.153 TTBCR, Translation Table Base Control Register,
VMSA | TTBCR format when using the Long-descriptor translation table
format". When LPAE feature is supported, EAE, bit[31] selects
translation descriptor format and, therefore, TTBCR format.

Signed-off-by: default avatarSergey Fedorov <s.fedorov@samsung.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Message-id: 1386657709-23399-1-git-send-email-s.fedorov@samsung.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 09f78135

target-arm/helper.c

+1 −1
Original line number Diff line number Diff line
@@ -1173,7 +1173,7 @@ static int vmsa_ttbcr_raw_write(CPUARMState *env, const ARMCPRegInfo *ri, 
{

    int maskshift = extract32(value, 0, 3);



    if (arm_feature(env, ARM_FEATURE_LPAE)) {

    if (arm_feature(env, ARM_FEATURE_LPAE) && (value & (1 << 31))) {

        value &= ~((7 << 19) | (3 << 14) | (0xf << 3));

    } else {

        value &= 7;