Richard Henderson <richard.hender...@linaro.org> writes:
> This is part of a reorganization to the set of mmu_idx. > The EL1&0 regime is the only one that uses 2-stage translation. > Spelling out Stage avoids confusion with Secure. > > Signed-off-by: Richard Henderson <richard.hender...@linaro.org> <snip> > diff --git a/target/arm/helper.c b/target/arm/helper.c > index 97677f8482..a34accec20 100644 > --- a/target/arm/helper.c > +++ b/target/arm/helper.c > @@ -2992,7 +2992,8 @@ static uint64_t do_ats_write(CPUARMState *env, uint64_t > value, > bool take_exc = false; > > if (fi.s1ptw && current_el == 1 && !arm_is_secure(env) > - && (mmu_idx == ARMMMUIdx_S1NSE1 || mmu_idx == ARMMMUIdx_S1NSE0)) > { > + && (mmu_idx == ARMMMUIdx_Stage1_E1 > + || mmu_idx == ARMMMUIdx_Stage1_E0)) { Personal nit: I think ||\nfoo == scans more nicely as it lines up but maybe that's just me. Reviewed-by: Alex Bennée <alex.ben...@linaro.org> -- Alex Bennée