From: Lisa Hsu <hsul@eecs.umich.edu>
Date: Fri, 6 Oct 2006 05:29:50 +0000 (-0400)
Subject: checkpoint recovery was screwed up because a new section was created in the middle... 
X-Git-Tag: m5_2.0_beta2~104^2~40^2~2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fb3a30f87cb699d9a39240d52d1dba3feb0b64c3;p=gem5.git

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
---

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