ruby: Convert most Ruby objects to M5 SimObjects.

The necessary companion conversion of Ruby objects generated by SLICC
are converted to M5 SimObjects in the following patch, so this patch
alone does not compile.
Conversion of Garnet network models is also handled in a separate
patch; that code is temporarily disabled from compiling to allow
testing of interim code.

1 files changed, 6 insertions, 4 deletions

diff --git a/src/mem/ruby/system/MemoryControl.hh b/src/mem/ruby/system/MemoryControl.hh
index 3419f8c40..1570e81cd 100644
--- a/src/mem/ruby/system/MemoryControl.hh
+++ b/src/mem/ruby/system/MemoryControl.hh
@@ -51,6 +51,8 @@
 #include "mem/protocol/MemoryMsg.hh"
 #include "mem/ruby/common/Consumer.hh"
 #include "mem/ruby/system/AbstractMemOrCache.hh"
+#include "sim/sim_object.hh"
+#include "params/RubyMemoryControl.hh"
 
 #include <list>
 
@@ -62,12 +64,13 @@
 
 class Consumer;
 
-class MemoryControl : public Consumer, public AbstractMemOrCache {
+class MemoryControl : public SimObject, public Consumer, public AbstractMemOrCache {
 public:
 
   // Constructors
-  MemoryControl(const string & name);
-  void init(const vector<string> & argv);
+    typedef RubyMemoryControlParams Params;
+    MemoryControl(const Params *p);
+  void init();
 
   // Destructor
   ~MemoryControl ();
@@ -122,7 +125,6 @@ private:
   Consumer* m_consumer_ptr;  // Consumer to signal a wakeup()
   string m_name;
   string m_description;
-  int m_version;
   int m_msg_counter;
   int m_awakened;