1a2,13
> * Copyright (c) 2017 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.
> *
46c58,59
< memoryPort(csprintf("%s.memory", name()), this, "")
---
> memoryPort(csprintf("%s.memory", name()), this, ""),
> addrRanges(p->addr_ranges.begin(), p->addr_ranges.end())
349a363,370
> MachineID
> AbstractController::mapAddressToMachine(Addr addr, MachineType mtype) const
> {
> NodeID node = m_net_ptr->addressToNodeID(addr, mtype);
> MachineID mach = {mtype, node};
> return mach;
> }
>