xbar.cc (10405:7a618c07e663) xbar.cc (10414:3dabe649f1df)
1/*
2 * Copyright (c) 2011-2014 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 393 unchanged lines hidden (view full) ---

402
403 AddrRangeList ranges = masterPorts[master_port_id]->getAddrRanges();
404
405 for (const auto& r: ranges) {
406 DPRINTF(AddrRanges, "Adding range %s for id %d\n",
407 r.to_string(), master_port_id);
408 if (portMap.insert(r, master_port_id) == portMap.end()) {
409 PortID conflict_id = portMap.find(r)->second;
1/*
2 * Copyright (c) 2011-2014 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 393 unchanged lines hidden (view full) ---

402
403 AddrRangeList ranges = masterPorts[master_port_id]->getAddrRanges();
404
405 for (const auto& r: ranges) {
406 DPRINTF(AddrRanges, "Adding range %s for id %d\n",
407 r.to_string(), master_port_id);
408 if (portMap.insert(r, master_port_id) == portMap.end()) {
409 PortID conflict_id = portMap.find(r)->second;
410 fatal("%s has two ports with same range:\n\t%s\n\t%s\n",
410 fatal("%s has two ports responding within range %s:\n\t%s\n\t%s\n",
411 name(),
411 name(),
412 r.to_string(),
412 masterPorts[master_port_id]->getSlavePort().name(),
413 masterPorts[conflict_id]->getSlavePort().name());
414 }
415 }
416 }
417
418 // if we have received ranges from all our neighbouring slave
419 // modules, go ahead and tell our connected master modules in

--- 195 unchanged lines hidden --- 		413 masterPorts[master_port_id]->getSlavePort().name(),
414 masterPorts[conflict_id]->getSlavePort().name());
415 }
416 }
417 }
418
419 // if we have received ranges from all our neighbouring slave
420 // modules, go ahead and tell our connected master modules in

--- 195 unchanged lines hidden ---