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, 8 insertions, 3 deletions

diff --git a/src/mem/ruby/system/CacheMemory.hh b/src/mem/ruby/system/CacheMemory.hh
index 8b84f33ec..fac076da9 100644
--- a/src/mem/ruby/system/CacheMemory.hh
+++ b/src/mem/ruby/system/CacheMemory.hh
@@ -38,6 +38,9 @@
 #ifndef CACHEMEMORY_H
 #define CACHEMEMORY_H
 
+#include "sim/sim_object.hh"
+#include "params/RubyCache.hh"
+
 #include "mem/ruby/common/Global.hh"
 #include "mem/protocol/AccessPermission.hh"
 #include "mem/ruby/common/Address.hh"
@@ -57,12 +60,14 @@
 #include "base/hashmap.hh"
 #include <vector>
 
-class CacheMemory {
+class CacheMemory : public SimObject {
 public:
 
+    typedef RubyCacheParams Params;
   // Constructors
-  CacheMemory(const string & name);
-  void init(const vector<string> & argv);
+  CacheMemory(const Params *p);
+    // CacheMemory(const string & name);
+  void init();
 
   // Destructor
   ~CacheMemory();