63c63,66
< mrsCpsrCode = "Dest = (Cpsr | CondCodes) & 0xF8FF03DF"
---
> mrsCpsrCode = '''
> Dest = (Cpsr | CondCodesF | CondCodesQ | CondCodesGE) & 0xF8FF03DF
> '''
>
84c87,88
< cpsrWriteByInstr(Cpsr | CondCodes, Op1, byteMask, false, sctlr.nmfi);
---
> cpsrWriteByInstr(Cpsr | CondCodesF | CondCodesQ | CondCodesGE, Op1,
> byteMask, false, sctlr.nmfi);
86c90,92
< CondCodes = CondCodesMask & newCpsr;
---
> CondCodesF = CondCodesMaskF & newCpsr;
> CondCodesQ = CondCodesMaskQ & newCpsr;
> CondCodesGE = CondCodesMaskGE & newCpsr;
108c114,115
< cpsrWriteByInstr(Cpsr | CondCodes, imm, byteMask, false, sctlr.nmfi);
---
> cpsrWriteByInstr(Cpsr | CondCodesF | CondCodesQ | CondCodesGE, imm,
> byteMask, false, sctlr.nmfi);
110c117,119
< CondCodes = CondCodesMask & newCpsr;
---
> CondCodesF = CondCodesMaskF & newCpsr;
> CondCodesQ = CondCodesMaskQ & newCpsr;
> CondCodesGE = CondCodesMaskGE & newCpsr;
199c208
< CondCodes = CondCodes | (1 << 27);
---
> CondCodesQ = CondCodesQ | (1 << 27);
201c210
< CondCodes = CondCodes;
---
> CondCodesQ = CondCodesQ;
215c224
< CondCodes = CondCodes | (1 << 27);
---
> CondCodesQ = CondCodesQ | (1 << 27);
217c226
< CondCodes = CondCodes;
---
> CondCodesQ = CondCodesQ;
230c239
< CondCodes = CondCodes;
---
> CondCodesQ = CondCodesQ;
234c243
< CondCodes = CondCodes | (1 << 27);
---
> CondCodesQ = CondCodesQ | (1 << 27);
237c246
< CondCodes = CondCodes | (1 << 27);
---
> CondCodesQ = CondCodesQ | (1 << 27);
251c260
< CondCodes = CondCodes;
---
> CondCodesQ = CondCodesQ;
255c264
< CondCodes = CondCodes | (1 << 27);
---
> CondCodesQ = CondCodesQ | (1 << 27);
258c267
< CondCodes = CondCodes | (1 << 27);
---
> CondCodesQ = CondCodesQ | (1 << 27);
417c426
< bits(CondCodes, 16 + i) ?
---
> bits(CondCodesGE, 16 + i) ?