Fix dropping of backslash quoted-quote at end of .

git-svn-id: file://localhost/svn/verilator/trunk/verilator@1012 77ca24e4-aefa-0310-84f0-b9a241c72d87

Changes

@@ -5,9 +5,11 @@ indicates the contributor was also the author of the fix; Thanks!
 
 * Verilator 3.66***
 
+***  Add --top-module option to select between multiple tops. [Stefan Thiede]
+
 **** Fix no-module include files on command line.  [Stefan Thiede]
 
-***  Add --top-module option to select between multiple tops. [Stefan Thiede]
+**** Fix dropping of backslash quoted-quote at end of $display.
 
 * Verilator 3.660 2008/03/23
 

bin/verilator

@@ -217,7 +217,7 @@ descriptions in the next sections for more information.
     --sc                        Create SystemC output
     --sp                        Create SystemPerl output
     --stats                     Create statistics file
-    --top-module <topname>	Name of top level input module
+    --top-module <topname>      Name of top level input module
     --trace                     Enable waveform creation
     --trace-depth <levels>      Depth of tracing
     -U<var>                     Undefine preprocessor define

src/V3AstNodes.cpp

@@ -304,6 +304,10 @@ void AstCellInline::dump(ostream& str) {
     this->AstNode::dump(str);
     str<<" -> "<<origModName();
 }
+void AstDisplay::dump(ostream& str) {
+    this->AstNode::dump(str);
+    //str<<" "<<displayType().ascii();
+}
 void AstPin::dump(ostream& str) {
     this->AstNode::dump(str);
     if (modVarp()) { str<<" -> "; modVarp()->dump(str); }

src/V3AstNodes.h

@@ -1254,6 +1254,7 @@ public:
     virtual AstType type() const { return AstType::DISPLAY;}
     virtual AstNode* clone() { return new AstDisplay(*this); }
     virtual void accept(AstNVisitor& v, AstNUser* vup=NULL) { v.visit(this,vup); }
+    virtual void dump(ostream& str);
     virtual string verilogKwd() const { return (filep() ? (string)"$f"+(string)displayType().ascii()
 						: (string)"$"+(string)displayType().ascii()); }
     virtual bool isGateOptimizable() const { return false; }

src/V3EmitC.cpp

@@ -1027,10 +1027,8 @@ void EmitCStmts::visit(AstDisplay* nodep, AstNUser*) {
     emitDispState.clear();
     string fmt = "";
     string::iterator pos = vformat.begin();
-    if (*pos == '"') pos++;
     bool inPct = false;
     for (; pos != vformat.end(); ++pos) {
-	if (pos[0]=='"' && (pos+1)==vformat.end()) break;
 	if (inPct && pos[0]=='%') {
 	    emitDispState.pushFormat("%%");  // We're printf'ing it, so need to quote the %
 	    inPct = false;

test_regress/t/t_display.pl

@@ -18,6 +18,7 @@ execute (
 [0] In TOP.v.sub.subblock
 [0] In TOP.v.sub2
 [0] In TOP.v.sub2.subblock2
+[0] Back \ Quote "
 [0] %X=0c %D=12 %0X=c %0O=14 %B=001100
 [0] %x=0c %d=12 %0x=c %0o=14 %b=001100
 [0] %x=00abbbbcccc %0x=abbbbcccc %o=00527356746314 %b=00000101010111011101110111100110011001100

test_regress/t/t_display.v

@@ -19,6 +19,9 @@ module t;
       sub.write_m;
       sub2.write_m;
 
+      // Escapes
+      $display("[%0t] Back \\ Quote \"", $time);  // Old bug when \" last on the line.
+
       // Display formatting
       $display("[%0t] %%X=%X %%D=%D %%0X=%0X %%0O=%0O %%B=%B", $time,
 	       quad[5:0], quad[5:0], quad[5:0], quad[5:0], quad[5:0]);

test_regress/t/t_display_noopt.pl

@@ -21,6 +21,7 @@ execute (
 [0] In TOP.v.sub.subblock
 [0] In TOP.v.sub2
 [0] In TOP.v.sub2.subblock2
+[0] Back \ Quote "
 [0] %X=0c %D=12 %0X=c %0O=14 %B=001100
 [0] %x=0c %d=12 %0x=c %0o=14 %b=001100
 [0] %x=00abbbbcccc %0x=abbbbcccc %o=00527356746314 %b=00000101010111011101110111100110011001100