From: Lisa Hsu <hsul@eecs.umich.edu>
Date: Wed, 11 Oct 2006 22:54:31 +0000 (-0400)
Subject: System not global object, need to preface it with objects.
X-Git-Tag: m5_2.0_beta2~73^2~19^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ba795552f58525e34c26a79224ff24c11145103e;p=gem5.git

System not global object, need to preface it with objects.

--HG--
extra : convert_revision : 5e105d7082a8c103fb5d5383c3093734bfd590f5
---

diff --git a/src/python/m5/__init__.py b/src/python/m5/__init__.py
index 5717b49b6..03e0508fb 100644
--- a/src/python/m5/__init__.py
+++ b/src/python/m5/__init__.py
@@ -144,7 +144,7 @@ def restoreCheckpoint(root, dir):
     resume(root)
 
 def changeToAtomic(system):
-    if not isinstance(system, objects.Root) and not isinstance(system, System):
+    if not isinstance(system, objects.Root) and not isinstance(system, objects.System):
         raise TypeError, "Object is not a root or system object.  Checkpoint must be "
         "called on a root object."
     doDrain(system)
@@ -153,7 +153,7 @@ def changeToAtomic(system):
     resume(system)
 
 def changeToTiming(system):
-    if not isinstance(system, objects.Root) and not isinstance(system, System):
+    if not isinstance(system, objects.Root) and not isinstance(system, objects.System):
         raise TypeError, "Object is not a root or system object.  Checkpoint must be "
         "called on a root object."
     doDrain(system)
@@ -162,6 +162,7 @@ def changeToTiming(system):
     resume(system)
 
 def switchCpus(cpuList):
+    print "switching cpus"
     if not isinstance(cpuList, list):
         raise RuntimeError, "Must pass a list to this function"
     for i in cpuList:
@@ -189,9 +190,9 @@ def switchCpus(cpuList):
     cc_main.cleanupCountedDrain(drain_event)
     # Now all of the CPUs are ready to be switched out
     for old_cpu in old_cpus:
+        print "switching"
         old_cpu._ccObject.switchOut()
     index = 0
-    print "Switching CPUs"
     for new_cpu in new_cpus:
         new_cpu.takeOverFrom(old_cpus[index])
         new_cpu._ccObject.resume()