summaryrefslogtreecommitdiff
path: root/src/sim/ticked_object.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/sim/ticked_object.cc')
-rw-r--r--src/sim/ticked_object.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/sim/ticked_object.cc b/src/sim/ticked_object.cc
index 22a149388..ef6ee1c20 100644
--- a/src/sim/ticked_object.cc
+++ b/src/sim/ticked_object.cc
@@ -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);
}