305c305,306
< MiscReg CCR = tc->readMiscReg(MISCREG_CCR);
---
> //MiscReg CCR = tc->readMiscReg(MISCREG_CCR);
> MiscReg CCR = tc->readIntReg(NumIntArchRegs + 2);
308c309,310
< MiscReg CANSAVE = tc->readMiscReg(MISCREG_CANSAVE);
---
> //MiscReg CANSAVE = tc->readMiscReg(MISCREG_CANSAVE);
> MiscReg CANSAVE = tc->readMiscReg(NumIntArchRegs + 3);
399c401,402
< MiscReg CCR = tc->readMiscReg(MISCREG_CCR);
---
> //MiscReg CCR = tc->readMiscReg(MISCREG_CCR);
> MiscReg CCR = tc->readIntReg(NumIntArchRegs + 2);
402c405,406
< MiscReg CANSAVE = tc->readMiscReg(MISCREG_CANSAVE);
---
> //MiscReg CANSAVE = tc->readMiscReg(MISCREG_CANSAVE);
> MiscReg CANSAVE = tc->readIntReg(NumIntArchRegs + 3);