Commit 61fcd69b authored by Peter Maydell's avatar Peter Maydell
Browse files

target/arm: Move regime_is_secure() to target/arm/internals.h 



Move the regime_is_secure() utility function to internals.h;
we are going to want to call it from translate.c.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-id: 1503414539-28762-20-git-send-email-peter.maydell@linaro.org
parent 334e8dad

target/arm/helper.c

+0 −26
Original line number Diff line number Diff line
@@ -7055,32 +7055,6 @@ static inline uint32_t regime_el(CPUARMState *env, ARMMMUIdx mmu_idx) 
    }

}



/* Return true if this address translation regime is secure */

static inline bool regime_is_secure(CPUARMState *env, ARMMMUIdx mmu_idx)

{

    switch (mmu_idx) {

    case ARMMMUIdx_S12NSE0:

    case ARMMMUIdx_S12NSE1:

    case ARMMMUIdx_S1NSE0:

    case ARMMMUIdx_S1NSE1:

    case ARMMMUIdx_S1E2:

    case ARMMMUIdx_S2NS:

    case ARMMMUIdx_MPriv:

    case ARMMMUIdx_MNegPri:

    case ARMMMUIdx_MUser:

        return false;

    case ARMMMUIdx_S1E3:

    case ARMMMUIdx_S1SE0:

    case ARMMMUIdx_S1SE1:

    case ARMMMUIdx_MSPriv:

    case ARMMMUIdx_MSNegPri:

    case ARMMMUIdx_MSUser:

        return true;

    default:

        g_assert_not_reached();

    }

}



/* Return the SCTLR value which controls this address translation regime */

static inline uint32_t regime_sctlr(CPUARMState *env, ARMMMUIdx mmu_idx)

{

target/arm/internals.h

+26 −0
Original line number Diff line number Diff line
@@ -480,4 +480,30 @@ static inline void arm_call_el_change_hook(ARMCPU *cpu) 
    }

}



/* Return true if this address translation regime is secure */

static inline bool regime_is_secure(CPUARMState *env, ARMMMUIdx mmu_idx)

{

    switch (mmu_idx) {

    case ARMMMUIdx_S12NSE0:

    case ARMMMUIdx_S12NSE1:

    case ARMMMUIdx_S1NSE0:

    case ARMMMUIdx_S1NSE1:

    case ARMMMUIdx_S1E2:

    case ARMMMUIdx_S2NS:

    case ARMMMUIdx_MPriv:

    case ARMMMUIdx_MNegPri:

    case ARMMMUIdx_MUser:

        return false;

    case ARMMMUIdx_S1E3:

    case ARMMMUIdx_S1SE0:

    case ARMMMUIdx_S1SE1:

    case ARMMMUIdx_MSPriv:

    case ARMMMUIdx_MSNegPri:

    case ARMMMUIdx_MSUser:

        return true;

    default:

        g_assert_not_reached();

    }

}



#endif