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

diff --git a/src/mem/ruby/system/DirectoryMemory.hh b/src/mem/ruby/system/DirectoryMemory.hh
index 09211fd83..1575187b0 100644
--- a/src/mem/ruby/system/DirectoryMemory.hh
+++ b/src/mem/ruby/system/DirectoryMemory.hh
@@ -43,14 +43,17 @@
 #include "mem/ruby/common/Address.hh"
 #include "mem/ruby/system/MemoryVector.hh"
 #include "mem/protocol/Directory_Entry.hh"
+#include "sim/sim_object.hh"
+#include "params/RubyDirectoryMemory.hh"
 
 class AbstractController;
 
-class DirectoryMemory {
+class DirectoryMemory : public SimObject {
 public:
   // Constructors
-  DirectoryMemory(const string & name);
-  void init(const vector<string> & argv);
+    typedef RubyDirectoryMemoryParams Params;
+    DirectoryMemory(const Params *p);
+  void init();
   //  DirectoryMemory(int version);
 
   // Destructor