diff options
Diffstat (limited to 'src/mem/cache')
| -rw-r--r-- | src/mem/cache/prefetch/base.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mem/cache/prefetch/base.cc b/src/mem/cache/prefetch/base.cc index 4d1f7c81c..f3ac5f046 100644 --- a/src/mem/cache/prefetch/base.cc +++ b/src/mem/cache/prefetch/base.cc @@ -182,7 +182,7 @@ BasePrefetcher::notify(PacketPtr &pkt, Tick time) pfRemovedMSHR++; delete (*iter)->req; delete (*iter); - pf.erase(iter); + iter = pf.erase(iter); if (pf.empty()) cache->deassertMemSideBusRequest(BaseCache::Request_PF); } @@ -194,15 +194,17 @@ BasePrefetcher::notify(PacketPtr &pkt, Tick time) // Needed for serial calculators like GHB if (serialSquash) { iter = pf.end(); - iter--; + if (iter != pf.begin()) + iter--; while (!pf.empty() && ((*iter)->time >= time)) { pfSquashed++; DPRINTF(HWPrefetch, "Squashing old prefetch addr: 0x%x\n", (*iter)->getAddr()); delete (*iter)->req; delete (*iter); - pf.erase(iter); - iter--; + iter = pf.erase(iter); + if (iter != pf.begin()) + iter--; } if (pf.empty()) cache->deassertMemSideBusRequest(BaseCache::Request_PF); |