791,792d790
< for (int ireg = 0; ireg < TheISA::NumIntRegs; ireg++) {
< PhysRegIndex phys_reg = freeList.getIntReg();
794c792,795
< renameMap[tid].setEntry(ireg,phys_reg);
---
> for (RegId reg_id(IntRegClass, 0); reg_id.regIdx < TheISA::NumIntRegs;
> reg_id.regIdx++) {
> PhysRegIndex phys_reg = freeList.getIntReg();
> renameMap[tid].setEntry(reg_id, phys_reg);
799,800c800,801
< int max_reg = TheISA::FP_Reg_Base + TheISA::NumFloatRegs;
< for (int freg = TheISA::FP_Reg_Base; freg < max_reg; freg++) {
---
> for (RegId reg_id(FloatRegClass, 0); reg_id.regIdx < TheISA::NumFloatRegs;
> reg_id.regIdx++) {
802,803c803
<
< renameMap[tid].setEntry(freg,phys_reg);
---
> renameMap[tid].setEntry(reg_id, phys_reg);
808,810c808,809
< max_reg = TheISA::CC_Reg_Base + TheISA::NumCCRegs;
< for (int creg = TheISA::CC_Reg_Base;
< creg < max_reg; creg++) {
---
> for (RegId reg_id(CCRegClass, 0); reg_id.regIdx < TheISA::NumCCRegs;
> reg_id.regIdx++) {
812,813c811
<
< renameMap[tid].setEntry(creg,phys_reg);
---
> renameMap[tid].setEntry(reg_id, phys_reg);
848,849c846,848
< for (int ireg = 0; ireg < TheISA::NumIntRegs; ireg++) {
< PhysRegIndex phys_reg = renameMap[tid].lookup(ireg);
---
> for (RegId reg_id(IntRegClass, 0); reg_id.regIdx < TheISA::NumIntRegs;
> reg_id.regIdx++) {
> PhysRegIndex phys_reg = renameMap[tid].lookup(reg_id);
855,857c854,856
< int max_reg = TheISA::FP_Reg_Base + TheISA::NumFloatRegs;
< for (int freg = TheISA::FP_Reg_Base; freg < max_reg; freg++) {
< PhysRegIndex phys_reg = renameMap[tid].lookup(freg);
---
> for (RegId reg_id(FloatRegClass, 0); reg_id.regIdx < TheISA::NumFloatRegs;
> reg_id.regIdx++) {
> PhysRegIndex phys_reg = renameMap[tid].lookup(reg_id);
863,865c862,864
< max_reg = TheISA::CC_Reg_Base + TheISA::NumCCRegs;
< for (int creg = TheISA::CC_Reg_Base; creg < max_reg; creg++) {
< PhysRegIndex phys_reg = renameMap[tid].lookup(creg);
---
> for (RegId reg_id(CCRegClass, 0); reg_id.regIdx < TheISA::NumCCRegs;
> reg_id.regIdx++) {
> PhysRegIndex phys_reg = renameMap[tid].lookup(reg_id);