125c125
< BasePrefetcher::inCache(Addr addr)
---
> BasePrefetcher::inCache(Addr addr, bool is_secure)
127c127
< if (cache->inCache(addr)) {
---
> if (cache->inCache(addr, is_secure)) {
135c135
< BasePrefetcher::inMissQueue(Addr addr)
---
> BasePrefetcher::inMissQueue(Addr addr, bool is_secure)
137c137
< if (cache->inMissQueue(addr)) {
---
> if (cache->inMissQueue(addr, is_secure)) {
159a160
> bool is_secure = pkt->isSecure();
161c162
< if (!inCache(blk_addr) && !inMissQueue(blk_addr))
---
> if (!inCache(blk_addr, is_secure) && !inMissQueue(blk_addr, is_secure))
165c166,167
< DPRINTF(HWPrefetch, "addr 0x%x in cache, skipping\n", pkt->getAddr());
---
> DPRINTF(HWPrefetch, "addr 0x%x (%s) in cache, skipping\n",
> pkt->getAddr(), is_secure ? "s" : "ns");
177c179,180
< DPRINTF(HWPrefetch, "returning 0x%x\n", pkt->getAddr());
---
> DPRINTF(HWPrefetch, "returning 0x%x (%s)\n", pkt->getAddr(),
> pkt->isSecure() ? "s" : "ns");
187a191
> bool is_secure = pkt->isSecure();
190c194,195
< std::list<DeferredPacket>::iterator iter = inPrefetch(blk_addr);
---
> std::list<DeferredPacket>::iterator iter = inPrefetch(blk_addr,
> is_secure);
193c198,199
< "0x%x, removing it\n", blk_addr);
---
> "0x%x (%s), removing it\n", blk_addr,
> is_secure ? "s" : "ns");
242c248
< if (inPrefetch(addr) != pf.end()) {
---
> if (inPrefetch(addr, is_secure) != pf.end()) {
249a256,257
> if (is_secure)
> prefetchReq->setFlags(Request::SECURE);
277c285
< BasePrefetcher::inPrefetch(Addr address)
---
> BasePrefetcher::inPrefetch(Addr address, bool is_secure)
282c290,291
< if ((iter->pkt->getAddr() & ~(Addr)(blkSize-1)) == address) {
---
> if (((*iter).pkt->getAddr() & ~(Addr)(blkSize-1)) == address &&
> (*iter).pkt->isSecure() == is_secure) {