From 0f39ba510f66c011be26d9a97d4bc52a8260fc75 Mon Sep 17 00:00:00 2001
From: Andrew Waterman
Date: Wed, 6 Jul 2016 19:57:47 -0700
Subject: Only assign garbage to Mem reads for non-power-of-2 depths

---
 src/main/scala/firrtl/Emitter.scala | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/main')

diff --git a/src/main/scala/firrtl/Emitter.scala b/src/main/scala/firrtl/Emitter.scala
index 693122e0..6b54e367 100644
--- a/src/main/scala/firrtl/Emitter.scala
+++ b/src/main/scala/firrtl/Emitter.scala
@@ -515,7 +515,11 @@ class VerilogEmitter extends Emitter {
                   val mem_port = WSubAccess(mem,addrx,s.dataType,UNKNOWNGENDER)
                   val depthValue = UIntLiteral(s.depth, IntWidth(BigInt(s.depth).bitLength))
                   val garbageGuard = DoPrim(Geq, Seq(addrx, depthValue), Seq(), UnknownType)
-                  garbageAssign(data, mem_port, garbageGuard)
+
+                  if ((s.depth & (s.depth - 1)) == 0)
+                    assign(data, mem_port)
+                  else
+                    garbageAssign(data, mem_port, garbageGuard)
                }
    
                for (w <- s.writers ) {
-- 
cgit v1.2.3