diff options
| author | Polina Dudnik <pdudnik@gmail.com> | 2009-07-13 11:59:13 -0500 |
|---|---|---|
| committer | Polina Dudnik <pdudnik@gmail.com> | 2009-07-13 11:59:13 -0500 |
| commit | c66af9f47400a7768de7cd6cb47fe757a601e445 (patch) | |
| tree | 66c3d2cf1a4b84ab4946a157b612868b33053ff4 /src/mem | |
| parent | 7606c71ea593f46843a0fa91983ae89139271728 (diff) | |
| download | gem5-c66af9f47400a7768de7cd6cb47fe757a601e445.tar.xz | |
Minor fixes for compiling
Diffstat (limited to 'src/mem')
| -rw-r--r-- | src/mem/ruby/common/DataBlock.hh | 2 | ||||
| -rw-r--r-- | src/mem/ruby/system/CacheMemory.hh | 2 | ||||
| -rw-r--r-- | src/mem/rubymem.cc | 4 |
3 files changed, 5 insertions, 3 deletions
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>(), |