On 23 January 2015 at 18:20, Peter Maydell <peter.mayd...@linaro.org> wrote: > +/* Determine the current mmu_idx to use for normal loads/stores */ > static inline int cpu_mmu_index (CPUARMState *env) > { > - return arm_current_el(env); > + int el = arm_current_el(env); > + > + if (el < 3 && arm_is_secure_below_el3(env)) { > + return ARMMMUIdx_S1SE0 + el; > + } > + return el; > }
Just noticed the stray extra space between function name and '(' here; will delete the space in v2, since we're rewriting the whole function body anyhow... -- PMM