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

Merge ktlim@zizzer:/bk/newmem

Browse source 
into  zamp.eecs.umich.edu:/z/ktlim2/clean/tmp/head

--HG--
extra : convert_revision : 4a8cbb65b19636c31b5c6fd5f24c90f8f2148ed1
This commit is contained in:
Kevin Lim 2007-04-04 00:14:44 -04:00
commit 9e1f3bc11a
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/cpu/o3/lsq_unit_impl.hh
View file

@ -57,6 +57,11 @@ LSQUnit<Impl>::WritebackEvent::process()
if (!lsqPtr->isSwitchedOut()) { if (!lsqPtr->isSwitchedOut()) {
lsqPtr->writeback(inst, pkt); lsqPtr->writeback(inst, pkt);
} }
if (pkt->senderState)
delete pkt->senderState;
delete pkt->req;
delete pkt; delete pkt;
} }
@ -80,10 +85,6 @@ LSQUnit<Impl>::completeDataAccess(PacketPtr pkt)
if (isSwitchedOut() || inst->isSquashed()) { if (isSwitchedOut() || inst->isSquashed()) {
iewStage->decrWb(inst->seqNum); iewStage->decrWb(inst->seqNum);
delete state;
delete pkt->req;
delete pkt;
return;
} else { } else {
if (!state->noWB) { if (!state->noWB) {
writeback(inst, pkt); writeback(inst, pkt);