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
This commit is contained in:
parent
9c901225f8
commit
fb3a30f87c
1 changed files with 2 additions and 2 deletions
|
@ -161,9 +161,9 @@ AtomicSimpleCPU::serialize(ostream &os)
|
||||||
{
|
{
|
||||||
SimObject::State so_state = SimObject::getState();
|
SimObject::State so_state = SimObject::getState();
|
||||||
SERIALIZE_ENUM(so_state);
|
SERIALIZE_ENUM(so_state);
|
||||||
|
BaseSimpleCPU::serialize(os);
|
||||||
nameOut(os, csprintf("%s.tickEvent", name()));
|
nameOut(os, csprintf("%s.tickEvent", name()));
|
||||||
tickEvent.serialize(os);
|
tickEvent.serialize(os);
|
||||||
BaseSimpleCPU::serialize(os);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -171,8 +171,8 @@ AtomicSimpleCPU::unserialize(Checkpoint *cp, const string §ion)
|
||||||
{
|
{
|
||||||
SimObject::State so_state;
|
SimObject::State so_state;
|
||||||
UNSERIALIZE_ENUM(so_state);
|
UNSERIALIZE_ENUM(so_state);
|
||||||
tickEvent.unserialize(cp, csprintf("%s.tickEvent", section));
|
|
||||||
BaseSimpleCPU::unserialize(cp, section);
|
BaseSimpleCPU::unserialize(cp, section);
|
||||||
|
tickEvent.unserialize(cp, csprintf("%s.tickEvent", section));
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Loading…
Reference in a new issue