changeset 71a683318799 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=71a683318799
description:
ruby: Removed System name clash by renaming ruby's System to RubySystem
diffstat:
14 files changed, 35 insertions(+), 35 deletions(-)
src/mem/ruby/common/Driver.hh | 2 +-
src/mem/ruby/common/Global.cc | 2 +-
src/mem/ruby/common/Global.hh | 4 ++--
src/mem/ruby/init.cc | 2 +-
src/mem/ruby/profiler/Profiler.cc | 2 +-
src/mem/ruby/slicc_interface/AbstractChip.hh | 2 +-
src/mem/ruby/system/System.cc | 22 +++++++++++-----------
src/mem/ruby/system/System.hh | 16 ++++++++--------
src/mem/ruby/tester/DeterministicDriver.cc | 2 +-
src/mem/ruby/tester/DeterministicDriver.hh | 4 ++--
src/mem/ruby/tester/SyntheticDriver.cc | 2 +-
src/mem/ruby/tester/SyntheticDriver.hh | 4 ++--
src/mem/ruby/tester/Tester.cc | 2 +-
src/mem/ruby/tester/Tester.hh | 4 ++--
diffs (truncated from 305 to 300 lines):
diff -r e9a8bb75c3a8 -r 71a683318799 src/mem/ruby/common/Driver.hh
--- a/src/mem/ruby/common/Driver.hh Mon May 11 10:38:44 2009 -0700
+++ b/src/mem/ruby/common/Driver.hh Mon May 11 10:38:44 2009 -0700
@@ -35,7 +35,7 @@
#include "NodeID.hh"
#include "CacheRequestType.hh"
-class System;
+class RubySystem;
class SubBlock;
class Address;
class MachineID;
diff -r e9a8bb75c3a8 -r 71a683318799 src/mem/ruby/common/Global.cc
--- a/src/mem/ruby/common/Global.cc Mon May 11 10:38:44 2009 -0700
+++ b/src/mem/ruby/common/Global.cc Mon May 11 10:38:44 2009 -0700
@@ -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 -r e9a8bb75c3a8 -r 71a683318799 src/mem/ruby/common/Global.hh
--- a/src/mem/ruby/common/Global.hh Mon May 11 10:38:44 2009 -0700
+++ b/src/mem/ruby/common/Global.hh Mon May 11 10:38:44 2009 -0700
@@ -92,8 +92,8 @@
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 -r e9a8bb75c3a8 -r 71a683318799 src/mem/ruby/init.cc
--- a/src/mem/ruby/init.cc Mon May 11 10:38:44 2009 -0700
+++ b/src/mem/ruby/init.cc Mon May 11 10:38:44 2009 -0700
@@ -219,7 +219,7 @@
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 -r e9a8bb75c3a8 -r 71a683318799 src/mem/ruby/profiler/Profiler.cc
--- a/src/mem/ruby/profiler/Profiler.cc Mon May 11 10:38:44 2009 -0700
+++ b/src/mem/ruby/profiler/Profiler.cc Mon May 11 10:38:44 2009 -0700
@@ -819,7 +819,7 @@
} // XACT_MEMORY
if (!short_stats) {
- out << "Request vs. System State Profile" << endl;
+ out << "Request vs. RubySystem State Profile" << endl;
out << "--------------------------------" << endl;
out << endl;
diff -r e9a8bb75c3a8 -r 71a683318799
src/mem/ruby/slicc_interface/AbstractChip.hh
--- a/src/mem/ruby/slicc_interface/AbstractChip.hh Mon May 11 10:38:44
2009 -0700
+++ b/src/mem/ruby/slicc_interface/AbstractChip.hh Mon May 11 10:38:44
2009 -0700
@@ -69,7 +69,7 @@
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 -r e9a8bb75c3a8 -r 71a683318799 src/mem/ruby/system/System.cc
--- a/src/mem/ruby/system/System.cc Mon May 11 10:38:44 2009 -0700
+++ b/src/mem/ruby/system/System.cc Mon May 11 10:38:44 2009 -0700
@@ -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()
+RubySystem::~RubySystem()
{
for (int i = 0; i < m_chip_vector.size(); i++) {
delete m_chip_vector[i];
@@ -142,19 +142,19 @@
*/
}
-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 @@
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::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 @@
// 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 -r e9a8bb75c3a8 -r 71a683318799 src/mem/ruby/system/System.hh
--- a/src/mem/ruby/system/System.hh Mon May 11 10:38:44 2009 -0700
+++ b/src/mem/ruby/system/System.hh Mon May 11 10:38:44 2009 -0700
@@ -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 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 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 @@
};
// 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 -r e9a8bb75c3a8 -r 71a683318799 src/mem/ruby/tester/DeterministicDriver.cc
--- a/src/mem/ruby/tester/DeterministicDriver.cc Mon May 11 10:38:44
2009 -0700
+++ b/src/mem/ruby/tester/DeterministicDriver.cc Mon May 11 10:38:44
2009 -0700
@@ -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 -r e9a8bb75c3a8 -r 71a683318799 src/mem/ruby/tester/DeterministicDriver.hh
--- a/src/mem/ruby/tester/DeterministicDriver.hh Mon May 11 10:38:44
2009 -0700
+++ b/src/mem/ruby/tester/DeterministicDriver.hh Mon May 11 10:38:44
2009 -0700
@@ -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 -r e9a8bb75c3a8 -r 71a683318799 src/mem/ruby/tester/SyntheticDriver.cc
--- a/src/mem/ruby/tester/SyntheticDriver.cc Mon May 11 10:38:44 2009 -0700
+++ b/src/mem/ruby/tester/SyntheticDriver.cc Mon May 11 10:38:44 2009 -0700
@@ -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 -r e9a8bb75c3a8 -r 71a683318799 src/mem/ruby/tester/SyntheticDriver.hh
--- a/src/mem/ruby/tester/SyntheticDriver.hh Mon May 11 10:38:44 2009 -0700
+++ b/src/mem/ruby/tester/SyntheticDriver.hh Mon May 11 10:38:44 2009 -0700
@@ -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 -r e9a8bb75c3a8 -r 71a683318799 src/mem/ruby/tester/Tester.cc
--- a/src/mem/ruby/tester/Tester.cc Mon May 11 10:38:44 2009 -0700
+++ b/src/mem/ruby/tester/Tester.cc Mon May 11 10:38:44 2009 -0700
@@ -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 -r e9a8bb75c3a8 -r 71a683318799 src/mem/ruby/tester/Tester.hh
--- a/src/mem/ruby/tester/Tester.hh Mon May 11 10:38:44 2009 -0700
+++ b/src/mem/ruby/tester/Tester.hh Mon May 11 10:38:44 2009 -0700
@@ -42,12 +42,12 @@
#include "CheckTable.hh"
#include "CacheRequestType.hh"
-class System;
+class RubySystem;
class Tester : public Driver, public Consumer {
public:
// Constructors
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
