96c96,97
< accCode = "Mem%s = Dest;\n" % buildMemSuffix(sign, size)
---
> accCode = "Mem%(suffix)s = cSwap(Dest%(suffix)s, ((CPSR)Cpsr).e);" % \
> { "suffix" : buildMemSuffix(sign, size) }
124c125,126
< accCode = "Mem%s = Dest;\n" % buildMemSuffix(sign, size)
---
> accCode = "Mem%(suffix)s = cSwap(Dest%(suffix)s, ((CPSR)Cpsr).e);" % \
> { "suffix" : buildMemSuffix(sign, size) }
149c151,155
< accCode = 'Mem.ud = (Dest.ud & mask(32)) | (Dest2.ud << 32);'
---
> accCode = '''
> CPSR cpsr = Cpsr;
> Mem.ud = (uint64_t)cSwap(Dest.uw, cpsr.e) |
> ((uint64_t)cSwap(Dest2.uw, cpsr.e) << 32);
> '''
174c180,184
< accCode = 'Mem.ud = (Dest.ud & mask(32)) | (Dest2.ud << 32);'
---
> accCode = '''
> CPSR cpsr = Cpsr;
> Mem.ud = (uint64_t)cSwap(Dest.uw, cpsr.e) |
> ((uint64_t)cSwap(Dest2.uw, cpsr.e) << 32);
> '''