989c989
< dest_reg->regIdx, RegClassStrings[dest_reg->regClass]);
---
> dest_reg->index(), dest_reg->className());
994,995c994,995
< dest_reg->regIdx,
< RegClassStrings[dest_reg->regClass]);
---
> dest_reg->index(),
> dest_reg->className());
999c999
< DynInstPtr dep_inst = dependGraph.pop(dest_reg->flatIdx);
---
> DynInstPtr dep_inst = dependGraph.pop(dest_reg->flatIndex());
1013c1013
< dep_inst = dependGraph.pop(dest_reg->flatIdx);
---
> dep_inst = dependGraph.pop(dest_reg->flatIndex());
1020,1021c1020,1021
< assert(dependGraph.empty(dest_reg->flatIdx));
< dependGraph.clearInst(dest_reg->flatIdx);
---
> assert(dependGraph.empty(dest_reg->flatIndex()));
> dependGraph.clearInst(dest_reg->flatIndex());
1024c1024
< regScoreboard[dest_reg->flatIdx] = true;
---
> regScoreboard[dest_reg->flatIndex()] = true;
1236c1236,1237
< dependGraph.remove(src_reg->flatIdx, squashed_inst);
---
> dependGraph.remove(src_reg->flatIndex(),
> squashed_inst);
1311c1312
< } else if (!regScoreboard[src_reg->flatIdx]) {
---
> } else if (!regScoreboard[src_reg->flatIndex()]) {
1314,1315c1315,1316
< new_inst->pcState(), src_reg->regIdx,
< RegClassStrings[src_reg->regClass]);
---
> new_inst->pcState(), src_reg->index(),
> src_reg->className());
1317c1318
< dependGraph.insert(src_reg->flatIdx, new_inst);
---
> dependGraph.insert(src_reg->flatIndex(), new_inst);
1325,1326c1326,1327
< new_inst->pcState(), src_reg->regIdx,
< RegClassStrings[src_reg->regClass]);
---
> new_inst->pcState(), src_reg->index(),
> src_reg->className());
1358c1359
< if (!dependGraph.empty(dest_reg->flatIdx)) {
---
> if (!dependGraph.empty(dest_reg->flatIndex())) {
1361,1362c1362,1363
< dest_reg->regIdx, RegClassStrings[dest_reg->regClass],
< dest_reg->flatIdx);
---
> dest_reg->index(), dest_reg->className(),
> dest_reg->flatIndex());
1365c1366
< dependGraph.setInst(dest_reg->flatIdx, new_inst);
---
> dependGraph.setInst(dest_reg->flatIndex(), new_inst);
1368c1369
< regScoreboard[dest_reg->flatIdx] = false;
---
> regScoreboard[dest_reg->flatIndex()] = false;