From 99a0037756debbfda1843f84f19e792807777e13 Mon Sep 17 00:00:00 2001
From: Albert Magyar
Date: Mon, 25 Feb 2019 12:07:02 -0800
Subject: Detect and error on registers with flip in type (#1031)

---
 src/main/scala/firrtl/passes/Checks.scala | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/main')

diff --git a/src/main/scala/firrtl/passes/Checks.scala b/src/main/scala/firrtl/passes/Checks.scala
index b6855d75..457940d7 100644
--- a/src/main/scala/firrtl/passes/Checks.scala
+++ b/src/main/scala/firrtl/passes/Checks.scala
@@ -25,6 +25,8 @@ object CheckHighForm extends Pass {
     s"$info: [module $mname] Poison $name cannot be a bundle type with flips.")
   class MemWithFlipException(info: Info, mname: String, name: String) extends PassException(
     s"$info: [module $mname] Memory $name cannot be a bundle type with flips.")
+  class RegWithFlipException(info: Info, mname: String, name: String) extends PassException(
+    s"$info: [module $mname] Register $name cannot be a bundle type with flips.")
   class InvalidAccessException(info: Info, mname: String) extends PassException(
     s"$info: [module $mname] Invalid access to non-reference.")
   class ModuleNotDefinedException(info: Info, mname: String, name: String) extends PassException(
@@ -166,13 +168,11 @@ object CheckHighForm extends Pass {
       val info = get_info(s) match {case NoInfo => minfo case x => x}
       s foreach checkName(info, mname, names)
       s match {
-        case DefRegister(info, name, _,_, reset, init) if reset.tpe == AsyncResetType =>
-          init match {
-            case _: Literal => // okay
-            case nonlit =>
-              val e = new NonLiteralAsyncResetValueException(info, mname, name, nonlit.serialize)
-              errors.append(e)
-          }
+        case DefRegister(info, name, tpe, _, reset, init) =>
+          if (hasFlip(tpe))
+            errors.append(new RegWithFlipException(info, mname, name))
+          if (reset.tpe == AsyncResetType && !init.isInstanceOf[Literal])
+            errors.append(new NonLiteralAsyncResetValueException(info, mname, name, init.serialize))
         case sx: DefMemory =>
           if (hasFlip(sx.dataType))
             errors.append(new MemWithFlipException(info, mname, sx.name))
-- 
cgit v1.2.3