183,184c183
< regFile.totalNumPhysRegs(), TheISA::NumMiscRegs,
< TheISA::ZeroReg, TheISA::ZeroReg),
---
> regFile.totalNumPhysRegs()),
303c302
< PhysRegIndex phys_reg = freeList.getIntReg();
---
> PhysRegIdPtr phys_reg = freeList.getIntReg();
309c308
< PhysRegIndex phys_reg = freeList.getFloatReg();
---
> PhysRegIdPtr phys_reg = freeList.getFloatReg();
315c314
< PhysRegIndex phys_reg = freeList.getCCReg();
---
> PhysRegIdPtr phys_reg = freeList.getCCReg();
794c793
< PhysRegIndex phys_reg = freeList.getIntReg();
---
> PhysRegIdPtr phys_reg = freeList.getIntReg();
802c801
< PhysRegIndex phys_reg = freeList.getFloatReg();
---
> PhysRegIdPtr phys_reg = freeList.getFloatReg();
810c809
< PhysRegIndex phys_reg = freeList.getCCReg();
---
> PhysRegIdPtr phys_reg = freeList.getCCReg();
848c847
< PhysRegIndex phys_reg = renameMap[tid].lookup(reg_id);
---
> PhysRegIdPtr phys_reg = renameMap[tid].lookup(reg_id);
856c855
< PhysRegIndex phys_reg = renameMap[tid].lookup(reg_id);
---
> PhysRegIdPtr phys_reg = renameMap[tid].lookup(reg_id);
864c863
< PhysRegIndex phys_reg = renameMap[tid].lookup(reg_id);
---
> PhysRegIdPtr phys_reg = renameMap[tid].lookup(reg_id);
1237c1236
< FullO3CPU<Impl>::readIntReg(int reg_idx)
---
> FullO3CPU<Impl>::readIntReg(PhysRegIdPtr phys_reg)
1240c1239
< return regFile.readIntReg(reg_idx);
---
> return regFile.readIntReg(phys_reg);
1245c1244
< FullO3CPU<Impl>::readFloatReg(int reg_idx)
---
> FullO3CPU<Impl>::readFloatReg(PhysRegIdPtr phys_reg)
1248c1247
< return regFile.readFloatReg(reg_idx);
---
> return regFile.readFloatReg(phys_reg);
1253c1252
< FullO3CPU<Impl>::readFloatRegBits(int reg_idx)
---
> FullO3CPU<Impl>::readFloatRegBits(PhysRegIdPtr phys_reg)
1256c1255
< return regFile.readFloatRegBits(reg_idx);
---
> return regFile.readFloatRegBits(phys_reg);
1261c1260
< FullO3CPU<Impl>::readCCReg(int reg_idx)
---
> FullO3CPU<Impl>::readCCReg(PhysRegIdPtr phys_reg)
1264c1263
< return regFile.readCCReg(reg_idx);
---
> return regFile.readCCReg(phys_reg);
1269c1268
< FullO3CPU<Impl>::setIntReg(int reg_idx, uint64_t val)
---
> FullO3CPU<Impl>::setIntReg(PhysRegIdPtr phys_reg, uint64_t val)
1272c1271
< regFile.setIntReg(reg_idx, val);
---
> regFile.setIntReg(phys_reg, val);
1277c1276
< FullO3CPU<Impl>::setFloatReg(int reg_idx, FloatReg val)
---
> FullO3CPU<Impl>::setFloatReg(PhysRegIdPtr phys_reg, FloatReg val)
1280c1279
< regFile.setFloatReg(reg_idx, val);
---
> regFile.setFloatReg(phys_reg, val);
1285c1284
< FullO3CPU<Impl>::setFloatRegBits(int reg_idx, FloatRegBits val)
---
> FullO3CPU<Impl>::setFloatRegBits(PhysRegIdPtr phys_reg, FloatRegBits val)
1288c1287
< regFile.setFloatRegBits(reg_idx, val);
---
> regFile.setFloatRegBits(phys_reg, val);
1293c1292
< FullO3CPU<Impl>::setCCReg(int reg_idx, CCReg val)
---
> FullO3CPU<Impl>::setCCReg(PhysRegIdPtr phys_reg, CCReg val)
1296c1295
< regFile.setCCReg(reg_idx, val);
---
> regFile.setCCReg(phys_reg, val);
1304c1303
< PhysRegIndex phys_reg = commitRenameMap[tid].lookupInt(reg_idx);
---
> PhysRegIdPtr phys_reg = commitRenameMap[tid].lookupInt(reg_idx);
1314c1313
< PhysRegIndex phys_reg = commitRenameMap[tid].lookupFloat(reg_idx);
---
> PhysRegIdPtr phys_reg = commitRenameMap[tid].lookupFloat(reg_idx);
1324c1323
< PhysRegIndex phys_reg = commitRenameMap[tid].lookupFloat(reg_idx);
---
> PhysRegIdPtr phys_reg = commitRenameMap[tid].lookupFloat(reg_idx);
1334c1333
< PhysRegIndex phys_reg = commitRenameMap[tid].lookupCC(reg_idx);
---
> PhysRegIdPtr phys_reg = commitRenameMap[tid].lookupCC(reg_idx);
1344c1343
< PhysRegIndex phys_reg = commitRenameMap[tid].lookupInt(reg_idx);
---
> PhysRegIdPtr phys_reg = commitRenameMap[tid].lookupInt(reg_idx);
1354c1353
< PhysRegIndex phys_reg = commitRenameMap[tid].lookupFloat(reg_idx);
---
> PhysRegIdPtr phys_reg = commitRenameMap[tid].lookupFloat(reg_idx);
1364c1363
< PhysRegIndex phys_reg = commitRenameMap[tid].lookupFloat(reg_idx);
---
> PhysRegIdPtr phys_reg = commitRenameMap[tid].lookupFloat(reg_idx);
1374c1373
< PhysRegIndex phys_reg = commitRenameMap[tid].lookupCC(reg_idx);
---
> PhysRegIdPtr phys_reg = commitRenameMap[tid].lookupCC(reg_idx);