diff options
| author | Albert Magyar | 2019-02-25 12:07:02 -0800 |
|---|---|---|
| committer | GitHub | 2019-02-25 12:07:02 -0800 |
| commit | 99a0037756debbfda1843f84f19e792807777e13 (patch) | |
| tree | 828df1420639988b870405e12f0e9db578dab63e /src/main | |
| parent | a7a0cad04f912303624ec7905303d53d23abbf20 (diff) | |
Detect and error on registers with flip in type (#1031)
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/scala/firrtl/passes/Checks.scala | 14 |
1 files changed, 7 insertions, 7 deletions
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)) |