diff -r f9e76b1eb79a -r c1585edc3d31 src/sim/eventq.cc --- a/src/sim/eventq.cc Tue Jan 22 00:13:28 2013 -0600 +++ b/src/sim/eventq.cc Thu Jan 24 14:12:56 2013 -0600 @@ -266,6 +266,8 @@ void EventQueue::serialize(ostream &os) { + paramOut(os, "curTick", getCurTick()); + std::list eventPtrs; int numEvents = 0; @@ -297,6 +299,10 @@ void EventQueue::unserialize(Checkpoint *cp, const std::string §ion) { + Tick tick; + paramIn(cp, section, "curTick", tick); + setCurTick(tick); + int numEvents; UNSERIALIZE_SCALAR(numEvents); diff -r f9e76b1eb79a -r c1585edc3d31 src/sim/serialize.cc --- a/src/sim/serialize.cc Tue Jan 22 00:13:28 2013 -0600 +++ b/src/sim/serialize.cc Thu Jan 24 14:12:56 2013 -0600 @@ -454,7 +454,6 @@ Globals::serialize(ostream &os) { nameOut(os); - paramOut(os, "curTick", curTick()); nameOut(os, "MainEventQueue"); mainEventQueue.serialize(os); @@ -463,10 +462,6 @@ void Globals::unserialize(Checkpoint *cp, const std::string §ion) { - Tick tick; - paramIn(cp, section, "curTick", tick); - mainEventQueue.setCurTick(tick); - mainEventQueue.unserialize(cp, "MainEventQueue"); }