diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-07-07 16:47:28 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-07-07 16:47:28 -0400 |
| commit | b2a479cfc89e3109830bd285b0819b6a0b56cbf4 (patch) | |
| tree | 32ea9fd57f6c2bf90c31e62fab7a755f65f408b9 /src/cpu/base.hh | |
| parent | 1faada9bd98a6425624a97813d4c8cdc5b78aa1f (diff) | |
| parent | 7811500eefc57d8f9f00845b9187d9a1a6ef6655 (diff) | |
| download | gem5-b2a479cfc89e3109830bd285b0819b6a0b56cbf4.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
--HG--
extra : convert_revision : e8933f852352164f4e50444f94cc6ee260e06766
Diffstat (limited to 'src/cpu/base.hh')
| -rw-r--r-- | src/cpu/base.hh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/cpu/base.hh b/src/cpu/base.hh index 5256a411f..2be6e4e81 100644 --- a/src/cpu/base.hh +++ b/src/cpu/base.hh @@ -37,15 +37,16 @@ #include "base/statistics.hh" #include "config/full_system.hh" #include "sim/eventq.hh" -#include "sim/sim_object.hh" +#include "mem/mem_object.hh" #include "arch/isa_traits.hh" class BranchPred; class CheckerCPU; class ThreadContext; class System; +class Port; -class BaseCPU : public SimObject +class BaseCPU : public MemObject { protected: // CPU's clock period in terms of the number of ticks of curTime. |