diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-07-10 15:41:35 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-07-10 15:41:35 -0400 |
| commit | 5dbd7a3f766dcf7bbfb29ede45655c01994b1425 (patch) | |
| tree | d2c8358ef670eea00b4bb9e128f6da6de68db693 /src/cpu/base.cc | |
| parent | f60d8217e3c9fd7c4ea75ab0c89dbbd63db75ffd (diff) | |
| parent | 5584e2b26eccb5d2bf445b8b0b2040449d0b0a77 (diff) | |
| download | gem5-5dbd7a3f766dcf7bbfb29ede45655c01994b1425.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
--HG--
extra : convert_revision : 0e4c7684879b8552908e0b64a00b4824de807244
Diffstat (limited to 'src/cpu/base.cc')
| -rw-r--r-- | src/cpu/base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpu/base.cc b/src/cpu/base.cc index 548f012df..ce440aeff 100644 --- a/src/cpu/base.cc +++ b/src/cpu/base.cc @@ -59,7 +59,7 @@ int maxThreadsPerCPU = 1; #if FULL_SYSTEM BaseCPU::BaseCPU(Params *p) - : SimObject(p->name), clock(p->clock), checkInterrupts(true), + : MemObject(p->name), clock(p->clock), checkInterrupts(true), params(p), number_of_threads(p->numberOfThreads), system(p->system) #else BaseCPU::BaseCPU(Params *p) |