629,637d628
< PacketPtr data_pkt = new Packet(req, Packet::ReadReq, Packet::Broadcast);
< data_pkt->dataStatic(load_inst->memData);
<
< LSQSenderState *state = new LSQSenderState;
< state->isLoad = true;
< state->idx = load_idx;
< state->inst = load_inst;
< data_pkt->senderState = state;
<
639a631,640
> PacketPtr data_pkt =
> new Packet(req, Packet::ReadReq, Packet::Broadcast);
> data_pkt->dataStatic(load_inst->memData);
>
> LSQSenderState *state = new LSQSenderState;
> state->isLoad = true;
> state->idx = load_idx;
> state->inst = load_inst;
> data_pkt->senderState = state;
>
641,642c642,649
< if (data_pkt->result == Packet::BadAddress) {
< delete data_pkt;
---
> 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;
>
> if (result == Packet::BadAddress) {
672,681d678
< 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);
< }
<