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/cpu.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/cpu.hh')
-rw-r--r-- | src/cpu/o3/cpu.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cpu/o3/cpu.hh b/src/cpu/o3/cpu.hh index 8f4175c70..b1ebcce9d 100644 --- a/src/cpu/o3/cpu.hh +++ b/src/cpu/o3/cpu.hh @@ -57,13 +57,13 @@ class ThreadContext; class MemObject; class Process; -class BaseFullCPU : public BaseCPU +class BaseO3CPU : public BaseCPU { //Stuff that's pretty ISA independent will go here. public: typedef BaseCPU::Params Params; - BaseFullCPU(Params *params); + BaseO3CPU(Params *params); void regStats(); @@ -79,7 +79,7 @@ class BaseFullCPU : public BaseCPU * tick() function for the CPU is defined here. */ template <class Impl> -class FullO3CPU : public BaseFullCPU +class FullO3CPU : public BaseO3CPU { public: typedef TheISA::FloatReg FloatReg; |