Commit e737ed2a authored by Richard Henderson's avatar Richard Henderson Committed by Peter Maydell
Browse files

target/arm: Add aa64_va_parameters_both 



We will want to check TBI for I and D simultaneously.

Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Message-id: 20190108223129.5570-22-richard.henderson@linaro.org
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent bf0be433

target/arm/helper.c

+8 −2
Original line number Diff line number Diff line
@@ -9744,8 +9744,8 @@ static uint8_t convert_stage2_attrs(CPUARMState *env, uint8_t s2attrs) 
    return (hiattr << 6) | (hihint << 4) | (loattr << 2) | lohint;

}



ARMVAParameters aa64_va_parameters(CPUARMState *env, uint64_t va,

                                   ARMMMUIdx mmu_idx, bool data)

ARMVAParameters aa64_va_parameters_both(CPUARMState *env, uint64_t va,

                                        ARMMMUIdx mmu_idx)

{

    uint64_t tcr = regime_tcr(env, mmu_idx)->raw_tcr;

    uint32_t el = regime_el(env, mmu_idx);
@@ -9800,6 +9800,12 @@ ARMVAParameters aa64_va_parameters(CPUARMState *env, uint64_t va, 
    };

}



ARMVAParameters aa64_va_parameters(CPUARMState *env, uint64_t va,

                                   ARMMMUIdx mmu_idx, bool data)

{

    return aa64_va_parameters_both(env, va, mmu_idx);

}



static ARMVAParameters aa32_va_parameters(CPUARMState *env, uint32_t va,

                                          ARMMMUIdx mmu_idx)

{

target/arm/internals.h

+12 −3
Original line number Diff line number Diff line
@@ -957,9 +957,9 @@ typedef struct ARMVAParameters { 
} ARMVAParameters;



#ifdef CONFIG_USER_ONLY

static inline ARMVAParameters aa64_va_parameters(CPUARMState *env,

static inline ARMVAParameters aa64_va_parameters_both(CPUARMState *env,

                                                      uint64_t va,

                                                 ARMMMUIdx mmu_idx, bool data)

                                                      ARMMMUIdx mmu_idx)

{

    return (ARMVAParameters) {

        /* 48-bit address space */
@@ -968,7 +968,16 @@ static inline ARMVAParameters aa64_va_parameters(CPUARMState *env, 
        .tbi = false,

    };

}



static inline ARMVAParameters aa64_va_parameters(CPUARMState *env,

                                                 uint64_t va,

                                                 ARMMMUIdx mmu_idx, bool data)

{

    return aa64_va_parameters_both(env, va, mmu_idx);

}

#else

ARMVAParameters aa64_va_parameters_both(CPUARMState *env, uint64_t va,

                                        ARMMMUIdx mmu_idx);

ARMVAParameters aa64_va_parameters(CPUARMState *env, uint64_t va,

                                   ARMMMUIdx mmu_idx, bool data);

#endif