1199a1200
>
1201,1204c1202,1208
< isSecure = inSecureState(tc);
< isSecure &= (tranType & HypMode) == 0;
< isSecure &= (tranType & S1S2NsTran) == 0;
< aarch64 = !cpsr.width;
---
> isSecure = inSecureState(tc) &&
> !(tranType & HypMode) && !(tranType & S1S2NsTran);
>
> const OperatingMode op_mode = (OperatingMode) (uint8_t)cpsr.mode;
> aarch64 = opModeIs64(op_mode) ||
> (opModeToEL(op_mode) == EL0 && ELIs64(tc, EL1));
>