diff options
Diffstat (limited to 'src/mem/cache')
-rw-r--r-- | src/mem/cache/cache.cc | 14 | ||||
-rw-r--r-- | src/mem/cache/mshr.cc | 16 |
2 files changed, 25 insertions, 5 deletions
diff --git a/src/mem/cache/cache.cc b/src/mem/cache/cache.cc index 991463d76..9050a1c30 100644 --- a/src/mem/cache/cache.cc +++ b/src/mem/cache/cache.cc @@ -185,7 +185,11 @@ Cache::satisfyCpuSideRequest(PacketPtr pkt, CacheBlk *blk, if (pkt->isLLSC()) { blk->trackLoadLocked(pkt); } + + // all read responses have a data payload + assert(pkt->hasRespData()); pkt->setDataFromBlock(blk->data, blkSize); + // determine if this read is from a (coherent) cache, or not // by looking at the command type; we could potentially add a // packet attribute such as 'FromCache' to make this check a @@ -796,10 +800,7 @@ Cache::recvTimingReq(PacketPtr pkt) } pkt->makeTimingResponse(); - // for debugging, set all the bits in the response data - // (also keeps valgrind from complaining when debugging settings - // print out instruction results) - std::memset(pkt->getPtr<uint8_t>(), 0xFF, pkt->getSize()); + // request_time is used here, taking into account lat and the delay // charged if the packet comes from the xbar. cpuSidePort->schedTimingResp(pkt, request_time, true); @@ -2041,7 +2042,10 @@ Cache::handleSnoop(PacketPtr pkt, CacheBlk *blk, bool is_timing, doTimingSupplyResponse(pkt, blk->data, is_deferred, pending_inval); } else { pkt->makeAtomicResponse(); - pkt->setDataFromBlock(blk->data, blkSize); + // packets such as upgrades do not actually have any data + // payload + if (pkt->hasData()) + pkt->setDataFromBlock(blk->data, blkSize); } } diff --git a/src/mem/cache/mshr.cc b/src/mem/cache/mshr.cc index e2141a429..1d18a2861 100644 --- a/src/mem/cache/mshr.cc +++ b/src/mem/cache/mshr.cc @@ -115,6 +115,9 @@ MSHR::TargetList::add(PacketPtr pkt, Tick readyTime, static void replaceUpgrade(PacketPtr pkt) { + // remember if the current packet has data allocated + bool has_data = pkt->hasData() || pkt->hasRespData(); + if (pkt->cmd == MemCmd::UpgradeReq) { pkt->cmd = MemCmd::ReadExReq; DPRINTF(Cache, "Replacing UpgradeReq with ReadExReq\n"); @@ -125,6 +128,19 @@ replaceUpgrade(PacketPtr pkt) pkt->cmd = MemCmd::StoreCondFailReq; DPRINTF(Cache, "Replacing StoreCondReq with StoreCondFailReq\n"); } + + if (!has_data) { + // there is no sensible way of setting the data field if the + // new command actually would carry data + assert(!pkt->hasData()); + + if (pkt->hasRespData()) { + // we went from a packet that had no data (neither request, + // nor response), to one that does, and therefore we need to + // actually allocate space for the data payload + pkt->allocate(); + } + } } |