summaryrefslogtreecommitdiff
path: root/src/python/m5/objects
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2006-07-13 15:50:09 -0400
committerAli Saidi <saidi@eecs.umich.edu>2006-07-13 15:50:09 -0400
commitefc06d0545912f4589e86fe32deac98805786ee6 (patch)
tree7655d0f658e0582d9985551d193811d8525d1fbc /src/python/m5/objects
parent1e4acb8e017ce81694c514af21ad817e9b1a078e (diff)
parente1b8e71500b7b66b115345eeaef7216617487456 (diff)
downloadgem5-efc06d0545912f4589e86fe32deac98805786ee6.tar.xz
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem src/python/m5/main.py: merge two help fixes --HG-- extra : convert_revision : b5c4a88bb84b726bebd3e357a4ef29acc0d95600
Diffstat (limited to 'src/python/m5/objects')
-rw-r--r--src/python/m5/objects/System.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/python/m5/objects/System.py b/src/python/m5/objects/System.py
index 9a1e1d690..386f39277 100644
--- a/src/python/m5/objects/System.py
+++ b/src/python/m5/objects/System.py
@@ -1,9 +1,12 @@
from m5 import build_env
from m5.config import *
+class MemoryMode(Enum): vals = ['invalid', 'atomic', 'timing']
+
class System(SimObject):
type = 'System'
physmem = Param.PhysicalMemory(Parent.any, "phsyical memory")
+ mem_mode = Param.MemoryMode('atomic', "The mode the memory system is in")
if build_env['FULL_SYSTEM']:
boot_cpu_frequency = Param.Frequency(Self.cpu[0].clock.frequency,
"boot processor frequency")