3c3
< // Copyright (c) 2010-2013 ARM Limited
---
> // Copyright (c) 2010-2014 ARM Limited
57a58,69
> microLdr2UopCode = '''
> uint64_t data = Mem_ud;
> Dest = cSwap((uint32_t) data, ((CPSR)Cpsr).e);
> Dest2 = cSwap((uint32_t) (data >> 32), ((CPSR)Cpsr).e);
> '''
> microLdr2UopIop = InstObjParams('ldr2_uop', 'MicroLdr2Uop',
> 'MicroMemPairOp',
> {'memacc_code': microLdr2UopCode,
> 'ea_code': 'EA = URb + (up ? imm : -imm);',
> 'predicate_test': predicateTest},
> ['IsMicroop'])
>
162,163c174,175
< loadIops = (microLdrUopIop, microLdrRetUopIop, microLdrFpUopIop,
< microLdrDBFpUopIop, microLdrDTFpUopIop)
---
> loadIops = (microLdrUopIop, microLdrRetUopIop,
> microLdrFpUopIop, microLdrDBFpUopIop, microLdrDTFpUopIop)
176a189,194
>
> header_output += MicroMemPairDeclare.subst(microLdr2UopIop)
> decoder_output += MicroMemPairConstructor.subst(microLdr2UopIop)
> exec_output += LoadExecute.subst(microLdr2UopIop) + \
> LoadInitiateAcc.subst(microLdr2UopIop) + \
> LoadCompleteAcc.subst(microLdr2UopIop)