144,145c144
< newVal = thread->readIntReg(SparcISA::NumIntArchRegs + 2);
< //newVal = thread->readMiscReg(SparcISA::MISCREG_CCR);
---
> newVal = thread->readMiscReg(SparcISA::MISCREG_CCR);
151,152c150
< newVal = thread->readIntReg(SparcISA::NumIntArchRegs + 1);
< //newVal = thread->readMiscReg(SparcISA::MISCREG_Y);
---
> newVal = thread->readMiscReg(SparcISA::MISCREG_Y);
289a288
> bool diffCC = false;
321a321,325
>
> if (shared_data->cycle_count !=
> thread->getCpuPtr()->instCount())
> diffCC = true;
>
368,370c372
< //if(shared_data->y != thread->readMiscReg(MISCREG_Y))
< if(shared_data->y !=
< thread->readIntReg(NumIntArchRegs + 1))
---
> if(shared_data->y != thread->readMiscReg(MISCREG_Y))
372,374c374
< //if(shared_data->ccr != thread->readMiscReg(MISCREG_CCR))
< if(shared_data->ccr !=
< thread->readIntReg(NumIntArchRegs + 2))
---
> if(shared_data->ccr != thread->readMiscReg(MISCREG_CCR))
384,386c384
< //if(shared_data->cansave != thread->readMiscReg(MISCREG_CANSAVE))
< if(shared_data->cansave !=
< thread->readIntReg(NumIntArchRegs + 3))
---
> if(shared_data->cansave != thread->readMiscReg(MISCREG_CANSAVE))
388,389d385
< //if(shared_data->canrestore !=
< // thread->readMiscReg(MISCREG_CANRESTORE))
391c387
< thread->readMiscReg(NumIntArchRegs + 4))
---
> thread->readMiscReg(MISCREG_CANRESTORE))
393,395c389
< //if(shared_data->otherwin != thread->readMiscReg(MISCREG_OTHERWIN))
< if(shared_data->otherwin !=
< thread->readIntReg(NumIntArchRegs + 5))
---
> if(shared_data->otherwin != thread->readMiscReg(MISCREG_OTHERWIN))
397,399c391
< //if(shared_data->cleanwin != thread->readMiscReg(MISCREG_CLEANWIN))
< if(shared_data->cleanwin !=
< thread->readMiscReg(NumIntArchRegs + 6))
---
> if(shared_data->cleanwin != thread->readMiscReg(MISCREG_CLEANWIN))
402,403c394,395
< if (diffPC || diffInst || diffRegs || diffTpc || diffTnpc ||
< diffTstate || diffTt || diffHpstate ||
---
> if (diffPC || diffCC || diffInst || diffRegs || diffTpc ||
> diffTnpc || diffTstate || diffTt || diffHpstate ||
410a403,404
> if (diffCC)
> outs << " [CC]";
461a456,458
> outs << right << setfill(' ') << setw(15)
> << "M5 CC: " << "0x"<< setw(16) << setfill('0')
> << hex << thread->getCpuPtr()->instCount() << endl;
462a460,463
> << "Legion CC: " << "0x"<< setw(16) << setfill('0') << hex
> << shared_data->cycle_count << endl << endl;
>
> outs << setfill(' ') << setw(15)
490,491c491
< //thread->readMiscReg(MISCREG_Y),
< thread->readMiscReg(NumIntArchRegs + 1),
---
> thread->readMiscReg(MISCREG_Y),
494,495c494
< //thread->readMiscReg(MISCREG_CCR),
< thread->readMiscReg(NumIntArchRegs + 2),
---
> thread->readMiscReg(MISCREG_CCR),
513,514c512
< //thread->readMiscReg(MISCREG_CANSAVE),
< thread->readIntReg(NumIntArchRegs + 3),
---
> thread->readMiscReg(MISCREG_CANSAVE),
517,518c515
< //thread->readMiscReg(MISCREG_CANRESTORE),
< thread->readIntReg(NumIntArchRegs + 4),
---
> thread->readMiscReg(MISCREG_CANRESTORE),
521,522c518
< //thread->readMiscReg(MISCREG_OTHERWIN),
< thread->readIntReg(NumIntArchRegs + 5),
---
> thread->readMiscReg(MISCREG_OTHERWIN),
525,526c521
< //thread->readMiscReg(MISCREG_CLEANWIN),
< thread->readIntReg(NumIntArchRegs + 6),
---
> thread->readMiscReg(MISCREG_CLEANWIN),