summaryrefslogtreecommitdiff
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
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
-rw-r--r--src/python/m5/SimObject.py7
-rw-r--r--src/sim/main.cc12
-rw-r--r--src/sim/sim_object.hh7
-rw-r--r--src/sim/system.hh14
4 files changed, 29 insertions, 11 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)
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.
diff --git a/src/sim/sim_object.hh b/src/sim/sim_object.hh
index 38f2bdd23..32807b69d 100644
--- a/src/sim/sim_object.hh
+++ b/src/sim/sim_object.hh
@@ -64,6 +64,13 @@ class SimObject : public Serializable, protected StartupCallback
Draining,
Drained
};
+
+ enum MemoryMode {
+ Invalid=0,
+ Atomic,
+ Timing
+ };
+
private:
State state;
diff --git a/src/sim/system.hh b/src/sim/system.hh
index 3ab1d81f2..827fe5c78 100644
--- a/src/sim/system.hh
+++ b/src/sim/system.hh
@@ -62,22 +62,16 @@ class RemoteGDB;
class System : public SimObject
{
public:
- enum MemoryMode {
- Invalid=0,
- Atomic,
- Timing
- };
static const char *MemoryModeStrings[3];
-
- MemoryMode getMemoryMode() { assert(memoryMode); return memoryMode; }
+ SimObject::MemoryMode getMemoryMode() { assert(memoryMode); return memoryMode; }
/** Change the memory mode of the system. This should only be called by the
* python!!
* @param mode Mode to change to (atomic/timing)
*/
- void setMemoryMode(MemoryMode mode);
+ void setMemoryMode(SimObject::MemoryMode mode);
PhysicalMemory *physmem;
PCEventQueue pcEventQueue;
@@ -126,7 +120,7 @@ class System : public SimObject
protected:
- MemoryMode memoryMode;
+ SimObject::MemoryMode memoryMode;
#if FULL_SYSTEM
/**
@@ -173,7 +167,7 @@ class System : public SimObject
{
std::string name;
PhysicalMemory *physmem;
- MemoryMode mem_mode;
+ SimObject::MemoryMode mem_mode;
#if FULL_SYSTEM
Tick boot_cpu_frequency;