159,160c159,160
< DPRINTF(CoherentXBar, "recvTimingReq: src %s %s 0x%x BUSY\n",
< src_port->name(), pkt->cmdString(), pkt->getAddr());
---
> DPRINTF(CoherentXBar, "%s: src %s packet %s BUSY\n", __func__,
> src_port->name(), pkt->print());
164,166c164,165
< DPRINTF(CoherentXBar, "recvTimingReq: src %s %s expr %d 0x%x\n",
< src_port->name(), pkt->cmdString(), is_express_snoop,
< pkt->getAddr());
---
> DPRINTF(CoherentXBar, "%s: src %s packet %s\n", __func__,
> src_port->name(), pkt->print());
197,200c196,198
< DPRINTF(CoherentXBar, "recvTimingReq: src %s %s 0x%x"\
< " SF size: %i lat: %i\n", src_port->name(),
< pkt->cmdString(), pkt->getAddr(), sf_res.first.size(),
< sf_res.second);
---
> DPRINTF(CoherentXBar, "%s: src %s packet %s SF size: %i lat: %i\n",
> __func__, src_port->name(), pkt->print(),
> sf_res.first.size(), sf_res.second);
239,240c237,238
< DPRINTF(CoherentXBar, "Not forwarding %s to %#llx\n",
< pkt->cmdString(), pkt->getAddr());
---
> DPRINTF(CoherentXBar, "%s: Not forwarding %s\n", __func__,
> pkt->print());
280,281c278,279
< DPRINTF(CoherentXBar, "recvTimingReq: src %s %s 0x%x RETRY\n",
< src_port->name(), pkt->cmdString(), pkt->getAddr());
---
> DPRINTF(CoherentXBar, "%s: src %s packet %s RETRY\n", __func__,
> src_port->name(), pkt->print());
366,367c364,365
< DPRINTF(CoherentXBar, "recvTimingResp: src %s %s 0x%x BUSY\n",
< src_port->name(), pkt->cmdString(), pkt->getAddr());
---
> DPRINTF(CoherentXBar, "%s: src %s packet %s BUSY\n", __func__,
> src_port->name(), pkt->print());
371,372c369,370
< DPRINTF(CoherentXBar, "recvTimingResp: src %s %s 0x%x\n",
< src_port->name(), pkt->cmdString(), pkt->getAddr());
---
> DPRINTF(CoherentXBar, "%s: src %s packet %s\n", __func__,
> src_port->name(), pkt->print());
415,417c413,414
< DPRINTF(CoherentXBar, "recvTimingSnoopReq: src %s %s 0x%x\n",
< masterPorts[master_port_id]->name(), pkt->cmdString(),
< pkt->getAddr());
---
> DPRINTF(CoherentXBar, "%s: src %s packet %s\n", __func__,
> masterPorts[master_port_id]->name(), pkt->print());
445,448c442,444
< DPRINTF(CoherentXBar, "recvTimingSnoopReq: src %s %s 0x%x"\
< " SF size: %i lat: %i\n", masterPorts[master_port_id]->name(),
< pkt->cmdString(), pkt->getAddr(), sf_res.first.size(),
< sf_res.second);
---
> DPRINTF(CoherentXBar, "%s: src %s packet %s SF size: %i lat: %i\n",
> __func__, masterPorts[master_port_id]->name(), pkt->print(),
> sf_res.first.size(), sf_res.second);
500,501c496,497
< DPRINTF(CoherentXBar, "recvTimingSnoopResp: src %s %s 0x%x BUSY\n",
< src_port->name(), pkt->cmdString(), pkt->getAddr());
---
> DPRINTF(CoherentXBar, "%s: src %s packet %s BUSY\n", __func__,
> src_port->name(), pkt->print());
509,510c505,506
< DPRINTF(CoherentXBar, "recvTimingSnoopResp: src %s %s 0x%x BUSY\n",
< snoop_port->name(), pkt->cmdString(), pkt->getAddr());
---
> DPRINTF(CoherentXBar, "%s: src %s packet %s BUSY\n", __func__,
> snoop_port->name(), pkt->print());
515,516c511,512
< DPRINTF(CoherentXBar, "recvTimingSnoopResp: src %s %s 0x%x\n",
< src_port->name(), pkt->cmdString(), pkt->getAddr());
---
> DPRINTF(CoherentXBar, "%s: src %s packet %s\n", __func__,
> src_port->name(), pkt->print());
575,577c571,572
< DPRINTF(CoherentXBar, "recvTimingSnoopResp: src %s %s 0x%x"\
< " FWD RESP\n", src_port->name(), pkt->cmdString(),
< pkt->getAddr());
---
> DPRINTF(CoherentXBar, "%s: src %s packet %s FWD RESP\n", __func__,
> src_port->name(), pkt->print());
605,606c600
< DPRINTF(CoherentXBar, "%s for %s address %x size %d\n", __func__,
< pkt->cmdString(), pkt->getAddr(), pkt->getSize());
---
> DPRINTF(CoherentXBar, "%s for %s\n", __func__, pkt->print());
642,644c636,637
< DPRINTF(CoherentXBar, "recvAtomic: packet src %s addr 0x%x cmd %s\n",
< slavePorts[slave_port_id]->name(), pkt->getAddr(),
< pkt->cmdString());
---
> DPRINTF(CoherentXBar, "%s: src %s packet %s\n", __func__,
> slavePorts[slave_port_id]->name(), pkt->print());
660,663c653,655
< DPRINTF(CoherentXBar, "%s: src %s %s 0x%x"\
< " SF size: %i lat: %i\n", __func__,
< slavePorts[slave_port_id]->name(), pkt->cmdString(),
< pkt->getAddr(), sf_res.first.size(), sf_res.second);
---
> DPRINTF(CoherentXBar, "%s: src %s packet %s SF size: %i lat: %i\n",
> __func__, slavePorts[slave_port_id]->name(), pkt->print(),
> sf_res.first.size(), sf_res.second);
690,691c682,683
< DPRINTF(CoherentXBar, "Not forwarding %s to %#llx\n",
< pkt->cmdString(), pkt->getAddr());
---
> DPRINTF(CoherentXBar, "%s: Not forwarding %s\n", __func__,
> pkt->print());
742,744c734,735
< DPRINTF(CoherentXBar, "recvAtomicSnoop: packet src %s addr 0x%x cmd %s\n",
< masterPorts[master_port_id]->name(), pkt->getAddr(),
< pkt->cmdString());
---
> DPRINTF(CoherentXBar, "%s: src %s packet %s\n", __func__,
> masterPorts[master_port_id]->name(), pkt->print());
757,759c748,750
< DPRINTF(CoherentXBar, "%s: src %s %s 0x%x SF size: %i lat: %i\n",
< __func__, masterPorts[master_port_id]->name(), pkt->cmdString(),
< pkt->getAddr(), sf_res.first.size(), sf_res.second);
---
> DPRINTF(CoherentXBar, "%s: src %s packet %s SF size: %i lat: %i\n",
> __func__, masterPorts[master_port_id]->name(), pkt->print(),
> sf_res.first.size(), sf_res.second);
857,860c848,849
< DPRINTF(CoherentXBar,
< "recvFunctional: packet src %s addr 0x%x cmd %s\n",
< slavePorts[slave_port_id]->name(), pkt->getAddr(),
< pkt->cmdString());
---
> DPRINTF(CoherentXBar, "%s: src %s packet %s\n", __func__,
> slavePorts[slave_port_id]->name(), pkt->print());
894,897c883,884
< DPRINTF(CoherentXBar,
< "recvFunctionalSnoop: packet src %s addr 0x%x cmd %s\n",
< masterPorts[master_port_id]->name(), pkt->getAddr(),
< pkt->cmdString());
---
> DPRINTF(CoherentXBar, "%s: src %s packet %s\n", __func__,
> masterPorts[master_port_id]->name(), pkt->print());