summaryrefslogtreecommitdiff
path: root/src/python/m5
diff options
context:
space:
mode:
authorLisa Hsu <hsul@eecs.umich.edu>2006-10-11 18:54:31 -0400
committerLisa Hsu <hsul@eecs.umich.edu>2006-10-11 18:54:31 -0400
commitba795552f58525e34c26a79224ff24c11145103e (patch)
tree114181f156b53f379c9eb31427db473025a74f82 /src/python/m5
parent8acecfef9b0e9a1c34b338a6862a3cc38b2f490b (diff)
downloadgem5-ba795552f58525e34c26a79224ff24c11145103e.tar.xz
System not global object, need to preface it with objects.
--HG-- extra : convert_revision : 5e105d7082a8c103fb5d5383c3093734bfd590f5
Diffstat (limited to 'src/python/m5')
-rw-r--r--src/python/m5/__init__.py7
1 files changed, 4 insertions, 3 deletions
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()