138,139c138,139
< "%#x\n", phys_reg->regIdx, intRegFile[phys_reg->regIdx]);
< return intRegFile[phys_reg->regIdx];
---
> "%#x\n", phys_reg->index(), intRegFile[phys_reg->index()]);
> return intRegFile[phys_reg->index()];
148,149c148,149
< "data %#x\n", phys_reg->regIdx,
< floatRegFile[phys_reg->regIdx].q);
---
> "data %#x\n", phys_reg->index(),
> floatRegFile[phys_reg->index()].q);
151c151
< return floatRegFile[phys_reg->regIdx].d;
---
> return floatRegFile[phys_reg->index()].d;
158c158
< FloatRegBits floatRegBits = floatRegFile[phys_reg->regIdx].q;
---
> FloatRegBits floatRegBits = floatRegFile[phys_reg->index()].q;
161c161
< "has data %#x\n", phys_reg->regIdx,
---
> "has data %#x\n", phys_reg->index(),
173,174c173,174
< "data %#x\n", phys_reg->regIdx,
< ccRegFile[phys_reg->regIdx]);
---
> "data %#x\n", phys_reg->index(),
> ccRegFile[phys_reg->index()]);
176c176
< return ccRegFile[phys_reg->regIdx];
---
> return ccRegFile[phys_reg->index()];
185c185
< phys_reg->regIdx, val);
---
> phys_reg->index(), val);
188c188
< intRegFile[phys_reg->regIdx] = val;
---
> intRegFile[phys_reg->index()] = val;
197c197
< phys_reg->regIdx, (uint64_t)val);
---
> phys_reg->index(), (uint64_t)val);
200c200
< floatRegFile[phys_reg->regIdx].d = val;
---
> floatRegFile[phys_reg->index()].d = val;
208c208
< phys_reg->regIdx, (uint64_t)val);
---
> phys_reg->index(), (uint64_t)val);
210c210
< floatRegFile[phys_reg->regIdx].q = val;
---
> floatRegFile[phys_reg->index()].q = val;
219c219
< phys_reg->regIdx, (uint64_t)val);
---
> phys_reg->index(), (uint64_t)val);
221c221
< ccRegFile[phys_reg->regIdx] = val;
---
> ccRegFile[phys_reg->index()] = val;