luke/verilator
1
0
Fork 0
mirror of https://github.com/verilator/verilator.git synced 2026-10-06 01:54:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix display %u, %v, %p, %z, bug989.

Browse Source
This commit is contained in:
Wilson Snyder
2015-11-10 21:12:15 -05:00
parent 0cb5d5cc5a
commit b0a249f338
16 changed files with 234 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/V3Const.cpp
+12 -14
View File
@@ -33,6 +33,7 @@
#include <algorithm>
#include "V3Global.h"
#include "V3String.h"
#include "V3Const.h"
#include "V3Ast.h"
#include "V3Width.h"
@@ -1828,7 +1829,7 @@ private:
}
if (m_doNConst && anyconst) {
//UINFO(9," Display in "<<nodep->text()<<endl);
string dispout = "";
string newFormat = "";
string fmt = "";
bool inPct = false;
AstNode* argp = nodep->exprsp();
@@ -1846,33 +1847,30 @@ private:
switch (tolower(ch)) {
case '%': break; // %% - just output a %
case 'm': break; // %m - auto insert "name"
case 'l': break; // %m - auto insert "library"
case 'l': break; // %l - auto insert "library"
default: // Most operators, just move to next argument
if (argp) {
AstNode* nextp=argp->nextp();
if (argp && argp->castConst()) { // Convert it
string out = argp->castConst()->num().displayed(fmt);
string out = argp->castConst()->num().displayed(nodep->fileline(), fmt);
UINFO(9," DispConst: "<<fmt<<" -> "<<out<<" for "<<argp<<endl);
{ // fmt = out w/ replace % with %% as it must be literal.
fmt = "";
for (string::iterator pos = out.begin(); pos != out.end(); ++pos) {
if (*pos == '%') fmt += '%';
fmt += *pos;
}
}
// fmt = out w/ replace % with %% as it must be literal.
fmt = VString::quotePercent(out);
argp->unlinkFrBack()->deleteTree();
}
argp=nextp;
}
break;
} // switch
dispout += fmt;
newFormat += fmt;
} else {
dispout += ch;
newFormat += ch;
}
}
nodep->text(dispout);
//UINFO(9," Display out "<<nodep->text()<<endl);
if (newFormat != nodep->text()) {
nodep->text(newFormat);
UINFO(9," Display out "<<nodep<<endl);
}
}
if (!nodep->exprsp()
&& nodep->name().find("%") == string::npos