Merge pull request #72 from ucb-bar/fix-printf

Quick fix for printf in the emitted Verilog

1 files changed, 14 insertions, 1 deletions

diff --git a/src/main/scala/firrtl/Emitter.scala b/src/main/scala/firrtl/Emitter.scala
index c7bf45a2..04552de4 100644
--- a/src/main/scala/firrtl/Emitter.scala
+++ b/src/main/scala/firrtl/Emitter.scala
@@ -362,8 +362,21 @@ object VerilogEmitter extends Emitter {
          Seq("$fdisplay(32'h80000002,\"",ret,"\");$finish;")
       }
       def printf (str:String,args:Seq[Expression]) : Seq[Any] = {
+         def emitArg(exp: Expression): String = {
+            exp match {
+               case v: UIntValue => s"${v.width match {
+                  case w: IntWidth => w.width.toString
+               }}'H${v.value.toString(16)}"
+               case v: SIntValue => s"${v.width match {
+                  case w: IntWidth => w.width.toString
+               }}'sH${v.value.toString(16)}"
+               case r: Ref => r.name
+               case r: WRef => r.name
+               case _ => error("Unexpected expression in printf: " + exp.serialize)
+            }
+         }
          val q = '"'.toString
-         val strx = (Seq(q + escape(str) + q) ++ args.map(x => escape(x.serialize()))).reduce(_ + "," + _)
+         val strx = (Seq(q + escape(str) + q) ++ args.map(x => emitArg(x))).reduce(_ + "," + _)
          Seq("$fwrite(32'h80000002,",strx,");")
       }
       def delay (e:Expression, n:Int, clk:Expression) : Expression = {