summaryrefslogtreecommitdiff
path: root/chiselFrontend/src/main/scala/chisel3/core/RawModule.scala
diff options
context:
space:
mode:
authorChick Markley2019-05-13 18:08:25 -0700
committerGitHub2019-05-13 18:08:25 -0700
commit89ef4d78e8f44f31df6530a6a4dee20d0ad0399f (patch)
treefb7948f90429b41af789252751d80e347e1142dd /chiselFrontend/src/main/scala/chisel3/core/RawModule.scala
parentdf0e0b1cc4b566fc098ac3a6d34ec6d9a551d21d (diff)
RawModule with no reset should be able to use withClock method. (#1065)
* RawModule with no reset should be able to use withClock method. - refactor ClockAndReset - now has `clockOpt: Option[Clock]` and `resetOpt: Option[Reset]` constructor params - convenience methods clock and reset tries to deref the option - ClockAndReset.empty is factory method for (None, None) - In Builder - forcedClock does not check resetOpt now - forcedReset does not check clockOpt now - withClock no longer looks at resetOpt - withReset no longer looks at clockOpt - Module starts with empty ClockAndReset * RawModule with no reset should be able to use withClock method. Refactor again based on @ducky64 comments - refactor away ClockAndReset, now builder just has a - currentClock - currentReset - withClock, withRest, withClockAndReset just use these fields directly * RawModule with no reset should be able to use withClock method. - Fixed typo in withReset handler, now picks up new reset
Diffstat (limited to 'chiselFrontend/src/main/scala/chisel3/core/RawModule.scala')
-rw-r--r--chiselFrontend/src/main/scala/chisel3/core/RawModule.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/chiselFrontend/src/main/scala/chisel3/core/RawModule.scala b/chiselFrontend/src/main/scala/chisel3/core/RawModule.scala
index 397debcb..b224d9a3 100644
--- a/chiselFrontend/src/main/scala/chisel3/core/RawModule.scala
+++ b/chiselFrontend/src/main/scala/chisel3/core/RawModule.scala
@@ -146,7 +146,8 @@ abstract class MultiIOModule(implicit moduleCompileOptions: CompileOptions)
val reset: Reset = IO(Input(Bool()))
// Setup ClockAndReset
- Builder.currentClockAndReset = Some(ClockAndReset(clock, reset))
+ Builder.currentClock = Some(clock)
+ Builder.currentReset = Some(reset)
private[core] override def initializeInParent(parentCompileOptions: CompileOptions): Unit = {
implicit val sourceInfo = UnlocatableSourceInfo