Merge zizzer:/n/wexford/x/gblack/m5/newmem_bus
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest --HG-- extra : convert_revision : 7b7a1b03ffed36bce49595962ea57c08d1d1a4ad
This commit is contained in:
commit
27c59dc370
2
src/mem/cache/base_cache.cc
vendored
2
src/mem/cache/base_cache.cc
vendored
|
@ -221,6 +221,7 @@ BaseCache::CacheEvent::process()
|
|||
}
|
||||
else if (!cachePort->isCpuSide)
|
||||
{
|
||||
assert(cachePort->cache->doMasterRequest());
|
||||
//MSHR
|
||||
pkt = cachePort->cache->getPacket();
|
||||
MSHR* mshr = (MSHR*) pkt->senderState;
|
||||
|
@ -238,6 +239,7 @@ BaseCache::CacheEvent::process()
|
|||
}
|
||||
else
|
||||
{
|
||||
assert(cachePort->cache->doSlaveRequest());
|
||||
//CSHR
|
||||
pkt = cachePort->cache->getCoherencePacket();
|
||||
bool success = cachePort->sendTiming(pkt);
|
||||
|
|
2
src/mem/cache/base_cache.hh
vendored
2
src/mem/cache/base_cache.hh
vendored
|
@ -467,7 +467,7 @@ class BaseCache : public MemObject
|
|||
*/
|
||||
void setMasterRequest(RequestCause cause, Tick time)
|
||||
{
|
||||
if (!doMasterRequest() && memSidePort->drainList.empty())
|
||||
if (!doMasterRequest() && !memSidePort->waitingOnRetry)
|
||||
{
|
||||
BaseCache::CacheEvent * reqCpu = new BaseCache::CacheEvent(memSidePort);
|
||||
reqCpu->schedule(time);
|
||||
|
|
Loading…
Reference in a new issue