108c108
< void printReg(std::ostream &os, int reg) const;
---
> void printReg(std::ostream &os, RegId reg) const;
113c113
< const RegIndex indexArray[], int num) const;
---
> const RegId indexArray[], int num) const;
254c254
< const RegIndex indexArray[], int num) const
---
> const RegId indexArray[], int num) const
286c286
< SparcStaticInst::printReg(std::ostream &os, int reg) const
---
> SparcStaticInst::printReg(std::ostream &os, RegId reg) const
293c293,294
< if (reg < FP_Reg_Base) {
---
> RegIndex reg_idx = reg.regIdx;
> if (reg.regClass == IntRegClass) {
296,298c297,299
< while (reg >= MaxMicroReg)
< reg -= MaxMicroReg;
< if (reg == FramePointerReg)
---
> while (reg_idx >= MaxMicroReg)
> reg_idx -= MaxMicroReg;
> if (reg_idx == FramePointerReg)
300c301
< else if (reg == StackPointerReg)
---
> else if (reg_idx == StackPointerReg)
302,311c303,312
< else if (reg < MaxGlobal)
< ccprintf(os, "%%g%d", reg);
< else if (reg < MaxOutput)
< ccprintf(os, "%%o%d", reg - MaxGlobal);
< else if (reg < MaxLocal)
< ccprintf(os, "%%l%d", reg - MaxOutput);
< else if (reg < MaxInput)
< ccprintf(os, "%%i%d", reg - MaxLocal);
< else if (reg < MaxMicroReg)
< ccprintf(os, "%%u%d", reg - MaxInput);
---
> else if (reg_idx < MaxGlobal)
> ccprintf(os, "%%g%d", reg_idx);
> else if (reg_idx < MaxOutput)
> ccprintf(os, "%%o%d", reg_idx - MaxGlobal);
> else if (reg_idx < MaxLocal)
> ccprintf(os, "%%l%d", reg_idx - MaxOutput);
> else if (reg_idx < MaxInput)
> ccprintf(os, "%%i%d", reg_idx - MaxLocal);
> else if (reg_idx < MaxMicroReg)
> ccprintf(os, "%%u%d", reg_idx - MaxInput);
314c315
< switch (reg - MaxMicroReg) {
---
> switch (reg_idx - MaxMicroReg) {
338,339c339,340
< } else if (reg < Misc_Reg_Base) {
< ccprintf(os, "%%f%d", reg - FP_Reg_Base);
---
> } else if (reg.regClass == FloatRegClass) {
> ccprintf(os, "%%f%d", reg_idx);
341c342
< switch (reg - Misc_Reg_Base) {
---
> switch (reg_idx) {
433c434
< ccprintf(os, "%%ctrl%d", reg - Misc_Reg_Base);
---
> ccprintf(os, "%%ctrl%d", reg_idx);