riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

diplomacy: run user instantiate() method after nodes are initialized (#1198)

Browse Source
This commit is contained in:
Wesley W. Terpstra 2018-01-18 14:57:47 -08:00 committed by GitHub
parent 5cc1411e14
commit f6f5606f8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/diplomacy/LazyModule.scala
View File

@ -174,7 +174,6 @@ sealed trait LazyModuleImpLike extends BaseModule
mod.finishInstantiate() mod.finishInstantiate()
mod.dangles mod.dangles
} }
wrapper.instantiate()
val nodeDangles = wrapper.nodes.reverse.flatMap(_.instantiate()) val nodeDangles = wrapper.nodes.reverse.flatMap(_.instantiate())
val allDangles = nodeDangles ++ childDangles val allDangles = nodeDangles ++ childDangles
val pairing = SortedMap(allDangles.groupBy(_.source).toSeq:_*) val pairing = SortedMap(allDangles.groupBy(_.source).toSeq:_*)
@ -189,6 +188,7 @@ sealed trait LazyModuleImpLike extends BaseModule
if (d.flipped) { d.data <> io } else { io <> d.data } if (d.flipped) { d.data <> io } else { io <> d.data }
d.copy(data = io, name = wrapper.valName.getOrElse("anon") + "_" + d.name) d.copy(data = io, name = wrapper.valName.getOrElse("anon") + "_" + d.name)
} }
wrapper.instantiate()
(auto, dangles) (auto, dangles)
} }