2c2
< * Copyright (c) 2010, 2012-2013 ARM Limited
---
> * Copyright (c) 2010, 2012-2014 ARM Limited
469,472c469,472
< saved_cpsr.nz = tc->readIntReg(INTREG_CONDCODES_NZ);
< saved_cpsr.c = tc->readIntReg(INTREG_CONDCODES_C);
< saved_cpsr.v = tc->readIntReg(INTREG_CONDCODES_V);
< saved_cpsr.ge = tc->readIntReg(INTREG_CONDCODES_GE);
---
> saved_cpsr.nz = tc->readCCReg(CCREG_NZ);
> saved_cpsr.c = tc->readCCReg(CCREG_C);
> saved_cpsr.v = tc->readCCReg(CCREG_V);
> saved_cpsr.ge = tc->readCCReg(CCREG_GE);
618,620c618,620
< spsr.nz = tc->readIntReg(INTREG_CONDCODES_NZ);
< spsr.c = tc->readIntReg(INTREG_CONDCODES_C);
< spsr.v = tc->readIntReg(INTREG_CONDCODES_V);
---
> spsr.nz = tc->readCCReg(CCREG_NZ);
> spsr.c = tc->readCCReg(CCREG_C);
> spsr.v = tc->readCCReg(CCREG_V);
631c631
< spsr.ge = tc->readIntReg(INTREG_CONDCODES_GE);
---
> spsr.ge = tc->readCCReg(CCREG_GE);