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/commit.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/commit.hh')
| -rw-r--r-- | src/cpu/o3/commit.hh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cpu/o3/commit.hh b/src/cpu/o3/commit.hh index c73b39ec6..860326283 100644 --- a/src/cpu/o3/commit.hh +++ b/src/cpu/o3/commit.hh @@ -68,7 +68,7 @@ class DefaultCommit { public: // Typedefs from the Impl. - typedef typename Impl::FullCPU FullCPU; + typedef typename Impl::O3CPU O3CPU; typedef typename Impl::DynInstPtr DynInstPtr; typedef typename Impl::Params Params; typedef typename Impl::CPUPol CPUPol; @@ -146,7 +146,7 @@ class DefaultCommit void regStats(); /** Sets the CPU pointer. */ - void setCPU(FullCPU *cpu_ptr); + void setCPU(O3CPU *cpu_ptr); /** Sets the list of threads. */ void setThreads(std::vector<Thread *> &threads); @@ -326,8 +326,8 @@ class DefaultCommit ROB *rob; private: - /** Pointer to FullCPU. */ - FullCPU *cpu; + /** Pointer to O3CPU. */ + O3CPU *cpu; /** Vector of all of the threads. */ std::vector<Thread *> thread; |