diff options
| -rw-r--r-- | src/python/m5/__init__.py | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/python/m5/__init__.py b/src/python/m5/__init__.py index 6eac7b6d7..06dc92bc6 100644 --- a/src/python/m5/__init__.py +++ b/src/python/m5/__init__.py @@ -187,17 +187,17 @@ def restoreCheckpoint(root, dir): need_resume.append(root) def changeToAtomic(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." + if not isinstance(system, (objects.Root, objects.System)): + raise TypeError, "Parameter of type '%s'. Must be type %s or %s." % \ + (type(system), objects.Root, objects.System) doDrain(system) print "Changing memory mode to atomic" system.changeTiming(internal.sim_object.SimObject.Atomic) def changeToTiming(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." + if not isinstance(system, (objects.Root, objects.System)): + raise TypeError, "Parameter of type '%s'. Must be type %s or %s." % \ + (type(system), objects.Root, objects.System) doDrain(system) print "Changing memory mode to timing" system.changeTiming(internal.sim_object.SimObject.Timing) @@ -238,14 +238,6 @@ def switchCpus(cpuList): new_cpu._ccObject.resume() index += 1 -def dumpStats(): - print 'Dumping stats' - internal.stats.dump() - -def resetStats(): - print 'Resetting stats' - internal.stats.reset() - # Since we have so many mutual imports in this package, we should: # 1. Put all intra-package imports at the *bottom* of the file, unless # they're absolutely needed before that (for top-level statements |