aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorColin Schmidt2017-04-04 14:33:38 -0700
committerGitHub2017-04-04 14:33:38 -0700
commit7d0b48708b05aba6d840cc4a9d4ab00abe31929b (patch)
tree81526d8bdad7281ceb312453d5706e0b6adac8fa /src
parentd45c714db8adab00fd324886ebb2254511c1e36b (diff)
DecorateMems should not delete annoations (#523)
Diffstat (limited to 'src')
-rw-r--r--src/main/scala/firrtl/passes/memlib/DecorateMems.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/scala/firrtl/passes/memlib/DecorateMems.scala b/src/main/scala/firrtl/passes/memlib/DecorateMems.scala
index e48dc8c2..648b0234 100644
--- a/src/main/scala/firrtl/passes/memlib/DecorateMems.scala
+++ b/src/main/scala/firrtl/passes/memlib/DecorateMems.scala
@@ -16,7 +16,8 @@ class CreateMemoryAnnotations(reader: Option[YamlFileReader]) extends Transform
import CustomYAMLProtocol._
val configs = r.parse[Config]
val cN = CircuitName(state.circuit.main)
- val (as, pins) = configs.foldLeft((Seq.empty[Annotation], Seq.empty[String])) { case ((annos, pins), config) =>
+ val oldAnnos = state.annotations.getOrElse(AnnotationMap(Seq.empty)).annotations
+ val (as, pins) = configs.foldLeft((oldAnnos, Seq.empty[String])) { case ((annos, pins), config) =>
val top = TopAnnotation(ModuleName(config.top.name, cN), config.pin.name)
val source = SourceAnnotation(ComponentName(config.source.name, ModuleName(config.source.module, cN)), config.pin.name)
(annos ++ Seq(top, source), pins :+ config.pin.name)