51c51
< Scoreboard::findIndex(RegId reg, Index &scoreboard_index)
---
> Scoreboard::findIndex(const RegId& reg, Index &scoreboard_index)
59c59
< switch (reg.regClass)
---
> switch (reg.classValue())
62c62
< scoreboard_index = reg.regIdx;
---
> scoreboard_index = reg.index();
67c67
< reg.regIdx;
---
> reg.index();
71c71
< scoreboard_index = TheISA::NumIntRegs + reg.regIdx;
---
> scoreboard_index = TheISA::NumIntRegs + reg.index();
86c86
< flattenRegIndex(RegId reg, ThreadContext *thread_context)
---
> flattenRegIndex(const RegId& reg, ThreadContext *thread_context)
88,105c88
< switch (reg.regClass)
< {
< case IntRegClass:
< reg.regIdx = thread_context->flattenIntIndex(reg.regIdx);
< break;
< case FloatRegClass:
< reg.regIdx = thread_context->flattenFloatIndex(reg.regIdx);
< break;
< case CCRegClass:
< reg.regIdx = thread_context->flattenCCIndex(reg.regIdx);
< break;
< case MiscRegClass:
< /* Don't bother to flatten misc regs as we don't need them here */
< /* return thread_context->flattenMiscIndex(reg); */
< break;
< }
<
< return reg;
---
> return thread_context->flattenRegId(reg);
146c129,130
< inst->flatDestRegIdx[dest_index] = RegId::zeroReg;
---
> inst->flatDestRegIdx[dest_index] = RegId(IntRegClass,
> TheISA::ZeroReg);
193c177
< RegId reg = inst->flatDestRegIdx[dest_index];
---
> const RegId& reg = inst->flatDestRegIdx[dest_index];