2c2
< * Copyright (c) 2011-2017 ARM Limited
---
> * Copyright (c) 2011-2018 ARM Limited
154,155c154,156
< // determine the destination based on the address
< PortID master_port_id = findPort(pkt->getAddr());
---
> // determine the destination based on the destination address range
> AddrRange addr_range = RangeSize(pkt->getAddr(), pkt->getSize());
> PortID master_port_id = findPort(addr_range);
554c555,557
< assert(master_port_id == findPort(pkt->getAddr()));
---
> AddrRange addr_range M5_VAR_USED =
> RangeSize(pkt->getAddr(), pkt->getSize());
> assert(findPort(addr_range) == master_port_id);
784c787,788
< PortID master_port_id = findPort(pkt->getAddr());
---
> AddrRange addr_range = RangeSize(pkt->getAddr(), pkt->getSize());
> PortID master_port_id = findPort(addr_range);
1008c1012
< PortID dest_id = findPort(pkt->getAddr());
---
> PortID dest_id = findPort(RangeSize(pkt->getAddr(), pkt->getSize()));