diff options
| author | Lisa Hsu <hsul@eecs.umich.edu> | 2006-10-12 18:56:57 -0400 |
|---|---|---|
| committer | Lisa Hsu <hsul@eecs.umich.edu> | 2006-10-12 18:56:57 -0400 |
| commit | 339b1f85165df0e2654f755cc921eded3db8977c (patch) | |
| tree | 256d738554e3d0a2987c9d4769313310a5ce9967 /src/sim/sim_object.hh | |
| parent | 3d2764acf3a05a65c32e93bd18c8fe9a6e0d9ecc (diff) | |
| parent | ba795552f58525e34c26a79224ff24c11145103e (diff) | |
| download | gem5-339b1f85165df0e2654f755cc921eded3db8977c.tar.xz | |
Merge zizzer:/bk/newmem
into zed.eecs.umich.edu:/z/hsul/work/m5/newmem
src/cpu/simple/timing.cc:
hand merge
--HG--
extra : convert_revision : 083bf102249ad9bc63c447dbf85d3863f935f647
Diffstat (limited to 'src/sim/sim_object.hh')
| -rw-r--r-- | src/sim/sim_object.hh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/sim/sim_object.hh b/src/sim/sim_object.hh index 38f2bdd23..32807b69d 100644 --- a/src/sim/sim_object.hh +++ b/src/sim/sim_object.hh @@ -64,6 +64,13 @@ class SimObject : public Serializable, protected StartupCallback Draining, Drained }; + + enum MemoryMode { + Invalid=0, + Atomic, + Timing + }; + private: State state; |