ruby: Removed System name clash by renaming ruby's System to RubySystem

diff --git a/src/mem/ruby/common/Driver.hh b/src/mem/ruby/common/Driver.hh
index 911cb742b77d8399a1ef4aacf54e70572b002d34..1d5b883ac775c8b63e9e9f0a5e1ecbd2f6a1b7bd 100644 (file)
--- a/src/mem/ruby/common/Driver.hh
+++ b/src/mem/ruby/common/Driver.hh
@@ -35,7 +35,7 @@
 #include "NodeID.hh"
 #include "CacheRequestType.hh"
 
-class System;
+class RubySystem;
 class SubBlock;
 class Address;
 class MachineID;

diff --git a/src/mem/ruby/common/Global.cc b/src/mem/ruby/common/Global.cc
index e60cd4fd3191e38f98ce9212f52c66c99374386c..4ebcd93cec88efe49de2cde6bd3623b83a3ea780 100644 (file)
--- a/src/mem/ruby/common/Global.cc
+++ b/src/mem/ruby/common/Global.cc
@@ -30,6 +30,6 @@
 #include "Global.hh"
 
 EventQueue* g_eventQueue_ptr = NULL;
-System* g_system_ptr = NULL;
+RubySystem* g_system_ptr = NULL;
 Debug* g_debug_ptr = NULL;
 

diff --git a/src/mem/ruby/common/Global.hh b/src/mem/ruby/common/Global.hh
index eaec05d4625a83574d2a30726cf7fa19ec04c1fa..2977e696dce67451e42d9cde8f6147cb4b3ae45a 100644 (file)
--- a/src/mem/ruby/common/Global.hh
+++ b/src/mem/ruby/common/Global.hh
@@ -92,8 +92,8 @@ typedef int LinkID;
 class EventQueue;
 extern EventQueue* g_eventQueue_ptr;
 
-class System;
-extern System* g_system_ptr;
+class RubySystem;
+extern RubySystem* g_system_ptr;
 
 class Debug;
 extern Debug* g_debug_ptr;

diff --git a/src/mem/ruby/init.cc b/src/mem/ruby/init.cc
index 5efc8f691f3b0af31b6adf23552e50d8eb4fd534..e230bb5916b87a9d510538882e15f2437fa546ee 100644 (file)
--- a/src/mem/ruby/init.cc
+++ b/src/mem/ruby/init.cc
@@ -219,7 +219,7 @@ void init_simulator()
   cout << "Creating system..." << endl;
   cout << "  Processors: " << RubyConfig::numberOfProcessors() << endl;
 
-  g_system_ptr = new System;
+  g_system_ptr = new RubySystem;
   cout << "Creating system done" << endl;
 
   // if opal is loaded, its static interface object (inst) will be non-null,

diff --git a/src/mem/ruby/profiler/Profiler.cc b/src/mem/ruby/profiler/Profiler.cc
index 46c6c37bc22f62757d61f7cd00ece862d04020f1..9bb4b6b4c22904d1912125d9e4526d0656e872e4 100644 (file)
--- a/src/mem/ruby/profiler/Profiler.cc
+++ b/src/mem/ruby/profiler/Profiler.cc
@@ -819,7 +819,7 @@ void Profiler::printStats(ostream& out, bool short_stats)
   } // XACT_MEMORY
 
   if (!short_stats) {
-    out << "Request vs. System State Profile" << endl;
+    out << "Request vs. RubySystem State Profile" << endl;
     out << "--------------------------------" << endl;
     out << endl;
 

diff --git a/src/mem/ruby/slicc_interface/AbstractChip.hh b/src/mem/ruby/slicc_interface/AbstractChip.hh
index 9d113a1e15383478230ff7aa52619a3fcdb15b89..05039d09d346ab482f69b8f5063a72732d57eb31 100644 (file)
--- a/src/mem/ruby/slicc_interface/AbstractChip.hh
+++ b/src/mem/ruby/slicc_interface/AbstractChip.hh
@@ -69,7 +69,7 @@ public:
   TransactionInterfaceManager* getTransactionInterfaceManager(int index) const { return m_L1Cache_xact_mgr_vec[index]; };
   void setTransactionInterfaceManager(TransactionInterfaceManager* manager, int index) { m_L1Cache_xact_mgr_vec[index] = manager; }
 
-  // used when CHECK_COHERENCE is enabled.  See System::checkGlobalCoherence()
+  // used when CHECK_COHERENCE is enabled.  See RubySystem::checkGlobalCoherence()
   virtual bool isBlockExclusive(const Address& addr) const { return false; }
   virtual bool isBlockShared(const Address& addr) const { return false; }
 

diff --git a/src/mem/ruby/system/System.cc b/src/mem/ruby/system/System.cc
index 6352d8a581992ad2b585c2fdc7e011a671f5f510..74d4ef90f09828fc1f1b8061896abc2f60dfeb2a 100644 (file)
--- a/src/mem/ruby/system/System.cc
+++ b/src/mem/ruby/system/System.cc
@@ -28,9 +28,9 @@
  */
 
 /*
- * System.C
+ * RubySystem.C
  *
- * Description: See System.h
+ * Description: See RubySystem.h
  *
  * $Id$
  *
@@ -52,7 +52,7 @@
 //#include "XactVisualizer.hh"
 #include "M5Driver.hh"
 
-System::System()
+RubySystem::RubySystem()
 {
   DEBUG_MSG(SYSTEM_COMP, MedPrio,"initializing");
 
@@ -129,7 +129,7 @@ System::System()
 
 }
 
-System::~System()
+RubySystem::~RubySystem()
 {
   for (int i = 0; i < m_chip_vector.size(); i++) {
     delete m_chip_vector[i];
@@ -142,19 +142,19 @@ System::~System()
  */
 }
 
