From e291336216caa4de1a1b08005c33d0bfc19de3ed Mon Sep 17 00:00:00 2001
From: Donggyu Kim
Date: Mon, 26 Sep 2016 13:38:13 -0700
Subject: fix CInferMDir on SubAccess

indices should be read ports
---
 src/main/scala/firrtl/passes/Resolves.scala | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/main/scala/firrtl/passes/Resolves.scala b/src/main/scala/firrtl/passes/Resolves.scala
index 49df9ba6..1ce1d299 100644
--- a/src/main/scala/firrtl/passes/Resolves.scala
+++ b/src/main/scala/firrtl/passes/Resolves.scala
@@ -107,9 +107,10 @@ object CInferMDir extends Pass {
   def name = "CInfer MDir"
   type MPortDirMap = collection.mutable.LinkedHashMap[String, MPortDir]
 
-  def infer_mdir_e(mports: MPortDirMap, dir: MPortDir)(e: Expression): Expression = {
-    (e map infer_mdir_e(mports, dir)) match {
-      case e: Reference => mports get e.name match {
+  def infer_mdir_e(mports: MPortDirMap, dir: MPortDir)(e: Expression): Expression = e match {
+    case e: Reference =>
+      mports get e.name match {
+        case None =>
         case Some(p) => mports(e.name) = (p, dir) match {
           case (MInfer, MInfer) => Utils.error("Shouldn't be here")
           case (MInfer, MWrite) => MWrite
@@ -127,11 +128,14 @@ object CInferMDir extends Pass {
           case (MReadWrite, MWrite) => MReadWrite
           case (MReadWrite, MRead) => MReadWrite
           case (MReadWrite, MReadWrite) => MReadWrite
-        } ; e
-        case None => e
+        }
       }
-      case _ => e
-    }
+      e
+    case e: SubAccess =>
+      infer_mdir_e(mports, dir)(e.expr)
+      infer_mdir_e(mports, MRead)(e.index) // index can't be a write port
+      e
+    case e => e map infer_mdir_e(mports, dir)
   }
 
   def infer_mdir_s(mports: MPortDirMap)(s: Statement): Statement = s match { 
-- 
cgit v1.2.3