summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorLisa Hsu <hsul@eecs.umich.edu>2006-10-08 23:19:03 -0400
committerLisa Hsu <hsul@eecs.umich.edu>2006-10-08 23:19:03 -0400
commit67c20dd9ddb5ce2f7f8a80246841684f69320019 (patch)
tree4730848ee9f7f0ba94b0a3c3b63d092f2b32e8b3 /src/cpu
parenta2bdddcc6f373173c18335134c67c2355069739f (diff)
parent97c1f6eff75fb1698b04f0f681681cbf80ba58c8 (diff)
downloadgem5-67c20dd9ddb5ce2f7f8a80246841684f69320019.tar.xz
Merge zizzer:/bk/newmem
into zed.eecs.umich.edu:/z/hsul/work/m5/newmem --HG-- extra : convert_revision : a0775bf59ff7049b76917b1ab551bc28efd56b3d
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/simple/atomic.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc
index 42b0e9783..b0356b2bf 100644
--- a/src/cpu/simple/atomic.cc
+++ b/src/cpu/simple/atomic.cc
@@ -161,6 +161,8 @@ AtomicSimpleCPU::serialize(ostream &os)
{
SimObject::State so_state = SimObject::getState();
SERIALIZE_ENUM(so_state);
+ Status _status = status();
+ SERIALIZE_ENUM(_status);
BaseSimpleCPU::serialize(os);
nameOut(os, csprintf("%s.tickEvent", name()));
tickEvent.serialize(os);
@@ -171,6 +173,7 @@ AtomicSimpleCPU::unserialize(Checkpoint *cp, const string &section)
{
SimObject::State so_state;
UNSERIALIZE_ENUM(so_state);
+ UNSERIALIZE_ENUM(_status);
BaseSimpleCPU::unserialize(cp, section);
tickEvent.unserialize(cp, csprintf("%s.tickEvent", section));
}