SE/FS: Make SE vs. FS mode a runtime parameter.

11 files changed, 13 insertions, 13 deletions

diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 6154f9877..80379f6a3 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -552,8 +552,8 @@ def makeLinuxX86System(mem_mode, numCPUs = 1, mdesc = None, Ruby = False):
     return self
 
 
-def makeDualRoot(testSystem, driveSystem, dumpfile):
-    self = Root()
+def makeDualRoot(full_system, testSystem, driveSystem, dumpfile):
+    self = Root(full_system = full_system)
     self.testsys = testSystem
     self.drivesys = driveSystem
     self.etherlink = EtherLink()
diff --git a/configs/example/fs.py b/configs/example/fs.py
index 08484559a..9f41e24b9 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -198,9 +198,9 @@ if len(bm) == 2:
         drive_sys.kernel = binary(options.kernel)
 
     drive_sys.init_param = options.init_param
-    root = makeDualRoot(test_sys, drive_sys, options.etherdump)
+    root = makeDualRoot(True, test_sys, drive_sys, options.etherdump)
 elif len(bm) == 1:
-    root = Root(system=test_sys)
+    root = Root(full_system=True, system=test_sys)
 else:
     print "Error I don't know how to create more than 2 systems."
     sys.exit(1)
diff --git a/configs/example/memtest.py b/configs/example/memtest.py
index 24a49a9b3..b2cedc8f5 100644
--- a/configs/example/memtest.py
+++ b/configs/example/memtest.py
@@ -172,7 +172,7 @@ make_level(treespec, prototypes, system.physmem, "port")
 # run simulation
 # -----------------------
 
-root = Root( system = system )
+root = Root( full_system = False, system = system )
 if options.atomic:
     root.system.mem_mode = 'atomic'
 else:
diff --git a/configs/example/ruby_direct_test.py b/configs/example/ruby_direct_test.py
index 55b1c85e6..d4843e866 100644
--- a/configs/example/ruby_direct_test.py
+++ b/configs/example/ruby_direct_test.py
@@ -111,7 +111,7 @@ for ruby_port in system.ruby._cpu_ruby_ports:
 # run simulation
 # -----------------------
 
-root = Root( system = system )
+root = Root( full_system = False, system = system )
 root.system.mem_mode = 'timing'
 
 # Not much point in this being higher than the L1 latency
diff --git a/configs/example/ruby_fs.py b/configs/example/ruby_fs.py
index e6ac5f8c8..e18ed95af 100644
--- a/configs/example/ruby_fs.py
+++ b/configs/example/ruby_fs.py
@@ -141,6 +141,6 @@ for (i, cpu) in enumerate(system.cpu):
         cpu.interrupts.pio = system.piobus.port
         cpu.interrupts.int_port = system.piobus.port
 
-root = Root(system = system)
+root = Root(full_system = True, system = system)
 
 Simulation.run(options, root, system, FutureClass)
diff --git a/configs/example/ruby_mem_test.py b/configs/example/ruby_mem_test.py
index 6b1a46776..a418c47eb 100644
--- a/configs/example/ruby_mem_test.py
+++ b/configs/example/ruby_mem_test.py
@@ -162,7 +162,7 @@ for (i, dma) in enumerate(dmas):
 # run simulation
 # -----------------------
 
-root = Root( system = system )
+root = Root( full_system = False, system = system )
 root.system.mem_mode = 'timing'
 
 # Not much point in this being higher than the L1 latency
diff --git a/configs/example/ruby_network_test.py b/configs/example/ruby_network_test.py
index cd221ec7e..b5d788bf5 100644
--- a/configs/example/ruby_network_test.py
+++ b/configs/example/ruby_network_test.py
@@ -121,7 +121,7 @@ for ruby_port in system.ruby._cpu_ruby_ports:
 # run simulation
 # -----------------------
 
-root = Root( system = system )
+root = Root( full_system = False, system = system )
 root.system.mem_mode = 'timing'
 
 # Not much point in this being higher than the L1 latency
diff --git a/configs/example/ruby_random_test.py b/configs/example/ruby_random_test.py
index 7655e32fd..4bf17d70b 100644
--- a/configs/example/ruby_random_test.py
+++ b/configs/example/ruby_random_test.py
@@ -131,7 +131,7 @@ for ruby_port in system.ruby._cpu_ruby_ports:
 # run simulation
 # -----------------------
 
-root = Root( system = system )
+root = Root( full_system = False, system = system )
 root.system.mem_mode = 'timing'
 
 # Not much point in this being higher than the L1 latency
diff --git a/configs/example/se.py b/configs/example/se.py
index 572364482..f1dae9482 100644
--- a/configs/example/se.py
+++ b/configs/example/se.py
@@ -200,6 +200,6 @@ for i in xrange(np):
     if options.fastmem:
         system.cpu[0].physmem_port = system.physmem.port
 
-root = Root(system = system)
+root = Root(full_system = False, system = system)
 
 Simulation.run(options, root, system, FutureClass)
diff --git a/configs/splash2/cluster.py b/configs/splash2/cluster.py
index e8c471eaa..4a9446794 100644
--- a/configs/splash2/cluster.py
+++ b/configs/splash2/cluster.py
@@ -239,7 +239,7 @@ for cluster in clusters:
 # Define the root
 # ----------------------
 
-root = Root(system = system)
+root = Root(full_system = False, system = system)
 
 # --------------------
 # Pick the correct Splash2 Benchmarks
diff --git a/configs/splash2/run.py b/configs/splash2/run.py
index 200eb191d..8a9b815e6 100644
--- a/configs/splash2/run.py
+++ b/configs/splash2/run.py
@@ -225,7 +225,7 @@ for cpu in cpus:
 # Define the root
 # ----------------------
 
-root = Root(system = system)
+root = Root(full_system = False, system = system)
 
 # --------------------
 # Pick the correct Splash2 Benchmarks