93c93,94
< cpsrWriteByInstr(cpsr | CondCodes, Spsr, 0xF, true, sctlr.nmfi);
---
> cpsrWriteByInstr(cpsr | CondCodesF | CondCodesQ | CondCodesGE,
> Spsr, 0xF, true, sctlr.nmfi);
95c96,98
< CondCodes = CondCodesMask & newCpsr;
---
> CondCodesF = CondCodesMaskF & newCpsr;
> CondCodesQ = CondCodesMaskQ & newCpsr;
> CondCodesGE = CondCodesMaskGE & newCpsr;
588c591
< CondCodes<29:>);
---
> CondCodesF<29:>);
604c607
< CondCodes<29:>);
---
> CondCodesF<29:>);
634c637,639
< CondCodes = CondCodesMask & newCpsr;
---
> CondCodesF = CondCodesMaskF & newCpsr;
> CondCodesQ = CondCodesMaskQ & newCpsr;
> CondCodesGE = CondCodesMaskGE & newCpsr;