diff -r f48b3f34d315 -r b98c260e04c2 src/kern/tru64/tru64_events.cc
--- a/src/kern/tru64/tru64_events.cc	Wed Jun 06 17:44:25 2012 +0100
+++ b/src/kern/tru64/tru64_events.cc	Wed Jun 06 17:45:19 2012 +0100
@@ -62,7 +62,8 @@
 
     MasterPort &dataPort = tc->getCpuPtr()->getDataPort();
 
-    AddrRangeList resp = dataPort.getSlavePort().getAddrRanges();
+    // get the address ranges of the connected slave port
+    AddrRangeList resp = dataPort.getAddrRanges();
     for (iter = resp.begin(); iter != resp.end(); iter++) {
         if (*iter == (K0Seg2Phys(a0) & PAddrImplMask))
             found = true;
diff -r f48b3f34d315 -r b98c260e04c2 src/mem/bus.cc
--- a/src/mem/bus.cc	Wed Jun 06 17:44:25 2012 +0100
+++ b/src/mem/bus.cc	Wed Jun 06 17:45:19 2012 +0100
@@ -317,8 +317,9 @@
         defaultRange.clear();
         // Only try to update these ranges if the user set a default responder.
         if (useDefaultRange) {
+            // get the address ranges of the connected slave port
             AddrRangeList ranges =
-                masterPorts[master_port_id]->getSlavePort().getAddrRanges();
+                masterPorts[master_port_id]->getAddrRanges();
             for(iter = ranges.begin(); iter != ranges.end(); iter++) {
                 defaultRange.push_back(*iter);
                 DPRINTF(BusAddrRanges, "Adding range %#llx - %#llx for default range\n",
@@ -339,7 +340,8 @@
                 portIter++;
         }
 
-        ranges = port->getSlavePort().getAddrRanges();
+        // get the address ranges of the connected slave port
+        ranges = port->getAddrRanges();
 
         for (iter = ranges.begin(); iter != ranges.end(); iter++) {
             DPRINTF(BusAddrRanges, "Adding range %#llx - %#llx for id %d\n",
diff -r f48b3f34d315 -r b98c260e04c2 src/mem/comm_monitor.cc
--- a/src/mem/comm_monitor.cc	Wed Jun 06 17:44:25 2012 +0100
+++ b/src/mem/comm_monitor.cc	Wed Jun 06 17:45:19 2012 +0100
@@ -347,7 +347,8 @@
 AddrRangeList
 CommMonitor::getAddrRanges()
 {
-    return masterPort.getSlavePort().getAddrRanges();
+    // get the address ranges of the connected slave port
+    return masterPort.getAddrRanges();
 }
 
 void
diff -r f48b3f34d315 -r b98c260e04c2 src/mem/port.hh
--- a/src/mem/port.hh	Wed Jun 06 17:44:25 2012 +0100
+++ b/src/mem/port.hh	Wed Jun 06 17:45:19 2012 +0100
@@ -215,6 +215,11 @@
     */
     unsigned peerBlockSize() const;
 
+    /**
+     * Get the address ranges of the connected slave port.
+     */
+    AddrRangeList getAddrRanges() const;
+
     /** Inject a PrintReq for the given address to print the state of
      * that address throughout the memory system.  For debugging.
      */
diff -r f48b3f34d315 -r b98c260e04c2 src/mem/port.cc
--- a/src/mem/port.cc	Wed Jun 06 17:44:25 2012 +0100
+++ b/src/mem/port.cc	Wed Jun 06 17:45:19 2012 +0100
@@ -103,6 +103,12 @@
     return _slavePort->deviceBlockSize();
 }
 
+AddrRangeList
+MasterPort::getAddrRanges() const
+{
+    return _slavePort->getAddrRanges();
+}
+
 Tick
 MasterPort::sendAtomic(PacketPtr pkt)
 {