diff options
author | Ron Dreslinski <rdreslin@umich.edu> | 2006-10-09 00:28:26 -0400 |
---|---|---|
committer | Ron Dreslinski <rdreslin@umich.edu> | 2006-10-09 00:28:26 -0400 |
commit | 95ca4f9d4a64cc2d28550e40fbe1c41734e7c1c2 (patch) | |
tree | 0b2a4b7b679280ddd51b29d069b91dd388422e66 /src/cpu | |
parent | 0087061681869c9aaab81c3797020b083a83d46a (diff) | |
parent | 67a114fc29662d262a3d7ae867f6ee4c25c0ce8f (diff) | |
download | gem5-95ca4f9d4a64cc2d28550e40fbe1c41734e7c1c2.tar.xz |
Merge zizzer:/z/m5/Bitkeeper/newmem
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest
--HG--
extra : convert_revision : 77b06379a520dd91f124c0a543e30ec3a9cd1452
Diffstat (limited to 'src/cpu')
-rw-r--r-- | src/cpu/simple/atomic.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc index e21065ebc..490be20ae 100644 --- a/src/cpu/simple/atomic.cc +++ b/src/cpu/simple/atomic.cc @@ -162,6 +162,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); @@ -172,6 +174,7 @@ AtomicSimpleCPU::unserialize(Checkpoint *cp, const string §ion) { SimObject::State so_state; UNSERIALIZE_ENUM(so_state); + UNSERIALIZE_ENUM(_status); BaseSimpleCPU::unserialize(cp, section); tickEvent.unserialize(cp, csprintf("%s.tickEvent", section)); } |