107c107
< UnifiedRenameMap::rename(RegIndex arch_reg)
---
> UnifiedRenameMap::rename(RegId arch_reg)
109,111c109
< RegIndex rel_arch_reg;
<
< switch (regIdxToClass(arch_reg, &rel_arch_reg)) {
---
> switch (arch_reg.regClass) {
113c111
< return renameInt(rel_arch_reg);
---
> return renameInt(arch_reg.regIdx);
116c114
< return renameFloat(rel_arch_reg);
---
> return renameFloat(arch_reg.regIdx);
119c117
< return renameCC(rel_arch_reg);
---
> return renameCC(arch_reg.regIdx);
122c120
< return renameMisc(rel_arch_reg);
---
> return renameMisc(arch_reg.regIdx);
126c124
< RegClassStrings[regIdxToClass(arch_reg)]);
---
> RegClassStrings[arch_reg.regClass]);
132c130
< UnifiedRenameMap::lookup(RegIndex arch_reg) const
---
> UnifiedRenameMap::lookup(RegId arch_reg) const
134,136c132
< RegIndex rel_arch_reg;
<
< switch (regIdxToClass(arch_reg, &rel_arch_reg)) {
---
> switch (arch_reg.regClass) {
138c134
< return lookupInt(rel_arch_reg);
---
> return lookupInt(arch_reg.regIdx);
141c137
< return lookupFloat(rel_arch_reg);
---
> return lookupFloat(arch_reg.regIdx);
144c140
< return lookupCC(rel_arch_reg);
---
> return lookupCC(arch_reg.regIdx);
147c143
< return lookupMisc(rel_arch_reg);
---
> return lookupMisc(arch_reg.regIdx);
151c147
< RegClassStrings[regIdxToClass(arch_reg)]);
---
> RegClassStrings[arch_reg.regClass]);
156c152
< UnifiedRenameMap::setEntry(RegIndex arch_reg, PhysRegIndex phys_reg)
---
> UnifiedRenameMap::setEntry(RegId arch_reg, PhysRegIndex phys_reg)
158,160c154
< RegIndex rel_arch_reg;
<
< switch (regIdxToClass(arch_reg, &rel_arch_reg)) {
---
> switch (arch_reg.regClass) {
162c156
< return setIntEntry(rel_arch_reg, phys_reg);
---
> return setIntEntry(arch_reg.regIdx, phys_reg);
165c159
< return setFloatEntry(rel_arch_reg, phys_reg);
---
> return setFloatEntry(arch_reg.regIdx, phys_reg);
168c162
< return setCCEntry(rel_arch_reg, phys_reg);
---
> return setCCEntry(arch_reg.regIdx, phys_reg);
175c169
< assert(phys_reg == lookupMisc(rel_arch_reg));
---
> assert(phys_reg == lookupMisc(arch_reg.regIdx));
180c174
< RegClassStrings[regIdxToClass(arch_reg)]);
---
> RegClassStrings[arch_reg.regClass]);