derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sim: Fix checkpoint restore for Ticked

Browse Source 
This patch makes restoring the 'lastStopped' value for Ticked-containing
objects (including MinorCPU) optional so that Ticked-containing objects
can be restored from non-Ticked-containing objects (such as AtomicSimpleCPU).
This commit is contained in:
Andrew Bardsley
2014-09-03 07:42:25 -04:00
parent 326662b01b
commit 87f6034462
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/sim/ticked_object.cc
View File

@@ -82,9 +82,15 @@ Ticked::serialize(std::ostream &os)
void
Ticked::unserialize(Checkpoint *cp, const std::string &section)
{
uint64_t lastStoppedUint;
uint64_t lastStoppedUint = 0;
paramIn(cp, section, "lastStopped", lastStoppedUint);
/* lastStopped is optional on checkpoint restore as this object may be
* being restored from one which has a common base (and so possibly
* many common checkpointed values) but where Ticked is used in the
* checkpointed object but not this one.
* An example would be a CPU model using Ticked restores from a
* simple CPU without without Ticked */
optParamIn(cp, section, "lastStopped", lastStoppedUint);
lastStopped = Cycles(lastStoppedUint);
}