From 563f348ca3e4a984ad23caba9e980dab8fa808bb Mon Sep 17 00:00:00 2001
From: Jack Koenig
Date: Thu, 16 Feb 2017 11:02:21 -0800
Subject: Add support for clock and reset scoping (#509)

withClockAndReset, withReset, and withClock allow changing the implicit clock and reset.
Module.clock and Module.reset provide access to the current implicit clock and reset.
---
 chiselFrontend/src/main/scala/chisel3/core/Printf.scala | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'chiselFrontend/src/main/scala/chisel3/core/Printf.scala')

diff --git a/chiselFrontend/src/main/scala/chisel3/core/Printf.scala b/chiselFrontend/src/main/scala/chisel3/core/Printf.scala
index 4ec13751..81210f45 100644
--- a/chiselFrontend/src/main/scala/chisel3/core/Printf.scala
+++ b/chiselFrontend/src/main/scala/chisel3/core/Printf.scala
@@ -34,9 +34,8 @@ object printf { // scalastyle:ignore object.name
     * reset). If your definition of reset is not the encapsulating Module's
     * reset, you will need to gate this externally.
     *
-    * May be called outside of a Module (like defined in a function), so
-    * functions using printf make the standard Module assumptions (single clock
-    * and single reset).
+    * May be called outside of a Module (like defined in a function), uses
+    * whatever clock and reset are in scope.
     *
     * @param fmt printf format string
     * @param data format string varargs containing data to print
@@ -56,13 +55,13 @@ object printf { // scalastyle:ignore object.name
     * @param pable [[Printable]] to print
     */
   def apply(pable: Printable)(implicit sourceInfo: SourceInfo): Unit = {
-    when (!Builder.forcedModule.reset) {
+    when (!Builder.forcedReset) {
       printfWithoutReset(pable)
     }
   }
 
   private[chisel3] def printfWithoutReset(pable: Printable)(implicit sourceInfo: SourceInfo): Unit = {
-    val clock = Builder.forcedModule.clock
+    val clock = Builder.forcedClock
     pushCommand(Printf(sourceInfo, Node(clock), pable))
   }
   private[chisel3] def printfWithoutReset(fmt: String, data: Bits*)(implicit sourceInfo: SourceInfo): Unit =
-- 
cgit v1.2.3