sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Be sure to delete packet and sender state if the cache is blocked.

Browse source 
src/cpu/o3/lsq_unit.hh:
    Be sure to delete data if the cache is blocked.

--HG--
extra : convert_revision : fafbcfb8937e85555823942e69e798e557a600e5
This commit is contained in:
Kevin Lim 2006-10-09 19:14:14 -04:00
parent af7315c7dc
commit 92bf23bed6
1 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/cpu/o3/lsq_unit.hh
View file

@ -626,7 +626,10 @@ LSQUnit<Impl>::read(Request *req, T &data, int load_idx)
++usedPorts; ++usedPorts;
PacketPtr data_pkt = new Packet(req, Packet::ReadReq, Packet::Broadcast); // if we the cache is not blocked, do cache access
if (!lsq->cacheBlocked()) {
PacketPtr data_pkt =
new Packet(req, Packet::ReadReq, Packet::Broadcast);
data_pkt->dataStatic(load_inst->memData); data_pkt->dataStatic(load_inst->memData);
LSQSenderState *state = new LSQSenderState; LSQSenderState *state = new LSQSenderState;
@ -635,11 +638,15 @@ LSQUnit<Impl>::read(Request *req, T &data, int load_idx)
state->inst = load_inst; state->inst = load_inst;
data_pkt->senderState = state; data_pkt->senderState = state;
// if we the cache is not blocked, do cache access
if (!lsq->cacheBlocked()) {
if (!dcachePort->sendTiming(data_pkt)) { if (!dcachePort->sendTiming(data_pkt)) {
if (data_pkt->result == Packet::BadAddress) { Packet::Result result = data_pkt->result;
// Delete state and data packet because a load retry
// initiates a pipeline restart; it does not retry.
delete state;
delete data_pkt; delete data_pkt;
if (result == Packet::BadAddress) {
return TheISA::genMachineCheckFault(); return TheISA::genMachineCheckFault();
} }
@ -669,16 +676,6 @@ LSQUnit<Impl>::read(Request *req, T &data, int load_idx)
return NoFault; return NoFault;
} }
if (data_pkt->result != Packet::Success) {
DPRINTF(LSQUnit, "LSQUnit: D-cache miss!\n");
DPRINTF(Activity, "Activity: ld accessing mem miss [sn:%lli]\n",
load_inst->seqNum);
} else {
DPRINTF(LSQUnit, "LSQUnit: D-cache hit!\n");
DPRINTF(Activity, "Activity: ld accessing mem hit [sn:%lli]\n",
load_inst->seqNum);
}
return NoFault; return NoFault;
} }