Fix functional access errors related to delayed respnoses in cachePort
src/mem/cache/base_cache.cc:
On a delayed response, be sure to call the fixPacket wrapper to toggle hasData flag.
src/mem/packet.cc:
src/mem/packet.hh:
Create a wrapper to toggle the hasData flag on delayed responses
--HG--
extra : convert_revision : 1ced8d4e3dc12a059fb7636d59e429cd3dd46901
This commit is contained in:
11
src/mem/cache/base_cache.cc
vendored
11
src/mem/cache/base_cache.cc
vendored
@@ -114,6 +114,8 @@ BaseCache::CachePort::checkFunctional(PacketPtr pkt)
|
||||
// If the target contains data, and it overlaps the
|
||||
// probed request, need to update data
|
||||
if (target->intersect(pkt)) {
|
||||
DPRINTF(Cache, "Functional %s access to blk_addr %x intersects a drain\n",
|
||||
pkt->cmdString(), pkt->getAddr() & ~(cache->getBlockSize() - 1));
|
||||
notDone = fixPacket(pkt, target);
|
||||
}
|
||||
i++;
|
||||
@@ -126,8 +128,11 @@ BaseCache::CachePort::checkFunctional(PacketPtr pkt)
|
||||
PacketPtr target = j->second;
|
||||
// If the target contains data, and it overlaps the
|
||||
// probed request, need to update data
|
||||
if (target->intersect(pkt))
|
||||
notDone = fixPacket(pkt, target);
|
||||
if (target->intersect(pkt)) {
|
||||
DPRINTF(Cache, "Functional %s access to blk_addr %x intersects a response\n",
|
||||
pkt->cmdString(), pkt->getAddr() & ~(cache->getBlockSize() - 1));
|
||||
notDone = fixDelayedResponsePacket(pkt, target);
|
||||
}
|
||||
j++;
|
||||
}
|
||||
return notDone;
|
||||
@@ -348,7 +353,7 @@ BaseCache::CacheEvent::process()
|
||||
}
|
||||
return;
|
||||
}
|
||||
//Else it's a response Response
|
||||
//Else it's a response
|
||||
assert(cachePort->transmitList.size());
|
||||
assert(cachePort->transmitList.front().first <= curTick);
|
||||
pkt = cachePort->transmitList.front().second;
|
||||
|
||||
Reference in New Issue
Block a user