79c79
< PhysRegIdPtr prev_reg = map[arch_reg.index()];
---
> PhysRegIdPtr prev_reg = map[arch_reg.flatIndex()];
86c86
< map[arch_reg.index()] = renamed_reg;
---
> map[arch_reg.flatIndex()] = renamed_reg;
95,96c95,96
< arch_reg, renamed_reg->index(), renamed_reg->flatIndex(),
< prev_reg->index(), prev_reg->flatIndex());
---
> arch_reg, renamed_reg->flatIndex(), renamed_reg->flatIndex(),
> prev_reg->flatIndex(), prev_reg->flatIndex());