193a194,197
> if (_status != Running) {
> _status = Idle;
> }
>
196c200
< peer = oldCPU->getPort("icachePort")->getPeer();
---
> peer = oldCPU->getPort("icache_port")->getPeer();
204c208
< peer = oldCPU->getPort("dcachePort")->getPeer();
---
> peer = oldCPU->getPort("dcache_port")->getPeer();
548,556d551
< if (getState() == SimObject::Draining) {
< completeDrain();
<
< delete pkt->req;
< delete pkt;
<
< return;
< }
<
562a558,565
>
> if (getState() == SimObject::Draining) {
> advancePC(fault);
> completeDrain();
>
> return;
> }
>