From: Polina Dudnik <pdudnik@gmail.com>
Date: Mon, 13 Jul 2009 16:59:13 +0000 (-0500)
Subject: Minor fixes for compiling
X-Git-Tag: Calvin_Submission~209^2~14
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c66af9f47400a7768de7cd6cb47fe757a601e445;p=gem5.git

Minor fixes for compiling
---

diff --git a/src/mem/ruby/common/DataBlock.hh b/src/mem/ruby/common/DataBlock.hh
index c7dba8ae8..01194c0ac 100644
--- 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 cde5b6d94..625d5ce59 100644
--- 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 62685a71b..a4aec4c0a 100644
--- 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>(),