2c2
< * Copyright (c) 2010-2013 ARM Limited
---
> * Copyright (c) 2010-2014 ARM Limited
602,604c602,604
< cpsr.nz = tc->readIntReg(INTREG_CONDCODES_NZ);
< cpsr.c = tc->readIntReg(INTREG_CONDCODES_C);
< cpsr.v = tc->readIntReg(INTREG_CONDCODES_V);
---
> cpsr.nz = tc->readCCReg(CCREG_NZ);
> cpsr.c = tc->readCCReg(CCREG_C);
> cpsr.v = tc->readCCReg(CCREG_V);
1691,1693c1691,1693
< tc->setIntReg(INTREG_CONDCODES_NZ, cpsr.nz);
< tc->setIntReg(INTREG_CONDCODES_C, cpsr.c);
< tc->setIntReg(INTREG_CONDCODES_V, cpsr.v);
---
> tc->setCCReg(CCREG_NZ, cpsr.nz);
> tc->setCCReg(CCREG_C, cpsr.c);
> tc->setCCReg(CCREG_V, cpsr.v);