target/arm: Fix calculation of secure mm_idx values
In cpu_mmu_index() we try to do this: if (env->v7m.secure) { mmu_idx += ARMMMUIdx_MSUser; } but it will give the wrong answer, because ARMMMUIdx_MSUser includes the 0x40 ARM_MMU_IDX_M field, and so does the mmu_idx we're adding to, and we'll end up with 0x8n rather than 0x4n. This error is then nullified by the call to arm_to_core_mmu_idx() which masks out the high part, but we're about to factor out the code that calculates the ARMMMUIdx values so it can be used without passing it through arm_to_core_mmu_idx(), so fix this bug first. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 1506092407-26985-16-git-send-email-peter.maydell@linaro.org
This commit is contained in:
parent
35337cc391
commit
fe768788d2
|
@ -2335,14 +2335,16 @@ static inline int cpu_mmu_index(CPUARMState *env, bool ifetch)
|
|||
int el = arm_current_el(env);
|
||||
|
||||
if (arm_feature(env, ARM_FEATURE_M)) {
|
||||
ARMMMUIdx mmu_idx = el == 0 ? ARMMMUIdx_MUser : ARMMMUIdx_MPriv;
|
||||
ARMMMUIdx mmu_idx;
|
||||
|
||||
if (armv7m_nvic_neg_prio_requested(env->nvic, env->v7m.secure)) {
|
||||
mmu_idx = ARMMMUIdx_MNegPri;
|
||||
if (el == 0) {
|
||||
mmu_idx = env->v7m.secure ? ARMMMUIdx_MSUser : ARMMMUIdx_MUser;
|
||||
} else {
|
||||
mmu_idx = env->v7m.secure ? ARMMMUIdx_MSPriv : ARMMMUIdx_MPriv;
|
||||
}
|
||||
|
||||
if (env->v7m.secure) {
|
||||
mmu_idx += ARMMMUIdx_MSUser;
|
||||
if (armv7m_nvic_neg_prio_requested(env->nvic, env->v7m.secure)) {
|
||||
mmu_idx = env->v7m.secure ? ARMMMUIdx_MSNegPri : ARMMMUIdx_MNegPri;
|
||||
}
|
||||
|
||||
return arm_to_core_mmu_idx(mmu_idx);
|
||||
|
|
Loading…
Reference in a new issue