133,134d132
< void completeStoreDataAccess(DynInstPtr &inst);
<
209,210c207,208
< !storeQueue[storeWBIdx].completed/* &&
< !dcacheInterface->isBlocked()*/; }
---
> !storeQueue[storeWBIdx].completed &&
> !isStoreBlocked; }
212a211,212
> void writeback(DynInstPtr &inst, PacketPtr pkt);
>
267a268,281
> class LSQSenderState : public Packet::SenderState
> {
> public:
> LSQSenderState()
> : noWB(false)
> { }
>
> // protected:
> DynInstPtr inst;
> bool isLoad;
> int idx;
> bool noWB;
> };
>
270a285,304
> class WritebackEvent : public Event {
> public:
> /** Constructs a writeback event. */
> WritebackEvent(DynInstPtr &_inst, PacketPtr pkt, LSQUnit *lsq_ptr);
>
> /** Processes the writeback event. */
> void process();
>
> /** Returns the description of this event. */
> const char *description();
>
> private:
> DynInstPtr inst;
>
> PacketPtr pkt;
>
> /** The pointer to the LSQ unit that issued the store. */
> LSQUnit<Impl> *lsqPtr;
> };
>
364a399,400
> bool isStoreBlocked;
>
524,527d559
< /*
< typename LdWritebackEvent *wb =
< new typename LdWritebackEvent(load_inst,
< iewStage);
528a561,565
> PacketPtr data_pkt = new Packet(req, Packet::ReadReq, Packet::Broadcast);
> data_pkt->dataStatic(load_inst->memData);
>
> WritebackEvent *wb = new WritebackEvent(load_inst, data_pkt, this);
>
533c570
< */
---
>
587a625,630
> LSQSenderState *state = new LSQSenderState;
> state->isLoad = true;
> state->idx = load_idx;
> state->inst = load_inst;
> data_pkt->senderState = state;
>