mem: Properly set cache block status fields on writebacks

When a cacheline is written back to a lower-level cache,
tags->insertBlock() sets various status parameters. However these
status bits were cleared immediately after calling. This patch makes
it so that these status fields are not cleared by moving them outside
of the tags->insertBlock() call.
This commit is contained in:
Mitch Hayenga 2014-08-13 06:57:24 -04:00
parent 66904b9584
commit f6f6ae461e
2 changed files with 7 additions and 4 deletions

View file

@ -336,7 +336,11 @@ Cache<TagStore>::access(PacketPtr pkt, BlkType *&blk,
return false;
}
tags->insertBlock(pkt, blk);
blk->status = BlkValid | BlkReadable;
blk->status = (BlkValid | BlkReadable);
if (pkt->isSecure()) {
blk->status |= BlkSecure;
}
}
std::memcpy(blk->data, pkt->getPtr<uint8_t>(), blkSize);
blk->status |= BlkDirty;

View file

@ -247,7 +247,7 @@ public:
Addr addr = pkt->getAddr();
MasterID master_id = pkt->req->masterId();
uint32_t task_id = pkt->req->taskId();
bool is_secure = pkt->isSecure();
if (!blk->isTouched) {
tagsInUse++;
blk->isTouched = true;
@ -275,10 +275,9 @@ public:
}
blk->isTouched = true;
// Set tag for new block. Caller is responsible for setting status.
blk->tag = extractTag(addr);
if (is_secure)
blk->status |= BlkSecure;
// deal with what we are bringing in
assert(master_id < cache->system->maxMasters());