ruby: removed all refs to old RubyConfig

6 files changed, 2 insertions, 27 deletions

diff --git a/src/mem/ruby/common/Address.hh b/src/mem/ruby/common/Address.hh
index b6899d1ac..c48152354 100644
--- a/src/mem/ruby/common/Address.hh
+++ b/src/mem/ruby/common/Address.hh
@@ -107,16 +107,6 @@ private:
 inline
 Address line_address(const Address& addr) { Address temp(addr); temp.makeLineAddress(); return temp; }
 
-/*
-inline
-Address next_stride_address(const Address& addr, int stride) {
-  Address temp = addr;
-  temp.makeNextStrideAddress(stride);
-  temp.setAddress(temp.maskHighOrderBits(ADDRESS_WIDTH-RubyConfig::memorySizeBits()));  // surpress wrap-around problem
-  return temp;
-}
-*/
-
 // Output operator declaration
 ostream& operator<<(ostream& out, const Address& obj);
 // comparison operator declaration
@@ -207,17 +197,6 @@ integer_t Address::memoryModuleIndex() const
 {
   integer_t index = bitSelect(RubySystem::getBlockSizeBits()+RubySystem::getMemorySizeBits(), ADDRESS_WIDTH);
   assert (index >= 0);
-  /*
-  if (index >= RubyConfig::memoryModuleBlocks()) {
-    cerr << " memoryBits: " << RubySystem::getMemorySizeBits() << " memorySizeBits: " << RubySystem::getMemorySizeBits()
-         << " Address: " << "[" << hex << "0x" << m_address << "," << " line 0x" << maskLowOrderBits(RubySystem::getBlockSizeBits()) << dec << "]" << flush
-         << "error: limit exceeded. " <<
-      " getDataBlockBits: " << RubySystem::getBlockSizeBits() <<
-      " memoryModuleBlocks: " << RubyConfig::memoryModuleBlocks() <<
-      " index: " << index << endl;
-  }
-  assert (index < RubyConfig::memoryModuleBlocks());
-  */
   return index;
 
   //  Index indexHighPortion = address.bitSelect(MEMORY_SIZE_BITS-1, PAGE_SIZE_BITS+NUMBER_OF_MEMORY_MODULE_BITS);
diff --git a/src/mem/ruby/common/NetDest.cc b/src/mem/ruby/common/NetDest.cc
index 390d5ee8e..32771235f 100644
--- a/src/mem/ruby/common/NetDest.cc
+++ b/src/mem/ruby/common/NetDest.cc
@@ -37,7 +37,6 @@
  */
 
 #include "mem/ruby/common/NetDest.hh"
-#include "mem/ruby/config/RubyConfig.hh"
 #include "mem/protocol/Protocol.hh"
 
 NetDest::NetDest()
diff --git a/src/mem/ruby/common/NetDest.hh b/src/mem/ruby/common/NetDest.hh
index 20aac5108..1dcee7b7a 100644
--- a/src/mem/ruby/common/NetDest.hh
+++ b/src/mem/ruby/common/NetDest.hh
@@ -48,7 +48,6 @@
 #include "mem/gems_common/Vector.hh"
 #include "mem/ruby/system/NodeID.hh"
 #include "mem/ruby/system/MachineID.hh"
-#include "mem/ruby/config/RubyConfig.hh"
 #include "mem/ruby/common/Set.hh"
 #include "mem/protocol/MachineType.hh"
 
diff --git a/src/mem/ruby/common/Set.cc b/src/mem/ruby/common/Set.cc
index 2c64ad3bc..f7dd24356 100644
--- a/src/mem/ruby/common/Set.cc
+++ b/src/mem/ruby/common/Set.cc
@@ -41,7 +41,6 @@
 
 #include "mem/ruby/common/Set.hh"
 #include "mem/ruby/system/System.hh"
-#include "mem/ruby/config/RubyConfig.hh"
 
 #if __amd64__ || __LP64__
 #define __64BITS__
@@ -512,7 +511,7 @@ void Set::setSize(int size)
 #endif // __32BITS__
 
   // decide whether to use dynamic or static alloction
-  if(m_nArrayLen<=NUMBER_WORDS_PER_SET) { // constant defined in RubyConfig.hh
+  if(m_nArrayLen<=NUMBER_WORDS_PER_SET) { // constant defined in RubySystem.hh
     // its OK to use the static allocation, and it will
     // probably be faster (as m_nArrayLen is already in the
     // cache and they will probably share the same cache line)
diff --git a/src/mem/ruby/common/Set.hh b/src/mem/ruby/common/Set.hh
index 43fa5b45e..a22da914c 100644
--- a/src/mem/ruby/common/Set.hh
+++ b/src/mem/ruby/common/Set.hh
@@ -45,10 +45,10 @@
 #ifndef SET_H
 #define SET_H
 
+#include "mem/ruby/system/System.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/gems_common/Vector.hh"
 #include "mem/ruby/system/NodeID.hh"
-#include "mem/ruby/config/RubyConfig.hh"
 
 // gibson 05/20/05
 // enum PresenceBit {NotPresent, Present};
diff --git a/src/mem/ruby/common/SubBlock.hh b/src/mem/ruby/common/SubBlock.hh
index 3bc09e1d0..753666a17 100644
--- a/src/mem/ruby/common/SubBlock.hh
+++ b/src/mem/ruby/common/SubBlock.hh
@@ -37,7 +37,6 @@
 
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/common/Address.hh"
-#include "mem/ruby/config/RubyConfig.hh"
 #include "mem/ruby/common/DataBlock.hh"
 #include "mem/gems_common/Vector.hh"