443c443,444
< (pkt->needsWritable() ? blk->isWritable() : blk->isReadable())) {
---
> (pkt->needsWritable() ? blk->isWritable() :
> blk->isReadable())) {
712c713,714
< if (prefetcher && (prefetchOnAccess || (blk && blk->wasPrefetched()))) {
---
> if (prefetcher && (prefetchOnAccess ||
> (blk && blk->wasPrefetched()))) {
811,813c813,815
< DPRINTF(Cache, "%s coalescing MSHR for %s addr %#llx size %d\n",
< __func__, pkt->cmdString(), pkt->getAddr(),
< pkt->getSize());
---
> DPRINTF(Cache, "%s coalescing MSHR for %s addr %#llx "
> "size %d\n", __func__, pkt->cmdString(),
> pkt->getAddr(), pkt->getSize());
836,837c838,839
< // satisfied or not, reguardless if the request is in the MSHR or
< // not. The request could be a ReadReq hit, but still not
---
> // satisfied or not, reguardless if the request is in the MSHR
> // or not. The request could be a ReadReq hit, but still not
840,841c842,843
< // already allocated for this, we need to let the prefetcher know
< // about the request
---
> // already allocated for this, we need to let the prefetcher
> // know about the request
1057,1058c1059,1060
< DPRINTF(Cache, "Receive response: %s for addr %#llx (%s) in state %i\n",
< bus_pkt->cmdString(), bus_pkt->getAddr(),
---
> DPRINTF(Cache, "Receive response: %s for addr %#llx (%s) in "
> "state %i\n", bus_pkt->cmdString(), bus_pkt->getAddr(),
1339,1341c1341,1344
< // a software prefetch would have already been ack'd immediately
< // with dummy data so the core would be able to retire it.
< // this request completes right here, so we deallocate it.
---
> // a software prefetch would have already been ack'd
> // immediately with dummy data so the core would be able to
> // retire it. This request completes right here, so we
> // deallocate it.
1676,1677c1679,1680
< DPRINTF(Cache, "replacement: replacing %#llx (%s) with %#llx (%s): %s\n",
< repl_addr, blk->isSecure() ? "s" : "ns",
---
> DPRINTF(Cache, "replacement: replacing %#llx (%s) with %#llx "
> "(%s): %s\n", repl_addr, blk->isSecure() ? "s" : "ns",
1981,1982c1984,1985
< DPRINTF(Cache, "Found addr %#llx in upper level cache for snoop %s from"
< " lower cache\n", pkt->getAddr(), pkt->cmdString());
---
> DPRINTF(Cache, "Found addr %#llx in upper level cache for snoop %s "
> "from lower cache\n", pkt->getAddr(), pkt->cmdString());
2490,2491c2493,2494
< warn(" This checkpoint will not restore correctly and dirty data in "
< "the cache will be lost!\n");
---
> warn(" This checkpoint will not restore correctly and dirty data "
> " in the cache will be lost!\n");