Merge zizzer:/z/m5/Bitkeeper/newmem

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

--HG--
extra : convert_revision : 3be1aa4892aa8bbd458bdc5538bbcbd6c1ebe299
This commit is contained in:
Ron Dreslinski 2006-07-11 15:42:49 -04:00
commit 2b7e685268

View file

@ -357,6 +357,8 @@ DefaultFetch<Impl>::processCacheCompletion(PacketPtr pkt)
return;
}
memcpy(cacheData[tid], pkt->getPtr<uint8_t *>(), cacheBlkSize);
if (!drainPending) {
// Wake up the CPU (if it went to sleep and was waiting on
// this completion event).
@ -548,7 +550,7 @@ DefaultFetch<Impl>::fetchCacheLine(Addr fetch_PC, Fault &ret_fault, unsigned tid
// Build packet here.
PacketPtr data_pkt = new Packet(mem_req,
Packet::ReadReq, Packet::Broadcast);
data_pkt->dataStatic(cacheData[tid]);
data_pkt->dataDynamic(new uint8_t[cacheBlkSize]);
DPRINTF(Fetch, "Fetch: Doing instruction read.\n");