1a2,13
> * Copyright (c) 2013 ARM Limited
> * All rights reserved.
> *
> * The license below extends only to copyright in the software and shall
> * not be construed as granting a license to any other intellectual
> * property including but not limited to intellectual property relating
> * to a hardware implementation of the functionality of the software
> * licensed hereunder. You may use the software subject to the license
> * terms below provided that you ensure that this notice is replicated
> * unmodified and in its entirety in all distributions of the software,
> * modified or unmodified, in source code or in binary form.
> *
142c154
< PacketPtr pkt = *pf.begin();
---
> PacketPtr pkt = pf.begin()->pkt;
144c156
< pkt = *pf.begin();
---
> pkt = pf.begin()->pkt;
171c183
< BasePrefetcher::notify(PacketPtr &pkt, Tick time)
---
> BasePrefetcher::notify(PacketPtr &pkt, Tick tick)
178c190
< std::list<PacketPtr>::iterator iter = inPrefetch(blk_addr);
---
> std::list<DeferredPacket>::iterator iter = inPrefetch(blk_addr);
183,184c195,196
< delete (*iter)->req;
< delete (*iter);
---
> delete iter->pkt->req;
> delete iter->pkt;
199c211
< while (!pf.empty() && ((*iter)->time >= time)) {
---
> while (!pf.empty() && iter->tick >= tick) {
202,204c214,216
< (*iter)->getAddr());
< delete (*iter)->req;
< delete (*iter);
---
> iter->pkt->getAddr());
> delete iter->pkt->req;
> delete iter->pkt;
244,245d255
< prefetch->time = time + clockPeriod() * *delayIter;
<
249c259
< PacketPtr old_pkt = *pf.begin();
---
> PacketPtr old_pkt = pf.begin()->pkt;
257c267,268
< pf.push_back(prefetch);
---
> pf.push_back(DeferredPacket(tick + clockPeriod() * *delayIter,
> prefetch));
261c272
< return pf.empty() ? 0 : pf.front()->time;
---
> return pf.empty() ? 0 : pf.front().tick;
264c275
< std::list<PacketPtr>::iterator
---
> std::list<BasePrefetcher::DeferredPacket>::iterator
268c279
< std::list<PacketPtr>::iterator iter;
---
> std::list<DeferredPacket>::iterator iter;
270c281
< if (((*iter)->getAddr() & ~(Addr)(blkSize-1)) == address) {
---
> if ((iter->pkt->getAddr() & ~(Addr)(blkSize-1)) == address) {