summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndreas Sandberg <Andreas.Sandberg@arm.com>2012-11-02 11:32:00 -0500
committerAndreas Sandberg <Andreas.Sandberg@arm.com>2012-11-02 11:32:00 -0500
commit7e25052feebcc69592e8d40aa085e386ad23b173 (patch)
tree2afc952f40fa48d1912a31145caf15a82786403a /src
parent3d9811971783630ce09f39fbb0f10794cbf609f5 (diff)
downloadgem5-7e25052feebcc69592e8d40aa085e386ad23b173.tar.xz
Partly revert [4f54b0f229b5] and move draining to m5.changeToTiming
Changeset 4f54b0f229b5 removed the call to doDrain in changeToTiming based on the assumption that the system does not need draining when running in atomic mode. This is a false assumption since at least the System class requires the system to be drained before it allows switching of memory modes. This patch reverts that part of the changeset.
Diffstat (limited to 'src')
-rw-r--r--src/python/m5/simulate.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/python/m5/simulate.py b/src/python/m5/simulate.py
index 5fc00ad05..89b6b1e9d 100644
--- a/src/python/m5/simulate.py
+++ b/src/python/m5/simulate.py
@@ -207,6 +207,7 @@ def changeToTiming(system):
(type(system), objects.Root, objects.System)
if system.getMemoryMode() != objects.params.timing:
+ doDrain(system)
print "Changing memory mode to timing"
system.setMemoryMode(objects.params.timing)