Merge zizzer:/z/m5/Bitkeeper/newmem

into  zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/newmem

--HG--
extra : convert_revision : 8a8d7fe59610806015c8242a2f5eacf9afce7164
This commit is contained in:
Ron Dreslinski 2006-08-15 14:28:22 -04:00
commit d0d0d7b636
3 changed files with 13 additions and 1 deletions

View file

@ -71,6 +71,11 @@ BaseCache::CachePort::deviceBlockSize()
bool
BaseCache::CachePort::recvTiming(Packet *pkt)
{
if (blocked)
{
mustSendRetry = true;
return false;
}
return cache->doTimingAccess(pkt, this, isCpuSide);
}
@ -95,6 +100,11 @@ BaseCache::CachePort::setBlocked()
void
BaseCache::CachePort::clearBlocked()
{
if (mustSendRetry)
{
mustSendRetry = false;
sendRetry();
}
blocked = false;
}

View file

@ -105,6 +105,8 @@ class BaseCache : public MemObject
bool blocked;
bool mustSendRetry;
bool isCpuSide;
};

View file

@ -69,7 +69,7 @@ doTimingAccess(Packet *pkt, CachePort *cachePort, bool isCpuSide)
else
snoop(pkt);
}
return true; //Deal with blocking....
return true;
}
template<class TagStore, class Buffering, class Coherence>