diff options
| author | Ron Dreslinski <rdreslin@umich.edu> | 2006-10-19 19:00:43 -0400 |
|---|---|---|
| committer | Ron Dreslinski <rdreslin@umich.edu> | 2006-10-19 19:00:43 -0400 |
| commit | 9cf063eb8e0b9d4af40f0e8fe609f9135be899f5 (patch) | |
| tree | 6c001f86099f6e84dc70849c52101b3b1c6b3bd1 /src/python/m5 | |
| parent | 39d24f7241e0645bd4cf1e71d37be9b4e913cb9b (diff) | |
| parent | bf917535f835b296d6fd88d3c63f3b692ffb1509 (diff) | |
| download | gem5-9cf063eb8e0b9d4af40f0e8fe609f9135be899f5.tar.xz | |
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest
--HG--
extra : convert_revision : c6611b32537918f5bf183788227ddf69a9a9a069
Diffstat (limited to 'src/python/m5')
| -rw-r--r-- | src/python/m5/SimObject.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/python/m5/SimObject.py b/src/python/m5/SimObject.py index 716f584b0..18b3fff55 100644 --- a/src/python/m5/SimObject.py +++ b/src/python/m5/SimObject.py @@ -730,9 +730,8 @@ class SimObject(object): # 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) + system_ptr = cc_main.convertToSystemPtr(self._ccObject) + system_ptr.setMemoryMode(mode) for child in self._children.itervalues(): child.changeTiming(mode) |