793,794c793,794
< int max_reg = TheISA::NumIntRegs + TheISA::NumFloatRegs;
< for (int freg = TheISA::NumIntRegs; freg < max_reg; freg++) {
---
> int max_reg = TheISA::FP_Reg_Base + TheISA::NumFloatRegs;
> for (int freg = TheISA::FP_Reg_Base; freg < max_reg; freg++) {
802,803c802,803
< max_reg = TheISA::NumIntRegs + TheISA::NumFloatRegs + TheISA::NumCCRegs;
< for (int creg = TheISA::NumIntRegs + TheISA::NumFloatRegs;
---
> max_reg = TheISA::CC_Reg_Base + TheISA::NumCCRegs;
> for (int creg = TheISA::CC_Reg_Base;