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

diff --git a/src/mem/ruby/common/Debug.hh b/src/mem/ruby/common/Debug.hh
index 03e123866..5fb4d412f 100644
--- a/src/mem/ruby/common/Debug.hh
+++ b/src/mem/ruby/common/Debug.hh
@@ -41,6 +41,9 @@
 
 #include "config/ruby_debug.hh"
 #include "mem/ruby/common/Global.hh"
+#include "sim/sim_object.hh"
+
+#include "params/RubyDebug.hh"
 
 extern std::ostream * debug_cout_ptr;
 
@@ -70,13 +73,11 @@ enum DebugComponents
 enum PriorityLevel {HighPrio, MedPrio, LowPrio};
 enum VerbosityLevel {No_Verb, Low_Verb, Med_Verb, High_Verb};
 
-class Debug {
+class Debug : public SimObject {
 public:
   // Constructors
-  Debug();
-  Debug(const std::string & name, const std::vector<std::string> & argv);
-  Debug( const char *filterString, const char *verboseString,
-         Time filterStartTime, const char *filename );
+    typedef RubyDebugParams Params;
+  Debug(const Params *p);
 
   // Destructor
   ~Debug();