summaryrefslogtreecommitdiff
path: root/src/python/m5
diff options
context:
space:
mode:
authorLisa Hsu <hsul@eecs.umich.edu>2006-10-11 18:53:50 -0400
committerLisa Hsu <hsul@eecs.umich.edu>2006-10-11 18:53:50 -0400
commit8acecfef9b0e9a1c34b338a6862a3cc38b2f490b (patch)
tree7acd4343306a5793fdcf6c2a9f4fb18118071c5a /src/python/m5
parent024b33a1ef6f83be634f7afe644777f070ccd692 (diff)
downloadgem5-8acecfef9b0e9a1c34b338a6862a3cc38b2f490b.tar.xz
since memoryMode was put into the System (from SimObject), things got broken - this fixes it so that changeToTiming/changeToAtomic works.
src/python/m5/SimObject.py: now that setMemoryMode is a method in System, need to convert the SimObject * _ccObject into a system ptr to call setMemoryMode. src/sim/main.cc: need this conversion now. src/sim/sim_object.hh: put the enum back into SimObject. src/sim/system.hh: memoryMode is now a part of SimObject, need the ::'s --HG-- extra : convert_revision : 0ade06957fa57b497798e1f50c237ca1badc821d
Diffstat (limited to 'src/python/m5')
-rw-r--r--src/python/m5/SimObject.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/python/m5/SimObject.py b/src/python/m5/SimObject.py
index a0d66e643..716f584b0 100644
--- a/src/python/m5/SimObject.py
+++ b/src/python/m5/SimObject.py
@@ -726,7 +726,12 @@ class SimObject(object):
child.resume()
def changeTiming(self, mode):
- if isinstance(self, System):
+ if isinstance(self, m5.objects.System):
+ # i don't know if there's a better way to do this - calling
+ # setMemoryMode directly from self._ccObject results in calling
+ # SimObject::setMemoryMode, not the System::setMemoryMode
+## system_ptr = cc_main.convertToSystemPtr(self._ccObject)
+## system_ptr.setMemoryMode(mode)
self._ccObject.setMemoryMode(mode)
for child in self._children.itervalues():
child.changeTiming(mode)