diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-06-16 17:53:33 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-06-16 17:53:33 -0400 |
| commit | 4e07f6ca52828247fe1741b1e6c5269ad5291187 (patch) | |
| tree | af786c3cfcdd5640b5840ffdfab64bb55b9e49f9 /src/cpu/o3/rob.hh | |
| parent | 51a5b826373e2c08ba173854a19597d59e0e3c90 (diff) | |
| parent | 0bbd909f02e72a321a65b933104c5ef1e157116b (diff) | |
| download | gem5-4e07f6ca52828247fe1741b1e6c5269ad5291187.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
--HG--
extra : convert_revision : 488b9a9965dd86ca73dc9e510e5b3122cbd357f9
Diffstat (limited to 'src/cpu/o3/rob.hh')
| -rw-r--r-- | src/cpu/o3/rob.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cpu/o3/rob.hh b/src/cpu/o3/rob.hh index 6d1402531..b98d7c4c2 100644 --- a/src/cpu/o3/rob.hh +++ b/src/cpu/o3/rob.hh @@ -45,7 +45,7 @@ class ROB typedef TheISA::RegIndex RegIndex; public: //Typedefs from the Impl. - typedef typename Impl::FullCPU FullCPU; + typedef typename Impl::O3CPU O3CPU; typedef typename Impl::DynInstPtr DynInstPtr; typedef std::pair<RegIndex, PhysRegIndex> UnmapInfo; @@ -90,7 +90,7 @@ class ROB * is created within. * @param cpu_ptr Pointer to the implementation specific full CPU object. */ - void setCPU(FullCPU *cpu_ptr); + void setCPU(O3CPU *cpu_ptr); /** Sets pointer to the list of active threads. * @param at_ptr Pointer to the list of active threads. @@ -257,7 +257,7 @@ class ROB private: /** Pointer to the CPU. */ - FullCPU *cpu; + O3CPU *cpu; /** Active Threads in CPU */ std::list<unsigned>* activeThreads; |