-void System::printConfig(ostream& out) const
+void RubySystem::printConfig(ostream& out) const
 {
-  out << "\n================ Begin System Configuration Print ================\n\n";
+  out << "\n================ Begin RubySystem Configuration Print ================\n\n";
   RubyConfig::printConfiguration(out);
   out << endl;
   getChip(0)->printConfig(out);
   m_network_ptr->printConfig(out);
   m_driver_ptr->printConfig(out);
   m_profiler_ptr->printConfig(out);
-  out << "\n================ End System Configuration Print ================\n\n";
+  out << "\n================ End RubySystem Configuration Print ================\n\n";
 }
 
-void System::printStats(ostream& out)
+void RubySystem::printStats(ostream& out)
 {
   const time_t T = time(NULL);
   tm *localTime = localtime(&T);
@@ -174,7 +174,7 @@ void System::printStats(ostream& out)
   Chip::printStats(out);
 }
 
-void System::clearStats() const
+void RubySystem::clearStats() const
 {
   m_profiler_ptr->clearStats();
   m_network_ptr->clearStats();
@@ -187,7 +187,7 @@ void System::clearStats() const
   }
 }
 
-void System::recordCacheContents(CacheRecorder& tr) const
+void RubySystem::recordCacheContents(CacheRecorder& tr) const
 {
   for (int i = 0; i < m_chip_vector.size(); i++) {
     for (int m_version = 0; m_version < RubyConfig::numberOfProcsPerChip(); m_version++) {
@@ -220,7 +220,7 @@ void System::opalLoadNotify()
 // in setState.  The SLICC spec must also define methods "isBlockShared"
 // and "isBlockExclusive" that are specific to that protocol
 //
-void System::checkGlobalCoherenceInvariant(const Address& addr  )  {
+void RubySystem::checkGlobalCoherenceInvariant(const Address& addr  )  {
 
   NodeID exclusive = -1;
   bool sharedDetected = false;

diff --git a/src/mem/ruby/system/System.hh b/src/mem/ruby/system/System.hh
index 350f74468d764e98083fcaa26dde81758792b018..b4aa257a341643e0c1adc653bd0661374205a1b0 100644 (file)
--- a/src/mem/ruby/system/System.hh
+++ b/src/mem/ruby/system/System.hh
@@ -28,7 +28,7 @@
  */
 
 /*
- * System.h
+ * RubySystem.h
  *
  * Description: Contains all of the various parts of the system we are
  * simulating.  Performs allocation, deallocation, and setup of all
@@ -59,13 +59,13 @@ class XactCommitArbiter;
 class XactVisualizer;
 class TransactionInterfaceManager;
 
-class System {
+class RubySystem {
 public:
   // Constructors
-  System();
+  RubySystem();
 
   // Destructor
-  ~System();
+  ~RubySystem();
 
   // Public Methods
   int getNumProcessors() { return RubyConfig::numberOfProcessors(); }
@@ -103,8 +103,8 @@ private:
   // Private Methods
 
   // Private copy constructor and assignment operator
-  System(const System& obj);
-  System& operator=(const System& obj);
+  RubySystem(const RubySystem& obj);
+  RubySystem& operator=(const RubySystem& obj);
 
   // Data Members (m_ prefix)
   Network* m_network_ptr;
@@ -118,13 +118,13 @@ private:
 };
 
 // Output operator declaration
-ostream& operator<<(ostream& out, const System& obj);
+ostream& operator<<(ostream& out, const RubySystem& obj);
 
 // ******************* Definitions *******************
 
 // Output operator definition
 inline
-ostream& operator<<(ostream& out, const System& obj)
+ostream& operator<<(ostream& out, const RubySystem& obj)
 {
 //  obj.print(out);
   out << flush;

diff --git a/src/mem/ruby/tester/DeterministicDriver.cc b/src/mem/ruby/tester/DeterministicDriver.cc
index dd0507201158618ae3087c63f2b8b69260711f08..d5277f59a76ee0d5b86192ac953d71ce79f446a2 100644 (file)
--- a/src/mem/ruby/tester/DeterministicDriver.cc
+++ b/src/mem/ruby/tester/DeterministicDriver.cc
@@ -43,7 +43,7 @@
 #include "SubBlock.hh"
 #include "Chip.hh"
 
-DeterministicDriver::DeterministicDriver(System* sys_ptr)
+DeterministicDriver::DeterministicDriver(RubySystem* sys_ptr)
 {
   if (g_SIMICS) {
     ERROR_MSG("g_SIMICS should not be defined.");

diff --git a/src/mem/ruby/tester/DeterministicDriver.hh b/src/mem/ruby/tester/DeterministicDriver.hh
index 3d0bae73dae5f6cc9ff273b9edb54f3ff06ab381..d501a2fce67b307d01856f4a15db7f1aae647226 100644 (file)
--- a/src/mem/ruby/tester/DeterministicDriver.hh
+++ b/src/mem/ruby/tester/DeterministicDriver.hh
@@ -42,13 +42,13 @@
 #include "Histogram.hh"
 #include "CacheRequestType.hh"
 
-class System;
+class RubySystem;
 class SpecifiedGenerator;
 
 class DeterministicDriver : public Driver, public Consumer {
 public:
   // Constructors
-  DeterministicDriver(System* sys_ptr);
+  DeterministicDriver(RubySystem* sys_ptr);
 
   // Destructor
   ~DeterministicDriver();

diff --git a/src/mem/ruby/tester/SyntheticDriver.cc b/src/mem/ruby/tester/SyntheticDriver.cc
index d2028ba0705b76147db1b9ca7984f14d33e6a571..2f386d6503ede005574d87850604db64affcf5ef 100644 (file)
--- a/src/mem/ruby/tester/SyntheticDriver.cc
+++ b/src/mem/ruby/tester/SyntheticDriver.cc
@@ -44,7 +44,7 @@
 #include "SubBlock.hh"
 #include "Chip.hh"
 
-SyntheticDriver::SyntheticDriver(System* sys_ptr)
+SyntheticDriver::SyntheticDriver(RubySystem* sys_ptr)
 {
   cout << "SyntheticDriver::SyntheticDriver" << endl;
   if (g_SIMICS) {

diff --git a/src/mem/ruby/tester/SyntheticDriver.hh b/src/mem/ruby/tester/SyntheticDriver.hh
index 278891ba2406f4a9bfbe17053a42f53789d1151d..20f929d8717dd34a5d0089f2a4afb4f63785149a 100644 (file)
--- a/src/mem/ruby/tester/SyntheticDriver.hh
+++ b/src/mem/ruby/tester/SyntheticDriver.hh
@@ -42,13 +42,13 @@
 #include "Histogram.hh"
 #include "CacheRequestType.hh"
 
-class System;
+class RubySystem;
 class RequestGenerator;
 
 class SyntheticDriver : public Driver, public Consumer {
 public:
   // Constructors
-  SyntheticDriver(System* sys_ptr);
+  SyntheticDriver(RubySystem* sys_ptr);
 
   // Destructor
   ~SyntheticDriver();

diff --git a/src/mem/ruby/tester/Tester.cc b/src/mem/ruby/tester/Tester.cc
index 0e6f12cdc0616cfc837e0f003fb30d66ce1145d2..9dcec1ed1552c19c31d6d70595cc7f99c077e1a3 100644 (file)
--- a/src/mem/ruby/tester/Tester.cc
+++ b/src/mem/ruby/tester/Tester.cc
@@ -40,7 +40,7 @@
 #include "Check.hh"
 #include "Chip.hh"
 
-Tester::Tester(System* sys_ptr)
+Tester::Tester(RubySystem* sys_ptr)
 {
   if (g_SIMICS) {
     ERROR_MSG("g_SIMICS should not be defined.");

diff --git a/src/mem/ruby/tester/Tester.hh b/src/mem/ruby/tester/Tester.hh
index 35563a3b4a8e942a7f11ded3fe4324f17ab6f326..76fe0684acbc3edf0113eff7580ebefe00eddc2a 100644 (file)
--- a/src/mem/ruby/tester/Tester.hh
+++ b/src/mem/ruby/tester/Tester.hh
@@ -42,12 +42,12 @@
 #include "CheckTable.hh"
 #include "CacheRequestType.hh"
 
-class System;
+class RubySystem;
 
 class Tester : public Driver, public Consumer {
 public:
   // Constructors
-  Tester(System* sys_ptr);
+  Tester(RubySystem* sys_ptr);
 
   // Destructor
   ~Tester();