summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLisa Hsu <Lisa.Hsu@amd.com>2010-06-08 17:16:36 -0700
committerLisa Hsu <Lisa.Hsu@amd.com>2010-06-08 17:16:36 -0700
commitd28572499fb224c310f5d0726b3e2eb64235c291 (patch)
treef87075531299d8b1f03003627b9d17b450e732df
parent4977d8b58ffe72fe679767d44b166bf909fdc3c1 (diff)
downloadgem5-d28572499fb224c310f5d0726b3e2eb64235c291.tar.xz
flags: Unserializing old checkpoints before the introduction
of the Initialized flag would break, set Initialized for events upon unserialization.
-rw-r--r--src/sim/eventq.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/sim/eventq.cc b/src/sim/eventq.cc
index 9b08a45d8..900a6dd4b 100644
--- a/src/sim/eventq.cc
+++ b/src/sim/eventq.cc
@@ -238,7 +238,9 @@ Event::unserialize(Checkpoint *cp, const string &section)
// object itself (since they aren't immediately true)
short _flags;
UNSERIALIZE_SCALAR(_flags);
+ assert(initialized());
flags = _flags;
+ flags.set(Initialized);
bool wasScheduled = flags.isSet(Scheduled) && !flags.isSet(Squashed);
flags.clear(Squashed | Scheduled);