diff options
author | Joel Hestness <hestness@cs.wisc.edu> | 2012-09-05 20:51:41 -0500 |
---|---|---|
committer | Joel Hestness <hestness@cs.wisc.edu> | 2012-09-05 20:51:41 -0500 |
commit | 6924e10978c5847fa33cf33c50f5b3511bf89ee4 (patch) | |
tree | 8da38ae3e1bb57b6b97604ef143cc903b40a2814 /src/mem/ruby/system/MemoryControl.hh | |
parent | 494f6a858e47db3e5352468f504e82af01b931f9 (diff) | |
download | gem5-6924e10978c5847fa33cf33c50f5b3511bf89ee4.tar.xz |
Ruby Memory Controller: Fix clocking
Diffstat (limited to 'src/mem/ruby/system/MemoryControl.hh')
-rw-r--r-- | src/mem/ruby/system/MemoryControl.hh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/mem/ruby/system/MemoryControl.hh b/src/mem/ruby/system/MemoryControl.hh index 80a55e9c1..b7de06c5e 100644 --- a/src/mem/ruby/system/MemoryControl.hh +++ b/src/mem/ruby/system/MemoryControl.hh @@ -34,24 +34,29 @@ #include <list> #include <string> -#include "mem/protocol/MemoryMsg.hh" #include "mem/protocol/MemoryControlRequestType.hh" +#include "mem/protocol/MemoryMsg.hh" #include "mem/ruby/common/Consumer.hh" #include "mem/ruby/profiler/MemCntrlProfiler.hh" #include "mem/ruby/slicc_interface/Message.hh" #include "mem/ruby/system/AbstractMemOrCache.hh" #include "mem/ruby/system/MemoryNode.hh" #include "mem/ruby/system/System.hh" -#include "sim/sim_object.hh" +#include "params/MemoryControl.hh" +#include "sim/clocked_object.hh" ////////////////////////////////////////////////////////////////////////////// class Consumer; class MemoryControl : - public SimObject, public Consumer, public AbstractMemOrCache + public ClockedObject, public Consumer, public AbstractMemOrCache { public: + typedef MemoryControlParams Params; + const Params *params() const + { return dynamic_cast<const Params *>(_params); } + MemoryControl(const Params *p); virtual void init() = 0; virtual void reset() = 0; |