129,130c129
< ifetch_pkt = new Packet;
< ifetch_pkt->cmd = Read;
---
> ifetch_pkt = new Packet(ifetch_req, Packet::ReadReq, Packet::Broadcast);
132,134d130
< ifetch_pkt->req = ifetch_req;
< ifetch_pkt->size = sizeof(MachInst);
< ifetch_pkt->dest = Packet::Broadcast;
140,141c136,137
< data_read_pkt = new Packet;
< data_read_pkt->cmd = Read;
---
> data_read_pkt = new Packet(data_read_req, Packet::ReadReq,
> Packet::Broadcast);
143,144d138
< data_read_pkt->req = data_read_req;
< data_read_pkt->dest = Packet::Broadcast;
150,153c144,145
< data_write_pkt = new Packet;
< data_write_pkt->cmd = Write;
< data_write_pkt->req = data_write_req;
< data_write_pkt->dest = Packet::Broadcast;
---
> data_write_pkt = new Packet(data_write_req, Packet::WriteReq,
> Packet::Broadcast);
263,264c255
< data_read_pkt->addr = data_read_req->getPaddr();
< data_read_pkt->size = sizeof(T);
---
> data_read_pkt->reinitFromRequest();
269c260
< assert(data_read_pkt->result == Success);
---
> assert(data_read_pkt->result == Packet::Success);
345,346c336
< data_write_pkt->addr = data_write_req->getPaddr();
< data_write_pkt->size = sizeof(T);
---
> data_write_pkt->reinitFromRequest();
351c341
< assert(data_write_pkt->result == Success);
---
> assert(data_write_pkt->result == Packet::Success);