diff options
author | Kevin Lim <ktlim@umich.edu> | 2006-10-26 14:37:19 -0400 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2006-10-26 14:37:19 -0400 |
commit | e912080d12666482a942eae354e783c3d666c6c9 (patch) | |
tree | 434cd7969db4b0a43ae2cfc4fd31579c21c79f17 /src/python/m5/__init__.py | |
parent | 6824cdf6602ec51c16fe322504377848911c6f00 (diff) | |
parent | eda7148af25e8e106e8983fb37952263dcae5275 (diff) | |
download | gem5-e912080d12666482a942eae354e783c3d666c6c9.tar.xz |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/o3-merge/newmem
--HG--
extra : convert_revision : 30a912cf5d3f205a6301d291dd1799da21663056
Diffstat (limited to 'src/python/m5/__init__.py')
-rw-r--r-- | src/python/m5/__init__.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/python/m5/__init__.py b/src/python/m5/__init__.py index 03e0508fb..d41fd5a61 100644 --- a/src/python/m5/__init__.py +++ b/src/python/m5/__init__.py @@ -150,7 +150,6 @@ def changeToAtomic(system): doDrain(system) print "Changing memory mode to atomic" system.changeTiming(cc_main.SimObject.Atomic) - resume(system) def changeToTiming(system): if not isinstance(system, objects.Root) and not isinstance(system, objects.System): @@ -159,7 +158,6 @@ def changeToTiming(system): doDrain(system) print "Changing memory mode to timing" system.changeTiming(cc_main.SimObject.Timing) - resume(system) def switchCpus(cpuList): print "switching cpus" @@ -190,7 +188,6 @@ 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 for new_cpu in new_cpus: |