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

Merge zizzer:/n/wexford/x/gblack/m5/newmem_bus

Browse source 
into  zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest

--HG--
extra : convert_revision : 7b7a1b03ffed36bce49595962ea57c08d1d1a4ad
This commit is contained in:
Ron Dreslinski 2006-10-10 17:32:24 -04:00
parent 549412b333 aff3d92c00
commit 27c59dc370
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mem/cache/base_cache.cc vendored
View file

@ -221,6 +221,7 @@ BaseCache::CacheEvent::process()
} }
else if (!cachePort->isCpuSide) else if (!cachePort->isCpuSide)
{ {
assert(cachePort->cache->doMasterRequest());
//MSHR //MSHR
pkt = cachePort->cache->getPacket(); pkt = cachePort->cache->getPacket();
MSHR* mshr = (MSHR*) pkt->senderState; MSHR* mshr = (MSHR*) pkt->senderState;
@ -238,6 +239,7 @@ BaseCache::CacheEvent::process()
} }
else else
{ {
assert(cachePort->cache->doSlaveRequest());
//CSHR //CSHR
pkt = cachePort->cache->getCoherencePacket(); pkt = cachePort->cache->getCoherencePacket();
bool success = cachePort->sendTiming(pkt); bool success = cachePort->sendTiming(pkt);

2
src/mem/cache/base_cache.hh vendored
View file

@ -467,7 +467,7 @@ class BaseCache : public MemObject
*/ */
void setMasterRequest(RequestCause cause, Tick time) void setMasterRequest(RequestCause cause, Tick time)
{ {
if (!doMasterRequest() && memSidePort->drainList.empty()) if (!doMasterRequest() && !memSidePort->waitingOnRetry)
{ {
BaseCache::CacheEvent * reqCpu = new BaseCache::CacheEvent(memSidePort); BaseCache::CacheEvent * reqCpu = new BaseCache::CacheEvent(memSidePort);
reqCpu->schedule(time); reqCpu->schedule(time);