diff options
Diffstat (limited to 'src/cpu/o3/lsq_unit_impl.hh')
-rw-r--r-- | src/cpu/o3/lsq_unit_impl.hh | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/src/cpu/o3/lsq_unit_impl.hh b/src/cpu/o3/lsq_unit_impl.hh index a768b021c..9f3a123a0 100644 --- a/src/cpu/o3/lsq_unit_impl.hh +++ b/src/cpu/o3/lsq_unit_impl.hh @@ -66,7 +66,7 @@ LSQUnit<Impl>::completeDataAccess(PacketPtr pkt) LSQSenderState *state = dynamic_cast<LSQSenderState *>(pkt->senderState); DynInstPtr inst = state->inst; DPRINTF(IEW, "Writeback event [sn:%lli]\n", inst->seqNum); -// DPRINTF(Activity, "Activity: Ld Writeback event [sn:%lli]\n", inst->seqNum); + DPRINTF(Activity, "Activity: Writeback event [sn:%lli]\n", inst->seqNum); //iewStage->ldstQueue.removeMSHR(inst->threadNumber,inst->seqNum); @@ -209,16 +209,6 @@ LSQUnit<Impl>::clearSQ() storeQueue.clear(); } -#if 0 -template<class Impl> -void -LSQUnit<Impl>::setPageTable(PageTable *pt_ptr) -{ - DPRINTF(LSQUnit, "Setting the page table pointer.\n"); - pTable = pt_ptr; -} -#endif - template<class Impl> void LSQUnit<Impl>::switchOut() @@ -628,8 +618,8 @@ LSQUnit<Impl>::writebackStores() // Need to handle becoming blocked on a store. isStoreBlocked = true; - assert(sendingPkt == NULL); - sendingPkt = data_pkt; + assert(retryPkt == NULL); + retryPkt = data_pkt; } else { storePostSend(data_pkt); } @@ -858,11 +848,11 @@ template <class Impl> void LSQUnit<Impl>::recvRetry() { - assert(sendingPkt != NULL); - if (isStoreBlocked) { - if (dcachePort->sendTiming(sendingPkt)) { - storePostSend(sendingPkt); + assert(retryPkt != NULL); + + if (dcachePort->sendTiming(retryPkt)) { + storePostSend(retryPkt); sendingPkt = NULL; isStoreBlocked = false; } else { |