diff --git a/src/Convert/SeverityTask.hs b/src/Convert/SeverityTask.hs index f7cf184..3225fe2 100644 --- a/src/Convert/SeverityTask.hs +++ b/src/Convert/SeverityTask.hs @@ -47,7 +47,8 @@ elab severity args prefixStr prefixArgs = do return $ Block Seq "" [] [stmtDisplay, stmtFinish] where msg scope file = severityToString severity ++ " [" ++ prefixStr ++ "] " - ++ file ++ " - " ++ scope ++ if null displayArgs then "" else " - " + ++ file ++ " - " ++ scope + ++ if null displayArgs then "" else "\\n msg: " displayArgs = if severity /= SeverityFatal || null args then args else tail args diff --git a/test/core/elab_task.sv.pat b/test/core/elab_task.sv.pat index 0261bc0..60e8d63 100644 --- a/test/core/elab_task.sv.pat +++ b/test/core/elab_task.sv.pat @@ -1,5 +1,5 @@ affirm $finish; affirm $display("Fatal [elaboration] elab_task.sv:9:5 - top"); affirm $finish(0); -affirm $display("Fatal [elaboration] elab_task.sv:10:5 - top - ", "%b", 4); +affirm $display("Fatal [elaboration] elab_task.sv:10:5 - top\\n msg: ", "%b", 4); affirm $finish(1); diff --git a/test/core/elab_task.v b/test/core/elab_task.v index 95567d5..3b86f2e 100644 --- a/test/core/elab_task.v +++ b/test/core/elab_task.v @@ -1,10 +1,10 @@ module top; initial $display("Info [elaboration] elab_task.sv:2:5 - top"); - initial $display("Info [elaboration] elab_task.sv:3:5 - top - %b", 1); + initial $display("Info [elaboration] elab_task.sv:3:5 - top\n msg: %b", 1); initial $display("Warning [elaboration] elab_task.sv:4:5 - top"); - initial $display("Warning [elaboration] elab_task.sv:5:5 - top - %b", 2); + initial $display("Warning [elaboration] elab_task.sv:5:5 - top\n msg: %b", 2); initial $display("Error [elaboration] elab_task.sv:6:5 - top"); - initial $display("Error [elaboration] elab_task.sv:7:5 - top - %b", 3); + initial $display("Error [elaboration] elab_task.sv:7:5 - top\n msg: %b", 3); initial begin $display("Fatal [elaboration] elab_task.sv:8:5 - top"); $finish; @@ -14,7 +14,7 @@ module top; $finish(0); end initial begin - $display("Fatal [elaboration] elab_task.sv:10:5 - top - %b", 4); + $display("Fatal [elaboration] elab_task.sv:10:5 - top\n msg: %b", 4); $finish(1); end endmodule diff --git a/test/core/severity_task.sv.pat b/test/core/severity_task.sv.pat index c673911..0ff5476 100644 --- a/test/core/severity_task.sv.pat +++ b/test/core/severity_task.sv.pat @@ -1,5 +1,5 @@ affirm $finish; affirm $display("Fatal [%0t] severity_task.sv:10:9 - top.", $time); affirm $finish(0); -affirm $display("Fatal [%0t] severity_task.sv:11:9 - top. - ", $time, "%b", 4); +affirm $display("Fatal [%0t] severity_task.sv:11:9 - top.\\n msg: ", $time, "%b", 4); affirm $finish(1); diff --git a/test/core/severity_task.v b/test/core/severity_task.v index 0723408..5c3fedd 100644 --- a/test/core/severity_task.v +++ b/test/core/severity_task.v @@ -1,16 +1,16 @@ module top; initial begin $display("Info [%0t] severity_task.sv:3:9 - top.", $time); - $display("Info [%0t] severity_task.sv:4:9 - top. - ", $time, "%b", 1); + $display("Info [%0t] severity_task.sv:4:9 - top.\n msg: ", $time, "%b", 1); $display("Warning [%0t] severity_task.sv:5:9 - top.", $time); - $display("Warning [%0t] severity_task.sv:6:9 - top. - ", $time, "%b", 2); + $display("Warning [%0t] severity_task.sv:6:9 - top.\n msg: ", $time, "%b", 2); $display("Error [%0t] severity_task.sv:7:9 - top.", $time); - $display("Error [%0t] severity_task.sv:8:9 - top. - ", $time, "%b", 3); + $display("Error [%0t] severity_task.sv:8:9 - top.\n msg: ", $time, "%b", 3); $display("Fatal [%0t] severity_task.sv:9:9 - top.", $time); $finish; $display("Fatal [%0t] severity_task.sv:10:9 - top.", $time); $finish(0); - $display("Fatal [%0t] severity_task.sv:11:9 - top. - ", $time, "%b", 4); + $display("Fatal [%0t] severity_task.sv:11:9 - top.\n msg: ", $time, "%b", 4); $finish(1); end endmodule