Cross Reference: /gem5/src/mem/cache/cache.cc

Deleted Added

sdiff udiff text old ( 11742:3dcf0b891749 ) new ( 11744:5d33c6972dda )

full compact

183,184c183
< DPRINTF(CacheVerbose, "%s for %s addr %#llx size %d (write)\n",
< __func__, pkt->cmdString(), pkt->getAddr(), pkt->getSize());
---
> DPRINTF(CacheVerbose, "%s for %s (write)\n", __func__, pkt->print());
275,276c274,275
< DPRINTF(CacheVerbose, "%s for %s addr %#llx size %d (invalidation)\n",
< __func__, pkt->cmdString(), pkt->getAddr(), pkt->getSize());
---
> DPRINTF(CacheVerbose, "%s for %s (invalidation)\n", __func__,
> pkt->print());
297,298c296
< DPRINTF(CacheVerbose, "%s for %s addr %#llx size %d\n", __func__,
< pkt->cmdString(), pkt->getAddr(), pkt->getSize());
---
> DPRINTF(CacheVerbose, "%s for %s\n", __func__, pkt->print());
301,303c299
< DPRINTF(Cache, "%s%s addr %#llx uncacheable\n", pkt->cmdString(),
< pkt->req->isInstFetch() ? " (ifetch)" : "",
< pkt->getAddr());
---
> DPRINTF(Cache, "uncacheable: %s\n", pkt->print());
328,330c324
< DPRINTF(Cache, "%s%s addr %#llx size %d (%s) %s\n", pkt->cmdString(),
< pkt->req->isInstFetch() ? " (ifetch)" : "",
< pkt->getAddr(), pkt->getSize(), pkt->isSecure() ? "s" : "ns",
---
> DPRINTF(Cache, "%s %s\n", pkt->print(),
546,547c540
< DPRINTF(Cache, "%s for %s addr %#llx size %d\n", __func__,
< pkt->cmdString(), pkt->getAddr(), pkt->getSize());
---
> DPRINTF(Cache, "%s for %s\n", __func__, pkt->print());
613,615c606,607
< DPRINTF(Cache, "Cache above responding to %#llx (%s): "
< "not responding\n",
< pkt->getAddr(), pkt->isSecure() ? "s" : "ns");
---
> DPRINTF(Cache, "Cache above responding to %s: not responding\n",
> pkt->print());
739,740c731,732
< DPRINTF(Cache, "%s satisfied %s addr %#llx, no response needed\n",
< __func__, pkt->cmdString(), pkt->getAddr());
---
> DPRINTF(Cache, "%s satisfied %s, no response needed\n", __func__,
> pkt->print());
816,818c808,809
< 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\n", __func__,
> pkt->print());
970,973c961,962
< DPRINTF(Cache, "%s passing hasSharers from %s to %s addr %#llx "
< "size %d\n",
< __func__, cpu_pkt->cmdString(), pkt->cmdString(),
< pkt->getAddr(), pkt->getSize());
---
> DPRINTF(Cache, "%s: passing hasSharers from %s to %s\n",
> __func__, cpu_pkt->print(), pkt->print());
980,982c969,970
< DPRINTF(Cache, "%s created %s from %s for addr %#llx size %d\n",
< __func__, pkt->cmdString(), cpu_pkt->cmdString(), pkt->getAddr(),
< pkt->getSize());
---
> DPRINTF(Cache, "%s: created %s from %s\n", __func__, pkt->print(),
> cpu_pkt->print());
1002,1004c990,991
< DPRINTF(Cache, "Cache above responding to %#llx (%s): "
< "not responding\n",
< pkt->getAddr(), pkt->isSecure() ? "s" : "ns");
---
> DPRINTF(Cache, "Cache above responding to %s: not responding\n",
> pkt->print());
1049,1051c1036,1037
< DPRINTF(Cache, "Sending an atomic %s for %#llx (%s)\n",
< bus_pkt->cmdString(), bus_pkt->getAddr(),
< bus_pkt->isSecure() ? "s" : "ns");
---
> DPRINTF(Cache, "%s: Sending an atomic %s\n", __func__,
> bus_pkt->print());
1062,1065c1048,1049
< DPRINTF(Cache, "Receive response: %s for addr %#llx (%s) in "
< "state %i\n", bus_pkt->cmdString(), bus_pkt->getAddr(),
< bus_pkt->isSecure() ? "s" : "ns",
< old_state);
---
> DPRINTF(Cache, "%s: Receive response: %s in state %i\n", __func__,
> bus_pkt->print(), old_state);
1201,1202c1185
< DPRINTF(CacheVerbose, "functional %s %#llx (%s) %s%s%s\n",
< pkt->cmdString(), pkt->getAddr(), is_secure ? "s" : "ns",
---
> DPRINTF(CacheVerbose, "%s: %s %s%s%s\n", __func__, pkt->print(),
1257,1259c1240,1241
< DPRINTF(Cache, "Cache received packet with error for addr %#llx (%s), "
< "cmd: %s\n", pkt->getAddr(), pkt->isSecure() ? "s" : "ns",
< pkt->cmdString());
---
> DPRINTF(Cache, "%s: Cache received %s with error\n", __func__,
> pkt->print());
1262,1264c1244,1245
< DPRINTF(Cache, "Handling response %s for addr %#llx size %d (%s)\n",
< pkt->cmdString(), pkt->getAddr(), pkt->getSize(),
< pkt->isSecure() ? "s" : "ns");
---
> DPRINTF(Cache, "%s: Handling response %s\n", __func__,
> pkt->print());
1437,1438c1418,1419
< DPRINTF(Cache, "%s updated cmd to %s for addr %#llx\n",
< __func__, tgt_pkt->cmdString(), tgt_pkt->getAddr());
---
> DPRINTF(Cache, "%s: updated cmd to %s\n", __func__,
> tgt_pkt->print());
1533,1534c1514
< DPRINTF(CacheVerbose, "Leaving %s with %s for addr %#llx\n", __func__,
< pkt->cmdString(), pkt->getAddr());
---
> DPRINTF(CacheVerbose, "%s: Leaving with %s\n", __func__, pkt->print());
1560,1561c1540,1541
< DPRINTF(Cache, "Create Writeback %#llx writable: %d, dirty: %d\n",
< pkt->getAddr(), blk->isWritable(), blk->isDirty());
---
> DPRINTF(Cache, "Create Writeback %s writable: %d, dirty: %d\n",
> pkt->print(), blk->isWritable(), blk->isDirty());
1599,1601c1579
< DPRINTF(Cache, "%s%s %x Create CleanEvict\n", pkt->cmdString(),
< pkt->req->isInstFetch() ? " (ifetch)" : "",
< pkt->getAddr());
---
> DPRINTF(Cache, "Create CleanEvict %s\n", pkt->print());
1849,1850c1827
< DPRINTF(Cache, "%s for %s addr %#llx size %d\n", __func__,
< req_pkt->cmdString(), req_pkt->getAddr(), req_pkt->getSize());
---
> DPRINTF(Cache, "%s: for %s\n", __func__, req_pkt->print());
1882,1885c1859,1860
< DPRINTF(CacheVerbose,
< "%s created response: %s addr %#llx size %d tick: %lu\n",
< __func__, pkt->cmdString(), pkt->getAddr(), pkt->getSize(),
< forward_time);
---
> DPRINTF(CacheVerbose, "%s: created response: %s tick: %lu\n", __func__,
> pkt->print(), forward_time);
1893,1894c1868
< DPRINTF(CacheVerbose, "%s for %s addr %#llx size %d\n", __func__,
< pkt->cmdString(), pkt->getAddr(), pkt->getSize());
---
> DPRINTF(CacheVerbose, "%s: for %s\n", __func__, pkt->print());
1911,1912c1885,1886
< "%s got an invalidating uncacheable snoop request %s to %#llx",
< name(), pkt->cmdString(), pkt->getAddr());
---
> "%s got an invalidating uncacheable snoop request %s",
> name(), pkt->print());
1964a1939,1940
> DPRINTF(CacheVerbose, "%s: snoop miss for %s\n", __func__,
> pkt->print());
1977,1979d1952
<
< DPRINTF(CacheVerbose, "%s snoop miss for %s addr %#llx size %d\n",
< __func__, pkt->cmdString(), pkt->getAddr(), pkt->getSize());
1982,1984c1955,1956
< DPRINTF(Cache, "%s snoop hit for %s addr %#llx size %d, "
< "old state is %s\n", __func__, pkt->cmdString(),
< pkt->getAddr(), pkt->getSize(), blk->print());
---
> DPRINTF(Cache, "%s: snoop hit for %s, old state is %s\n", __func__,
> pkt->print(), blk->print());
2006c1978
< "from lower cache\n", pkt->getAddr(), pkt->cmdString());
---
> "from lower cache\n", pkt->getAddr(), pkt->print());
2049,2051c2021,2022
< "%s is passing a Modified line through %s to %#llx, "
< "but keeping the block",
< name(), pkt->cmdString(), pkt->getAddr());
---
> "%s is passing a Modified line through %s, "
> "but keeping the block", name(), pkt->print());
2093,2094c2064
< DPRINTF(CacheVerbose, "%s for %s addr %#llx size %d\n", __func__,
< pkt->cmdString(), pkt->getAddr(), pkt->getSize());
---
> DPRINTF(CacheVerbose, "%s: for %s\n", __func__, pkt->print());
2121,2123c2091,2092
< DPRINTF(Cache, "Setting block cached for %s from"
< "lower cache on mshr hit %#x\n",
< pkt->cmdString(), pkt->getAddr());
---
> DPRINTF(Cache, "Setting block cached for %s from lower cache on "
> "mshr hit\n", pkt->print());
2160,2161c2129,2130
< DPRINTF(Cache, "Squashing %s from lower cache on writequeue hit"
< " %#x\n", pkt->cmdString(), pkt->getAddr());
---
> DPRINTF(Cache, "%s: Squashing %s from lower cache on writequeue "
> "hit\n", __func__, pkt->print());
2373,2375c2342
< DPRINTF(Cache, "%s MSHR %s for addr %#llx size %d\n", __func__,
< tgt_pkt->cmdString(), tgt_pkt->getAddr(),
< tgt_pkt->getSize());
---
> DPRINTF(Cache, "%s: MSHR %s\n", __func__, tgt_pkt->print());
2493,2495c2460
< DPRINTF(Cache, "%s write %s for addr %#llx size %d\n", __func__,
< tgt_pkt->cmdString(), tgt_pkt->getAddr(),
< tgt_pkt->getSize());
---
> DPRINTF(Cache, "%s: write %s\n", __func__, tgt_pkt->print());