diff options
author | Kevin Lim <ktlim@umich.edu> | 2006-06-29 19:45:24 -0400 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2006-06-29 19:45:24 -0400 |
commit | 2416ba606aed95098ce8e43f813fa57dd9f91974 (patch) | |
tree | c68ecce7b7699953f5d5cd8e85eb1365606e52bb /src/cpu/base.hh | |
parent | f64c175f9ae81be3c002a82ea14a2844a7ee100e (diff) | |
download | gem5-2416ba606aed95098ce8e43f813fa57dd9f91974.tar.xz |
Various fixes for the CPU models to support the features that have been moved to python.
src/cpu/base.cc:
src/cpu/base.hh:
src/cpu/simple/atomic.hh:
Switching out no longer takes a sampler.
src/cpu/simple/atomic.cc:
Fix up switching out. Also fix up serialization; the nameOut() was messing up the ordering.
src/cpu/simple/timing.cc:
Add in quiesce, fix up serialization.
src/cpu/simple/timing.hh:
Add in queisce, fix up serialization.
--HG--
extra : convert_revision : 9d59d53bdf269d4d82fb119e5ae7c8a5d475880b
Diffstat (limited to 'src/cpu/base.hh')
-rw-r--r-- | src/cpu/base.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpu/base.hh b/src/cpu/base.hh index 43122f238..51f3bb905 100644 --- a/src/cpu/base.hh +++ b/src/cpu/base.hh @@ -148,7 +148,7 @@ class BaseCPU : public SimObject /// Prepare for another CPU to take over execution. When it is /// is ready (drained pipe) it signals the sampler. - virtual void switchOut(Sampler *); + virtual void switchOut(); /// Take over execution from the given CPU. Used for warm-up and /// sampling. |