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/profiler/Profiler.hh b/src/mem/ruby/profiler/Profiler.hh
index 673051db3..8bc8de591 100644
--- a/src/mem/ruby/profiler/Profiler.hh
+++ b/src/mem/ruby/profiler/Profiler.hh
@@ -71,6 +71,9 @@
 #include "mem/protocol/GenericRequestType.hh"
 #include "mem/ruby/system/MemoryControl.hh"
 
+#include "params/RubyProfiler.hh"
+#include "sim/sim_object.hh"
+
 class CacheMsg;
 class AddressProfiler;
 
@@ -99,10 +102,11 @@ struct memory_control_profiler {
 };
 
 
-class Profiler : public Consumer {
+class Profiler : public SimObject, public Consumer {
 public:
   // Constructors
-  Profiler(const string & name);
+    typedef RubyProfilerParams Params;
+  Profiler(const Params *);
 
   void init(const vector<string> & argv, vector<string> memory_control_names);
 
@@ -260,8 +264,6 @@ private:
   //added by SS
   bool m_hot_lines;
   bool m_all_instructions;
-  string m_name;
-
 };
 
 // Output operator declaration