diff options
| author | Erik Hallnor <ehallnor@umich.edu> | 2004-10-17 00:07:28 -0400 |
|---|---|---|
| committer | Erik Hallnor <ehallnor@umich.edu> | 2004-10-17 00:07:28 -0400 |
| commit | fcbfd5a99d05b4e555fcd36b823a37c1c7f94353 (patch) | |
| tree | efef17e6d975d64711a2dc83e67f65856e6ca41e /kern | |
| parent | e6f46d7df7172614f4adfdcc6098aadc6d8a1754 (diff) | |
| parent | 867a9b84d9d633bed17a8880f84864840b923dfd (diff) | |
| download | gem5-fcbfd5a99d05b4e555fcd36b823a37c1c7f94353.tar.xz | |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/ehallnor/work/m5
--HG--
extra : convert_revision : fa4e85d5f5c783985357eb5205fcf8957f214d1e
Diffstat (limited to 'kern')
| -rw-r--r-- | kern/kernel_stats.cc | 8 | ||||
| -rw-r--r-- | kern/system_events.cc | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/kern/kernel_stats.cc b/kern/kernel_stats.cc index c08ee08f7..7fd0f31ae 100644 --- a/kern/kernel_stats.cc +++ b/kern/kernel_stats.cc @@ -294,6 +294,10 @@ Statistics::serialize(ostream &os) { int exemode = themode; SERIALIZE_SCALAR(exemode); + SERIALIZE_SCALAR(idleProcess); + SERIALIZE_SCALAR(iplLast); + SERIALIZE_SCALAR(iplLastTick); + SERIALIZE_SCALAR(lastModeTick); } void @@ -301,6 +305,10 @@ Statistics::unserialize(Checkpoint *cp, const string §ion) { int exemode; UNSERIALIZE_SCALAR(exemode); + UNSERIALIZE_SCALAR(idleProcess); + UNSERIALIZE_SCALAR(iplLast); + UNSERIALIZE_SCALAR(iplLastTick); + UNSERIALIZE_SCALAR(lastModeTick); themode = (cpu_mode)exemode; } diff --git a/kern/system_events.cc b/kern/system_events.cc index b6526d193..9acf2f65a 100644 --- a/kern/system_events.cc +++ b/kern/system_events.cc @@ -70,6 +70,7 @@ void IdleStartEvent::process(ExecContext *xc) { xc->kernelStats->setIdleProcess(xc->regs.ipr[AlphaISA::IPR_PALtemp23]); + remove(); } void |