From e07248b8f6022fafdb84f5d1c0ebe3fc90a5475a Mon Sep 17 00:00:00 2001 From: Richard Lin Date: Thu, 13 Apr 2017 22:59:00 -0700 Subject: Module Hierarchy Refactor (#469) --- chiselFrontend/src/main/scala/chisel3/core/MonoConnect.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'chiselFrontend/src/main/scala/chisel3/core/MonoConnect.scala') diff --git a/chiselFrontend/src/main/scala/chisel3/core/MonoConnect.scala b/chiselFrontend/src/main/scala/chisel3/core/MonoConnect.scala index 9511fdc9..60f500cd 100644 --- a/chiselFrontend/src/main/scala/chisel3/core/MonoConnect.scala +++ b/chiselFrontend/src/main/scala/chisel3/core/MonoConnect.scala @@ -55,7 +55,7 @@ object MonoConnect { * during the recursive decent and then rethrow them with extra information added. * This gives the user a 'path' to where in the connections things went wrong. */ - def connect(sourceInfo: SourceInfo, connectCompileOptions: CompileOptions, sink: Data, source: Data, context_mod: Module): Unit = + def connect(sourceInfo: SourceInfo, connectCompileOptions: CompileOptions, sink: Data, source: Data, context_mod: UserModule): Unit = (sink, source) match { // Handle element case (root case) case (sink_e: Element, source_e: Element) => { @@ -102,12 +102,12 @@ object MonoConnect { // This function checks if element-level connection operation allowed. // Then it either issues it or throws the appropriate exception. - def elemConnect(implicit sourceInfo: SourceInfo, connectCompileOptions: CompileOptions, sink: Element, source: Element, context_mod: Module): Unit = { + def elemConnect(implicit sourceInfo: SourceInfo, connectCompileOptions: CompileOptions, sink: Element, source: Element, context_mod: UserModule): Unit = { import Direction.{Input, Output} // Using extensively so import these // If source has no location, assume in context module // This can occur if is a literal, unbound will error previously - val sink_mod: Module = sink.binding.location.getOrElse(throw UnwritableSinkException) - val source_mod: Module = source.binding.location.getOrElse(context_mod) + val sink_mod: BaseModule = sink.binding.location.getOrElse(throw UnwritableSinkException) + val source_mod: BaseModule = source.binding.location.getOrElse(context_mod) val sink_direction: Option[Direction] = sink.binding.direction val source_direction: Option[Direction] = source.binding.direction -- cgit v1.2.3