Minor fixes for compiling

diff --git a/src/mem/ruby/common/DataBlock.hh b/src/mem/ruby/common/DataBlock.hh
index c7dba8ae8c55e8b44df2eb6556bb89fca59dd856..01194c0ac884a94d7d915514ed76b0841fc4a646 100644 (file)
--- a/src/mem/ruby/common/DataBlock.hh
+++ b/src/mem/ruby/common/DataBlock.hh
@@ -58,7 +58,7 @@ class DataBlock {
   void setByte(int whichByte, uint8 data);
   const uint8* getBlock() const;
   uint8* copyData(uint8* dest, int offset, int size) const;
-  void setBlock(uint8* data) { setData(data, 0, System::getBlockSizeBytes()); } 
+  void setBlock(uint8* data) { setData(data, 0, RubySystem::getBlockSizeBytes()); } 
   void setData(uint8* data, int offset, int len);
   void copyPartial(const DataBlock & dblk, int offset, int len);
   bool equal(const DataBlock& obj) const;

diff --git a/src/mem/ruby/system/CacheMemory.hh b/src/mem/ruby/system/CacheMemory.hh
index cde5b6d9432b94557b2be52f0ee2dbd181f0c14b..625d5ce59eed45f293fbd43c00eaf4c851d46491 100644 (file)
--- a/src/mem/ruby/system/CacheMemory.hh
+++ b/src/mem/ruby/system/CacheMemory.hh
@@ -551,6 +551,8 @@ void CacheMemory::changePermission(const Address& address, AccessPermission new_
 {
   assert(address == line_address(address));
   lookup(address).m_Permission = new_perm;
+  Index cacheSet = addressToCacheSet(address);
+  int loc = findTagInSet(cacheSet, address);
   m_locked[cacheSet][loc] = -1; 
   assert(getPermission(address) == new_perm);
 }

diff --git a/src/mem/rubymem.cc b/src/mem/rubymem.cc
index 62685a71bd024144cf9d6b082ff0af4925fe248e..a4aec4c0a366e3ad63d09260d4af9467afaf8e3a 100644 (file)
--- a/src/mem/rubymem.cc
+++ b/src/mem/rubymem.cc
@@ -230,8 +230,8 @@ RubyMemory::Port::recvTiming(PacketPtr pkt)
         }
     } else if (pkt->isWrite()) {
         type = RubyRequestType_ST;
-    } else if (pkt->isReadWrite()) {
-        type = RubyRequestType_RMW;
+//    } else if (pkt->isReadWrite()) {
+//        type = RubyRequestType_RMW;
     }
 
     RubyRequest ruby_request(pkt->getAddr(), pkt->getPtr<uint8_t>(),