955,956c955,962
< MiscRegIndex sctlr_idx = (haveSecurity && !scr.ns)
< ? MISCREG_SCTLR_S : MISCREG_SCTLR_NS;
---
>
> MiscRegIndex sctlr_idx;
> if (haveSecurity && !highestELIs64 && !scr.ns) {
> sctlr_idx = MISCREG_SCTLR_S;
> } else {
> sctlr_idx = MISCREG_SCTLR_NS;
> }
>