75c75
< PacketQueue::hasAddr(Addr addr) const
---
> PacketQueue::checkConflict(const PacketPtr pkt, const int blk_size) const
80c80
< if (p.pkt->getAddr() == addr)
---
> if (p.pkt->matchBlockAddr(pkt, blk_size))
141,142c141
< if ((forceOrder && it->pkt->getAddr() == pkt->getAddr()) ||
< it->tick <= when) {
---
> if ((forceOrder && it->pkt->matchAddr(pkt)) || it->tick <= when) {