MemConf: build list of tuples and turn it into a map at the end

1 files changed, 7 insertions, 7 deletions

diff --git a/src/main/scala/firrtl/passes/memlib/MemConf.scala b/src/main/scala/firrtl/passes/memlib/MemConf.scala
index 5db7de61..3809c47c 100644
--- a/src/main/scala/firrtl/passes/memlib/MemConf.scala
+++ b/src/main/scala/firrtl/passes/memlib/MemConf.scala
@@ -57,13 +57,13 @@ object MemConf {
   }
 
   def apply(name: String, depth: BigInt, width: Int, readPorts: Int, writePorts: Int, readWritePorts: Int, maskGranularity: Option[Int]): MemConf = {
-    val ports: Map[MemPort, Int] = (if (maskGranularity.isEmpty) {
-      (if (writePorts == 0) Map.empty[MemPort, Int] else Map(WritePort -> writePorts)) ++
-      (if (readWritePorts == 0) Map.empty[MemPort, Int] else Map(ReadWritePort -> readWritePorts))
+    val ports: Seq[(MemPort, Int)] = (if (maskGranularity.isEmpty) {
+      (if (writePorts == 0) Seq() else Seq(WritePort -> writePorts)) ++
+      (if (readWritePorts == 0) Seq() else Seq(ReadWritePort -> readWritePorts))
     } else {
-      (if (writePorts == 0) Map.empty[MemPort, Int] else Map(MaskedWritePort -> writePorts)) ++
-      (if (readWritePorts == 0) Map.empty[MemPort, Int] else Map(MaskedReadWritePort -> readWritePorts))
-    }) ++ (if (readPorts == 0) Map.empty[MemPort, Int] else Map(ReadPort -> readPorts))
-    new MemConf(name, depth, width, ports, maskGranularity)
+      (if (writePorts == 0) Seq() else Seq(MaskedWritePort -> writePorts)) ++
+      (if (readWritePorts == 0) Seq() else Seq(MaskedReadWritePort -> readWritePorts))
+    }) ++ (if (readPorts == 0) Seq() else Seq(ReadPort -> readPorts))
+    new MemConf(name, depth, width, ports.toMap, maskGranularity)
   }
 }