On 09/22/2017 11:00 AM, Peter Maydell wrote: > 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.mayd...@linaro.org> > --- > target/arm/cpu.h | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-)
Reviewed-by: Richard Henderson <richard.hender...@linaro.org> r~