From 23903d52f501e42ae7a633ad6509d9352cf2f68c Mon Sep 17 00:00:00 2001
From: Palmer Dabbelt
Date: Mon, 8 Feb 2016 17:27:28 -0800
Subject: Escape printf argument before emitting them

---
 src/main/stanza/passes.stanza | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/stanza/passes.stanza b/src/main/stanza/passes.stanza
index 503e16c4..60317a8e 100644
--- a/src/main/stanza/passes.stanza
+++ b/src/main/stanza/passes.stanza
@@ -2692,7 +2692,7 @@ defn emit-verilog (m:InModule) -> Module :
    defn stop (ret:Int) -> Streamable :
       ["$fdisplay(32'h80000002,\"" ret "\");$finish;"]
    defn printf (str:String,args:List<Expression>) -> Streamable :
-      val str* = join(List(escape(str),args),",")
+      val str* = join(List(escape(str),map(escape,map(to-string,args))),",")
       ["$fwrite(32'h80000002," str* ");"]
    defn delay (e:Expression, n:Int, clk:Expression) -> Expression :
       var e* = e
-- 
cgit v1.2.3


From 9dbdb3c87e7ddb75ac937678763b177e0b095523 Mon Sep 17 00:00:00 2001
From: Palmer Dabbelt
Date: Mon, 8 Feb 2016 17:28:09 -0800
Subject: Escape quotes in strings before emitting as Verilog

Without this we get failures with the current rocket-chip, when there are
assertions with escaped strings in them.
---
 src/main/stanza/passes.stanza           |  2 ++
 test/passes/to-verilog/escape-quote.fir | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 test/passes/to-verilog/escape-quote.fir

diff --git a/src/main/stanza/passes.stanza b/src/main/stanza/passes.stanza
index 60317a8e..75be008f 100644
--- a/src/main/stanza/passes.stanza
+++ b/src/main/stanza/passes.stanza
@@ -2436,6 +2436,8 @@ defn escape (s:String) -> String :
    for c in s do :
       if c == '\n' :
          add(s*,"\\n")
+      else if c == '"' :
+         add(s*, "\\\"")
       else :
          if c == 'x' and percent :
             add(s*,"h")
diff --git a/test/passes/to-verilog/escape-quote.fir b/test/passes/to-verilog/escape-quote.fir
new file mode 100644
index 00000000..224026a9
--- /dev/null
+++ b/test/passes/to-verilog/escape-quote.fir
@@ -0,0 +1,18 @@
+; RUN: firrtl -i %s -o %s.v -X verilog ; cat %s.v | FileCheck %s
+
+;CHECK: module top(
+;CHECK:    input   clk
+;CHECK: );
+;CHECK:    always @(posedge clk) begin
+;CHECK:       `ifndef SYNTHESIS
+;CHECK:          if(1'h1) begin
+;CHECK:             $fwrite(32'h80000002,"This has an escaped quote (\") in it");
+;CHECK:          end
+;CHECK:       `endif
+;CHECK:    end
+;CHECK: endmodule
+
+circuit top :
+   module top :
+      input clk : Clock
+      printf(clk, UInt<1>(1), "This has an escaped quote (\") in it")
-- 
cgit v1.2.3