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

diplomacy: reprotect Node bundles after module construction is completed

Browse Source
This commit is contained in:
Wesley W. Terpstra 2017-11-08 15:32:45 -08:00
parent fdeed7bbb3
commit 2092cb4ec8
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,7 +165,9 @@ sealed trait LazyModuleImpLike extends BaseModule
protected[diplomacy] def instantiate() = { protected[diplomacy] def instantiate() = {
val childDangles = wrapper.children.reverse.flatMap { c => val childDangles = wrapper.children.reverse.flatMap { c =>
implicit val sourceInfo = c.info implicit val sourceInfo = c.info
Module(c.module).dangles val mod = Module(c.module)
mod.finishInstantiate()
mod.dangles
} }
wrapper.instantiate() wrapper.instantiate()
val nodeDangles = wrapper.nodes.reverse.flatMap(_.instantiate()) val nodeDangles = wrapper.nodes.reverse.flatMap(_.instantiate())
@ -184,6 +186,10 @@ sealed trait LazyModuleImpLike extends BaseModule
} }
(auto, dangles) (auto, dangles)
} }
protected[diplomacy] def finishInstantiate() {
wrapper.nodes.reverse.foreach { _.finishInstantiate() }
}
} }
class LazyModuleImp(val wrapper: LazyModule) extends MultiIOModule with LazyModuleImpLike { class LazyModuleImp(val wrapper: LazyModule) extends MultiIOModule with LazyModuleImpLike {

5
src/main/scala/diplomacy/Nodes.scala
View File

@ -93,6 +93,7 @@ abstract class BaseNode(implicit val valName: ValName)
val serial = BaseNode.serial val serial = BaseNode.serial
BaseNode.serial = BaseNode.serial + 1 BaseNode.serial = BaseNode.serial + 1
protected[diplomacy] def instantiate(): Seq[Dangle] protected[diplomacy] def instantiate(): Seq[Dangle]
protected[diplomacy] def finishInstantiate(): Unit
def name = lazyModule.name + "." + valName.name def name = lazyModule.name + "." + valName.name
def omitGraphML = outputs.isEmpty && inputs.isEmpty def omitGraphML = outputs.isEmpty && inputs.isEmpty
@ -387,6 +388,10 @@ sealed abstract class MixedNode[DI, UI, EI, BI <: Data, DO, UO, EO, BO <: Data](
danglesOut ++ danglesIn danglesOut ++ danglesIn
} }
protected[diplomacy] def finishInstantiate() = {
bundlesSafeNow = false
}
// connects the outward part of a node with the inward part of this node // connects the outward part of a node with the inward part of this node
protected[diplomacy] def bind(h: OutwardNode[DI, UI, BI], binding: NodeBinding)(implicit p: Parameters, sourceInfo: SourceInfo) { protected[diplomacy] def bind(h: OutwardNode[DI, UI, BI], binding: NodeBinding)(implicit p: Parameters, sourceInfo: SourceInfo) {
val x = this // x := y val x = this // x := y