summaryrefslogtreecommitdiff
path: root/configs/splash2
diff options
context:
space:
mode:
authorSteve Reinhardt <steve.reinhardt@amd.com>2010-08-17 05:06:22 -0700
committerSteve Reinhardt <steve.reinhardt@amd.com>2010-08-17 05:06:22 -0700
commit1fbe466345b43caabece9730c1f0456f1b57b82f (patch)
tree8285f10d6ab642649d74ae79909508679f264d54 /configs/splash2
parent0f8b5afd7ad82fda05c3ad42cda4f9046992428d (diff)
downloadgem5-1fbe466345b43caabece9730c1f0456f1b57b82f.tar.xz
sim: make Python Root object a singleton
Enforce that the Python Root SimObject is instantiated only once. The C++ Root object already panics if more than one is created. This change avoids the need to track what the root object is, since it's available from Root.getInstance() (if it exists). It's now redundant to have the user pass the root object to functions like instantiate(), checkpoint(), and restoreCheckpoint(), so that arg is gone. Users who use configs/common/Simulate.py should not notice.
Diffstat (limited to 'configs/splash2')
-rw-r--r--configs/splash2/cluster.py2
-rw-r--r--configs/splash2/run.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/configs/splash2/cluster.py b/configs/splash2/cluster.py
index 45c9ede82..77591dc62 100644
--- a/configs/splash2/cluster.py
+++ b/configs/splash2/cluster.py
@@ -292,7 +292,7 @@ if options.timing or options.detailed:
root.system.mem_mode = 'timing'
# instantiate configuration
-m5.instantiate(root)
+m5.instantiate()
# simulate until program terminates
if options.maxtick:
diff --git a/configs/splash2/run.py b/configs/splash2/run.py
index 95ec790ba..24faade17 100644
--- a/configs/splash2/run.py
+++ b/configs/splash2/run.py
@@ -276,7 +276,7 @@ if options.timing or options.detailed:
root.system.mem_mode = 'timing'
# instantiate configuration
-m5.instantiate(root)
+m5.instantiate()
# simulate until program terminates
if options.maxtick: