Merge ktlim@zamp:./local/clean/o3-merge/m5

[gem5.git] / src / python / m5 / objects / System.py

diff --git a/src/python/m5/objects/System.py b/src/python/m5/objects/System.py
index 9a1e1d690b2c497bf3f7ccea31c2080f494d23e2..e7dd1bc608a4deba5817e21ed4fc464f1ff04564 100644 (file)
--- a/src/python/m5/objects/System.py
+++ b/src/python/m5/objects/System.py
@@ -1,9 +1,14 @@
+from m5.SimObject import SimObject
+from m5.params import *
+from m5.proxy import *
 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")
@@ -11,6 +16,7 @@ class System(SimObject):
         boot_osflags = Param.String("a", "boot flags to pass to the kernel")
         kernel = Param.String("file that contains the kernel code")
         readfile = Param.String("", "file to read startup script from")
+        symbolfile = Param.String("", "file to get the symbols from")
 
 class AlphaSystem(System):
     type = 'AlphaSystem'