116c116
< TheISA::PCState newPC = tc->pcState();
---
> PCState newPC = tc->pcState();
130c130
< for (int i = 0; i < TheISA::NumIntRegs; i++)
---
> for (int i = 0; i < NumIntRegs; i++)
133c133
< for (int i = 0; i < TheISA::NumFloatRegs; i++)
---
> for (int i = 0; i < NumFloatRegs; i++)
136c136,139
< for (int i = 0; i < TheISA::NumMiscRegs; i++)
---
> // Would need to add condition-code regs if implemented
> assert(NumCCRegs == 0);
>
> for (int i = 0; i < NumMiscRegs; i++)