Merge zizzer:/bk/newmem
into zed.eecs.umich.edu:/z/hsul/work/m5/newmem --HG-- extra : convert_revision : bb58679e101570d50c040519fb08ffbabfee7416
This commit is contained in:
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user