summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLisa Hsu <hsul@eecs.umich.edu>2006-10-06 01:29:50 -0400
committerLisa Hsu <hsul@eecs.umich.edu>2006-10-06 01:29:50 -0400
commitfb3a30f87cb699d9a39240d52d1dba3feb0b64c3 (patch)
treea4cc12aa96b87a7f02e81ec00e5a4d9f9eb168dc
parent9c901225f8f18d0d2f5325436983d685a4fe2245 (diff)
downloadgem5-fb3a30f87cb699d9a39240d52d1dba3feb0b64c3.tar.xz
checkpoint recovery was screwed up because a new section was created in the middle of another section and messed up unserializing.
--HG-- extra : convert_revision : 7af15fdc9e8d203b26840a2eb5fef511b6a2b21d
-rw-r--r--src/cpu/simple/atomic.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc
index 7ba1b7df1..88698bfee 100644
--- a/src/cpu/simple/atomic.cc
+++ b/src/cpu/simple/atomic.cc
@@ -161,9 +161,9 @@ AtomicSimpleCPU::serialize(ostream &os)
{
SimObject::State so_state = SimObject::getState();
SERIALIZE_ENUM(so_state);
+ BaseSimpleCPU::serialize(os);
nameOut(os, csprintf("%s.tickEvent", name()));
tickEvent.serialize(os);
- BaseSimpleCPU::serialize(os);
}
void
@@ -171,8 +171,8 @@ AtomicSimpleCPU::unserialize(Checkpoint *cp, const string &section)
{
SimObject::State so_state;
UNSERIALIZE_ENUM(so_state);
- tickEvent.unserialize(cp, csprintf("%s.tickEvent", section));
BaseSimpleCPU::unserialize(cp, section);
+ tickEvent.unserialize(cp, csprintf("%s.tickEvent", section));
}
void