108c108,109
< : branchPred(params),
---
> : mem(params->mem),
> branchPred(params),
116c117,118
< interruptPending(false)
---
> interruptPending(false),
> switchedOut(false)
164c166
< memPkt[tid] = NULL;
---
> memReq[tid] = NULL;
285a288,291
> Port *mem_dport = mem->getPort("");
> icachePort->setPeer(mem_dport);
> mem_dport->setPeer(icachePort);
>
358c364
< pkt != memPkt[tid] ||
---
> pkt->req != memReq[tid] ||
360a367
> delete pkt->req;
361a369
> memReq[tid] = NULL;
386c394
< memPkt[tid] = NULL;
---
> memReq[tid] = NULL;
517c525
< memPkt[tid] = NULL;
---
> memReq[tid] = mem_req;
567a576,578
> } else {
> delete mem_req;
> memReq[tid] = NULL;
588,589c599,601
< delete memPkt[tid];
< memPkt[tid] = NULL;
---
> // Should I delete this here or when it comes back from the cache?
> // delete memReq[tid];
> memReq[tid] = NULL;
1086c1098
< fatal("fault (%d) detected @ PC %08p", fault, PC[tid]);
---
> warn("%lli fault (%d) detected @ PC %08p", curTick, fault, PC[tid]);