273,274c273
< PacketPtr pkt;
< buildPacket(pkt, req, read);
---
> PacketPtr pkt = buildPacket(req, read);
357,358c356,357
< void
< TimingSimpleCPU::buildPacket(PacketPtr &pkt, RequestPtr req, bool read)
---
> PacketPtr
> TimingSimpleCPU::buildPacket(RequestPtr req, bool read)
360c359
< pkt = read ? Packet::createRead(req) : Packet::createWrite(req);
---
> return read ? Packet::createRead(req) : Packet::createWrite(req);
373c372
< buildPacket(pkt1, req, read);
---
> pkt1 = buildPacket(req, read);
377,378c376,377
< buildPacket(pkt1, req1, read);
< buildPacket(pkt2, req2, read);
---
> pkt1 = buildPacket(req1, read);
> pkt2 = buildPacket(req2, read);
380d378
< req->setPhys(req1->getPaddr(), req->getSize(), req1->getFlags(), dataMasterId());