Merge pull request #257 from ucb-bar/fix-non-contiguous-mmio-region-routing

Fix routing in non-contiguous MMIO regions

src/main/scala/junctions/addrmap.scala

@@ -153,4 +153,8 @@ class AddrMap(
     }
     new AddrMapProt().fromBits(protForRegion.reduce(_|_))
   }
+
+  override def containsAddress(x: UInt) = {
+    flatten.map(_.region.containsAddress(x)).reduce(_||_)
+  }
 }