35,36c35,36
< #ifndef __CPU_O3_CPU_RENAME_MAP_HH__
< #define __CPU_O3_CPU_RENAME_MAP_HH__
---
> #ifndef __CPU_O3_RENAME_MAP_HH__
> #define __CPU_O3_RENAME_MAP_HH__
68,74c68
< SimpleRenameMap(unsigned _numLogicalIntRegs,
< unsigned _numPhysicalIntRegs,
< unsigned _numLogicalFloatRegs,
< unsigned _numPhysicalFloatRegs,
< unsigned _numMiscRegs,
< RegIndex _intZeroReg,
< RegIndex _floatZeroReg);
---
> SimpleRenameMap() {};
78a73,88
> void init(unsigned _numLogicalIntRegs,
> unsigned _numPhysicalIntRegs,
> PhysRegIndex &_int_reg_start,
>
> unsigned _numLogicalFloatRegs,
> unsigned _numPhysicalFloatRegs,
> PhysRegIndex &_float_reg_start,
>
> unsigned _numMiscRegs,
>
> RegIndex _intZeroReg,
> RegIndex _floatZeroReg,
>
> int id,
> bool bindRegs);
>
89,90d98
< bool isReady(PhysRegIndex arch_reg);
<
96,97d103
< void markAsReady(PhysRegIndex ready_reg);
<
100,102d105
< void squash(std::vector<RegIndex> freed_regs,
< std::vector<UnmapInfo> unmaps);
<
105a109,111
> /** Rename Map ID */
> int id;
>
147a154,155
> //Change this to private
> private:
149c157
< RenameEntry *intRenameMap;
---
> std::vector<RenameEntry> intRenameMap;
152c160
< RenameEntry *floatRenameMap;
---
> std::vector<RenameEntry> floatRenameMap;
153a162
> private:
156,172d164
<
< // Might want to make all these scoreboards into one large scoreboard.
<
< /** Scoreboard of physical integer registers, saying whether or not they
< * are ready.
< */
< std::vector<bool> intScoreboard;
<
< /** Scoreboard of physical floating registers, saying whether or not they
< * are ready.
< */
< std::vector<bool> floatScoreboard;
<
< /** Scoreboard of miscellaneous registers, saying whether or not they
< * are ready.
< */
< std::vector<bool> miscScoreboard;
175c167
< #endif //__CPU_O3_CPU_RENAME_MAP_HH__
---
> #endif //__CPU_O3_RENAME_MAP_HH__