Merge with main repository.

2012-01-07 02:10:34 -08:00
parent 85424bef19 f171a29118
commit 36a822f08e
155 changed files with 5002 additions and 4251 deletions
--- a/src/sim/System.py
+++ b/src/sim/System.py
@@ -41,8 +41,15 @@ class System(SimObject):
    type = 'System'

    @classmethod
-    def swig_objdecls(cls, code):
-        code('%include "python/swig/system.i"')
+    def export_method_cxx_predecls(cls, code):
+        code('#include "sim/system.hh"')
+
+    @classmethod
+    def export_methods(cls, code):
+        code('''
+      Enums::MemoryMode getMemoryMode();
+      void setMemoryMode(Enums::MemoryMode mode);
+''')

    physmem = Param.PhysicalMemory("Physical Memory")
    mem_mode = Param.MemoryMode('atomic', "The mode the memory system is in")