2c2
< * Copyright (c) 2010-2011 ARM Limited
---
> * Copyright (c) 2010-2011, 2014 ARM Limited
119,122c119,122
< cpsr.nz = tc->readIntReg(INTREG_CONDCODES_NZ);
< cpsr.c = tc->readIntReg(INTREG_CONDCODES_C);
< cpsr.v = tc->readIntReg(INTREG_CONDCODES_V);
< cpsr.ge = tc->readIntReg(INTREG_CONDCODES_GE);
---
> cpsr.nz = tc->readCCReg(CCREG_NZ);
> cpsr.c = tc->readCCReg(CCREG_C);
> cpsr.v = tc->readCCReg(CCREG_V);
> cpsr.ge = tc->readCCReg(CCREG_GE);
133c133
< tc->readIntReg(INTREG_FPCONDCODES);
---
> tc->readCCReg(CCREG_FP);