diff options
author | Lisa Hsu <hsul@eecs.umich.edu> | 2006-10-11 18:53:50 -0400 |
---|---|---|
committer | Lisa Hsu <hsul@eecs.umich.edu> | 2006-10-11 18:53:50 -0400 |
commit | 8acecfef9b0e9a1c34b338a6862a3cc38b2f490b (patch) | |
tree | 7acd4343306a5793fdcf6c2a9f4fb18118071c5a /src/sim/main.cc | |
parent | 024b33a1ef6f83be634f7afe644777f070ccd692 (diff) | |
download | gem5-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/sim/main.cc')
-rw-r--r-- | src/sim/main.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/sim/main.cc b/src/sim/main.cc index 874d0ac85..8bb0d7aaa 100644 --- a/src/sim/main.cc +++ b/src/sim/main.cc @@ -66,6 +66,7 @@ #include "sim/sim_events.hh" #include "sim/sim_exit.hh" #include "sim/sim_object.hh" +#include "sim/system.hh" #include "sim/stat_control.hh" #include "sim/stats.hh" #include "sim/root.hh" @@ -440,6 +441,17 @@ convertToBaseCPUPtr(SimObject *obj) return ptr; } +System * +convertToSystemPtr(SimObject *obj) +{ + System *ptr = dynamic_cast<System *>(obj); + + if (ptr == NULL) + warn("Casting to System pointer failed"); + return ptr; +} + + /** * Do C++ simulator exit processing. Exported to SWIG to be invoked * when simulator terminates via Python's atexit mechanism. |