sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor fixes for compiling

Browse source
This commit is contained in:
Polina Dudnik 2009-07-13 11:59:13 -05:00
parent 7606c71ea5
commit c66af9f474
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mem/ruby/common/DataBlock.hh
View file

@ -58,7 +58,7 @@ class DataBlock {
void setByte(int whichByte, uint8 data); void setByte(int whichByte, uint8 data);
const uint8* getBlock() const; const uint8* getBlock() const;
uint8* copyData(uint8* dest, int offset, int size) 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 setData(uint8* data, int offset, int len);
void copyPartial(const DataBlock & dblk, int offset, int len); void copyPartial(const DataBlock & dblk, int offset, int len);
bool equal(const DataBlock& obj) const; bool equal(const DataBlock& obj) const;

2
src/mem/ruby/system/CacheMemory.hh
View file

@ -551,6 +551,8 @@ void CacheMemory::changePermission(const Address& address, AccessPermission new_
{ {
assert(address == line_address(address)); assert(address == line_address(address));
lookup(address).m_Permission = new_perm; lookup(address).m_Permission = new_perm;
Index cacheSet = addressToCacheSet(address);
int loc = findTagInSet(cacheSet, address);
m_locked[cacheSet][loc] = -1; m_locked[cacheSet][loc] = -1;
assert(getPermission(address) == new_perm); assert(getPermission(address) == new_perm);
} }

4
src/mem/rubymem.cc
View file

@ -230,8 +230,8 @@ RubyMemory::Port::recvTiming(PacketPtr pkt)
} }
} else if (pkt->isWrite()) { } else if (pkt->isWrite()) {
type = RubyRequestType_ST; type = RubyRequestType_ST;
} else if (pkt->isReadWrite()) { // } else if (pkt->isReadWrite()) {
type = RubyRequestType_RMW; // type = RubyRequestType_RMW;
} }
RubyRequest ruby_request(pkt->getAddr(), pkt->getPtr<uint8_t>(), RubyRequest ruby_request(pkt->getAddr(), pkt->getPtr<uint8_t>(),