Mario1159/verilator
1
0
Fork 0
forked from github/verilator
Code Pull Requests Releases 1 Activity

Internals: Cleanup some string constructors. No functional change.

Browse Source
This commit is contained in:
Wilson Snyder 2022-08-30 01:02:39 -04:00
parent 6a5f77b278
commit ea55db7286
25 changed files with 80 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/V3Ast.cpp
View File

@ -206,7 +206,7 @@ string AstNode::prettyName(const string& namein) {
string AstNode::prettyTypeName() const {
if (name() == "") return typeName();
return string(typeName()) + " '" + prettyName() + "'";
return std::string{typeName()} + " '" + prettyName() + "'";
}
//######################################################################

53
src/V3Coverage.cpp
View File

@ -279,7 +279,7 @@ private:
// We'll do this, and make the if(...) coverinc later.
// Add signal to hold the old value
const string newvarname = string("__Vtogcov__") + nodep->shortName();
const string newvarname = std::string{"__Vtogcov__"} + nodep->shortName();
AstVar* const chgVarp
= new AstVar(nodep->fileline(), VVarType::MODULETEMP, newvarname, nodep);
chgVarp->fileline()->modifyWarnOff(V3ErrorCode::UNUSED, true);
@ -289,9 +289,9 @@ private:
// This is necessarily an O(n^2) expansion, which is why
// we limit coverage to signals with < 256 bits.
ToggleEnt newvec(string(""),
new AstVarRef(nodep->fileline(), nodep, VAccess::READ),
new AstVarRef(nodep->fileline(), chgVarp, VAccess::WRITE));
ToggleEnt newvec{std::string{""},
new AstVarRef{nodep->fileline(), nodep, VAccess::READ},
new AstVarRef{nodep->fileline(), chgVarp, VAccess::WRITE}};
toggleVarRecurse(nodep->dtypeSkipRefp(), 0, newvec, nodep, chgVarp);
newvec.cleanup();
}
@ -314,11 +314,12 @@ private:
for (int index_docs = bdtypep->lo(); index_docs < bdtypep->hi() + 1;
++index_docs) {
const int index_code = index_docs - bdtypep->lo();
ToggleEnt newent(above.m_comment + string("[") + cvtToStr(index_docs) + "]",
new AstSel(varp->fileline(), above.m_varRefp->cloneTree(true),
index_code, 1),
new AstSel(varp->fileline(), above.m_chgRefp->cloneTree(true),
index_code, 1));
ToggleEnt newent{above.m_comment + std::string{"["} + cvtToStr(index_docs)
+ "]",
new AstSel{varp->fileline(), above.m_varRefp->cloneTree(true),
index_code, 1},
new AstSel{varp->fileline(), above.m_chgRefp->cloneTree(true),
index_code, 1}};
toggleVarBottom(newent, varp);
newent.cleanup();
}
@ -328,11 +329,11 @@ private:
} else if (const AstUnpackArrayDType* const adtypep = VN_CAST(dtypep, UnpackArrayDType)) {
for (int index_docs = adtypep->lo(); index_docs <= adtypep->hi(); ++index_docs) {
const int index_code = index_docs - adtypep->lo();
ToggleEnt newent(above.m_comment + string("[") + cvtToStr(index_docs) + "]",
new AstArraySel(varp->fileline(),
above.m_varRefp->cloneTree(true), index_code),
new AstArraySel(varp->fileline(),
above.m_chgRefp->cloneTree(true), index_code));
ToggleEnt newent{above.m_comment + std::string{"["} + cvtToStr(index_docs) + "]",
new AstArraySel{varp->fileline(),
above.m_varRefp->cloneTree(true), index_code},
new AstArraySel{varp->fileline(),
above.m_chgRefp->cloneTree(true), index_code}};
toggleVarRecurse(adtypep->subDTypep()->skipRefp(), depth + 1, newent, varp,
chgVarp);
newent.cleanup();
@ -341,11 +342,11 @@ private:
for (int index_docs = adtypep->lo(); index_docs <= adtypep->hi(); ++index_docs) {
const AstNodeDType* const subtypep = adtypep->subDTypep()->skipRefp();
const int index_code = index_docs - adtypep->lo();
ToggleEnt newent(above.m_comment + string("[") + cvtToStr(index_docs) + "]",
new AstSel(varp->fileline(), above.m_varRefp->cloneTree(true),
index_code * subtypep->width(), subtypep->width()),
new AstSel(varp->fileline(), above.m_chgRefp->cloneTree(true),
index_code * subtypep->width(), subtypep->width()));
ToggleEnt newent{above.m_comment + std::string{"["} + cvtToStr(index_docs) + "]",
new AstSel{varp->fileline(), above.m_varRefp->cloneTree(true),
index_code * subtypep->width(), subtypep->width()},
new AstSel{varp->fileline(), above.m_chgRefp->cloneTree(true),
index_code * subtypep->width(), subtypep->width()}};
toggleVarRecurse(adtypep->subDTypep()->skipRefp(), depth + 1, newent, varp,
chgVarp);
newent.cleanup();
@ -356,11 +357,11 @@ private:
itemp = VN_AS(itemp->nextp(), MemberDType)) {
AstNodeDType* const subtypep = itemp->subDTypep()->skipRefp();
const int index_code = itemp->lsb();
ToggleEnt newent(above.m_comment + string(".") + itemp->name(),
new AstSel(varp->fileline(), above.m_varRefp->cloneTree(true),
index_code, subtypep->width()),
new AstSel(varp->fileline(), above.m_chgRefp->cloneTree(true),
index_code, subtypep->width()));
ToggleEnt newent{above.m_comment + std::string{"."} + itemp->name(),
new AstSel{varp->fileline(), above.m_varRefp->cloneTree(true),
index_code, subtypep->width()},
new AstSel{varp->fileline(), above.m_chgRefp->cloneTree(true),
index_code, subtypep->width()}};
toggleVarRecurse(subtypep, depth + 1, newent, varp, chgVarp);
newent.cleanup();
}
@ -368,9 +369,9 @@ private:
// Arbitrarily handle only the first member of the union
if (const AstMemberDType* const itemp = adtypep->membersp()) {
AstNodeDType* const subtypep = itemp->subDTypep()->skipRefp();
ToggleEnt newent(above.m_comment + string(".") + itemp->name(),
ToggleEnt newent{above.m_comment + std::string{"."} + itemp->name(),
above.m_varRefp->cloneTree(true),
above.m_chgRefp->cloneTree(true));
above.m_chgRefp->cloneTree(true)};
toggleVarRecurse(subtypep, depth + 1, newent, varp, chgVarp);
newent.cleanup();
}

6
src/V3Error.cpp
View File

@ -148,9 +148,9 @@ string V3Error::msgPrefix() {
} else if (code == V3ErrorCode::EC_ERROR) {
return "%Error: ";
} else if (isError(code, supp)) {
return "%Error-" + string(code.ascii()) + ": ";
return "%Error-" + std::string{code.ascii()} + ": ";
} else {
return "%Warning-" + string(code.ascii()) + ": ";
return "%Warning-" + std::string{code.ascii()} + ": ";
}
}
@ -176,7 +176,7 @@ void V3Error::vlAbort() {
void V3Error::suppressThisWarning() {
#ifndef V3ERROR_NO_GLOBAL_
V3Stats::addStatSum(string("Warnings, Suppressed ") + s_errorCode.ascii(), 1);
V3Stats::addStatSum(std::string{"Warnings, Suppressed "} + s_errorCode.ascii(), 1);
#endif
s_errorSuppressed = true;
}

21
src/V3File.cpp
View File

@ -864,26 +864,26 @@ string V3OutFormatter::quoteNameControls(const string& namein, V3OutFormatter::L
// Encode chars into XML string
for (const char c : namein) {
if (c == '"') {
out += string("&quot;");
out += std::string{"&quot;"};
} else if (c == '\'') {
out += string("&apos;");
out += std::string{"&apos;"};
} else if (c == '<') {
out += string("&lt;");
out += std::string{"&lt;"};
} else if (c == '>') {
out += string("&gt;");
out += std::string{"&gt;"};
} else if (c == '&') {
out += string("&amp;");
out += std::string{"&amp;"};
} else if (isprint(c)) {
out += c;
} else {
out += string("&#") + cvtToStr((unsigned int)(c & 0xff)) + ";";
out += std::string{"&#"} + cvtToStr((unsigned int)(c & 0xff)) + ";";
}
}
} else {
// Encode control chars into C style escapes
for (const char c : namein) {
if (c == '\\' || c == '"') {
out += string("\\") + c;
out += std::string{"\\"} + c;
} else if (c == '\n') {
out += "\\n";
} else if (c == '\r') {
@ -894,8 +894,8 @@ string V3OutFormatter::quoteNameControls(const string& namein, V3OutFormatter::L
out += c;
} else {
// This will also cover \a etc
const string octal = string("\\") + cvtToStr((c >> 6) & 3) + cvtToStr((c >> 3) & 7)
+ cvtToStr(c & 7);
const string octal = std::string{"\\"} + cvtToStr((c >> 6) & 3)
+ cvtToStr((c >> 3) & 7) + cvtToStr(c & 7);
out += octal;
}
}
@ -942,7 +942,8 @@ void V3OutFile::putsForceIncs() {
void V3OutCFile::putsGuard() {
UASSERT(!m_guard, "Already called putsGuard in emit file");
m_guard = true;
string var = VString::upcase(string("VERILATED_") + V3Os::filenameNonDir(filename()) + "_");
string var
= VString::upcase(std::string{"VERILATED_"} + V3Os::filenameNonDir(filename()) + "_");
for (char& c : var) {
if (!isalnum(c)) c = '_';
}

2
src/V3Global.cpp
View File

@ -32,7 +32,7 @@
void V3Global::boot() {
UASSERT(!m_rootp, "call once");
m_rootp = new AstNetlist();
m_rootp = new AstNetlist;
}
void V3Global::clear() {

4
src/V3HierBlock.cpp
View File

@ -254,7 +254,7 @@ class HierBlockUsageCollectVisitor final : public VNVisitor {
// Don't visit twice
if (nodep->user1SetOnce()) return;
UINFO(5, "Checking " << nodep->prettyNameQ() << " from "
<< (m_hierBlockp ? m_hierBlockp->prettyNameQ() : string("null"))
<< (m_hierBlockp ? m_hierBlockp->prettyNameQ() : std::string{"null"})
<< std::endl);
VL_RESTORER(m_modp);
AstModule* const prevHierBlockp = m_hierBlockp;
@ -342,7 +342,7 @@ void V3HierBlockPlan::createPlan(AstNetlist* nodep) {
modp->hierBlock(false);
}
std::unique_ptr<V3HierBlockPlan> planp(new V3HierBlockPlan());
std::unique_ptr<V3HierBlockPlan> planp(new V3HierBlockPlan);
{ HierBlockUsageCollectVisitor{planp.get(), nodep}; }
V3Stats::addStat("HierBlock, Hierarchical blocks", planp->m_blocks.size());

6
src/V3Inline.cpp
View File

@ -425,11 +425,13 @@ private:
// To keep correct visual order, must add before other Text's
AstNode* afterp = nodep->scopeAttrp();
if (afterp) afterp->unlinkFrBackWithNext();
nodep->scopeAttrp(new AstText(nodep->fileline(), string("__DOT__") + m_cellp->name()));
nodep->scopeAttrp(
new AstText{nodep->fileline(), std::string{"__DOT__"} + m_cellp->name()});
if (afterp) nodep->scopeAttrp(afterp);
afterp = nodep->scopeEntrp();
if (afterp) afterp->unlinkFrBackWithNext();
nodep->scopeEntrp(new AstText(nodep->fileline(), string("__DOT__") + m_cellp->name()));
nodep->scopeEntrp(
new AstText{nodep->fileline(), std::string{"__DOT__"} + m_cellp->name()});
if (afterp) nodep->scopeEntrp(afterp);
iterateChildren(nodep);
}

3
src/V3LinkDot.cpp
View File

@ -1696,7 +1696,8 @@ class LinkDotScopeVisitor final : public VNVisitor {
}
if (!symp) {
UINFO(9, "No symbol for interface alias rhs ("
<< string(refp ? "VARREF " : "VARXREF ") << scopename << ")" << endl);
<< std::string{refp ? "VARREF " : "VARXREF "} << scopename << ")"
<< endl);
}
UASSERT_OBJ(symp, nodep, "No symbol for interface alias rhs");
UINFO(5, " Found a linked scope RHS: " << scopename << " se" << cvtToHex(symp)

4
src/V3Name.cpp
View File

@ -49,7 +49,7 @@ private:
void rename(AstNode* nodep, bool addPvt) {
if (!nodep->user1()) { // Not already done
if (addPvt) {
const string newname = string("__PVT__") + nodep->name();
const string newname = std::string{"__PVT__"} + nodep->name();
nodep->name(newname);
nodep->editCountInc();
} else if (VN_IS(nodep, CFunc) && VN_AS(nodep, CFunc)->isConstructor()) {
@ -58,7 +58,7 @@ private:
if (rsvd != "") {
nodep->v3warn(SYMRSVDWORD,
"Symbol matches " + rsvd + ": " << nodep->prettyNameQ());
const string newname = string("__SYM__") + nodep->name();
const string newname = std::string{"__SYM__"} + nodep->name();
nodep->name(newname);
nodep->editCountInc();
}

2
src/V3Number.cpp
View File

@ -816,7 +816,7 @@ string V3Number::toDecimalS() const {
if (isNegative()) {
V3Number lhsNoSign = *this;
lhsNoSign.opNegate(*this);
return string("-") + lhsNoSign.toDecimalU();
return std::string{"-"} + lhsNoSign.toDecimalU();
} else {
return toDecimalU();
}

4
src/V3Number_test.cpp
View File

@ -109,7 +109,7 @@ void test(const string& lhss, const string& op, const string& rhss, const string
<< " = " << expnum << endl
<< " =? " << gotnum << endl);
V3Number ok(fl, 1);
V3Number ok{fl, 1};
ok.opCaseEq(expnum, gotnum);
if (ok.toUInt() != 1) v3fatalSrc("%Error:Test FAILED");
@ -137,7 +137,7 @@ int main() {
test("99'h7FFFFFFFFFFFFFFFFFFFFFFFF", "*", "99'h0000000000000000091338A80",
"99'h7FFFFFFFFFFFFFFFF6ECC7580");
cout << "Test completed\n";
std::cout << "Test completed\n";
}
//###################################################################

4
src/V3Os.cpp
View File

@ -199,7 +199,7 @@ string V3Os::filenameRealPath(const string& filename) {
realpath(filename.c_str(), retpath)
#endif
) {
return string(retpath);
return std::string{retpath};
} else {
return filename;
}
@ -239,7 +239,7 @@ void V3Os::unlinkRegexp(const string& dir, const string& regexp) {
if (DIR* const dirp = opendir(dir.c_str())) {
while (struct dirent* const direntp = readdir(dirp)) {
if (VString::wildmatch(direntp->d_name, regexp.c_str())) {
const string fullname = dir + "/" + string(direntp->d_name);
const string fullname = dir + "/" + std::string{direntp->d_name};
#if defined(_WIN32) || defined(__MINGW32__)
_unlink(fullname.c_str());
#else

2
src/V3Param.cpp
View File

@ -353,7 +353,7 @@ class ParamProcessor final {
num = m_nextValue++;
m_valueMap[hash] = std::make_pair(num, key);
}
return string("z") + cvtToStr(num);
return std::string{"z"} + cvtToStr(num);
}
string moduleCalcName(const AstNodeModule* srcModp, const string& longname) {
string newname = longname;

4
src/V3ParseImp.h
View File

@ -230,13 +230,13 @@ public:
// These can be called by either parser or lexer, as not lex/parser-position aware
string* newString(const string& text) {
// Allocate a string, remembering it so we can reclaim storage at lex end
string* const strp = new string(text);
string* const strp = new std::string{text};
m_stringps.push_back(strp);
return strp;
}
string* newString(const char* text) {
// Allocate a string, remembering it so we can reclaim storage at lex end
string* const strp = new string(text);
string* const strp = new std::string{text};
m_stringps.push_back(strp);
return strp;
}

2
src/V3ParseLex.cpp
View File

@ -63,7 +63,7 @@ void V3ParseImp::yylexReadTok() {
void V3ParseImp::lexNew() {
if (m_lexerp) delete m_lexerp; // Restart from clean slate.
m_lexerp = new V3Lexer();
m_lexerp = new V3Lexer;
if (debugFlex() >= 9) m_lexerp->set_debug(~0);
}

4
src/V3PartitionGraph.h
View File

@ -83,9 +83,9 @@ public:
uint64_t profilerId() const { return m_profilerId; }
string cFuncName() const {
// If this MTask maps to a C function, this should be the name
return string("__Vmtask") + "__" + cvtToStr(m_id);
return std::string{"__Vmtask"} + "__" + cvtToStr(m_id);
}
virtual string name() const override { return string("mt") + cvtToStr(id()); }
virtual string name() const override { return std::string{"mt"} + cvtToStr(id()); }
string hashName() const { return m_hashName; }
void hashName(const string& name) { m_hashName = name; }
void dump(std::ostream& str) const {

2
src/V3PreProc.cpp
View File

@ -284,7 +284,7 @@ public:
// Creation
V3PreProc* V3PreProc::createPreProc(FileLine* fl) {
V3PreProcImp* preprocp = new V3PreProcImp();
V3PreProcImp* preprocp = new V3PreProcImp;
preprocp->configure(fl);
return preprocp;
}

6
src/V3PreShell.cpp
View File

@ -104,10 +104,10 @@ protected:
// from the V3LangCode to the various Lex BEGIN states. The language
// of this source file is updated here, in case there have been any
// intervening +<lang>ext+ options since it was first encountered.
FileLine* const modfileline = new FileLine(modfilename);
FileLine* const modfileline = new FileLine{modfilename};
modfileline->language(v3Global.opt.fileLanguage(modfilename));
V3Parse::ppPushText(
parsep, (string("`begin_keywords \"") + modfileline->language().ascii() + "\"\n"));
V3Parse::ppPushText(parsep, (std::string{"`begin_keywords \""}
+ modfileline->language().ascii() + "\"\n"));
// FileLine tracks and frees modfileline
}

2
src/V3ProtectLib.cpp
View File

@ -355,7 +355,7 @@ private:
initialComment(txtp, fl);
txtp->addText(fl, "void* " + m_libName + "_protectlib_create(const char* scopep__V) {\n");
txtp->addText(fl, /**/ m_topName + "_container* const handlep__V = new " + m_topName
+ "_container(scopep__V);\n");
+ "_container{scopep__V};\n");
txtp->addText(fl, /**/ "return handlep__V;\n");
txtp->addText(fl, "}\n\n");

2
src/V3Reloop.cpp
View File

@ -71,7 +71,7 @@ private:
static AstVar* findCreateVarTemp(FileLine* fl, AstCFunc* cfuncp) {
AstVar* varp = VN_AS(cfuncp->user1p(), Var);
if (!varp) {
const string newvarname = string("__Vilp");
const string newvarname{"__Vilp"};
varp = new AstVar{fl, VVarType::STMTTEMP, newvarname, VFlagLogicPacked{}, 32};
UASSERT_OBJ(cfuncp, fl, "Assignment not under a function");
cfuncp->addInitsp(varp);

2
src/V3Scope.cpp
View File

@ -291,7 +291,7 @@ private:
}
virtual void visit(AstScopeName* nodep) override {
// If there's a %m in the display text, we add a special node that will contain the name()
const string prefix = string("__DOT__") + m_scopep->name();
const string prefix = std::string{"__DOT__"} + m_scopep->name();
// TOP and above will be the user's name().
// Note 'TOP.' is stripped by scopePrettyName
// To keep correct visual order, must add before other Text's

2
src/V3Simulate.h
View File

@ -1083,7 +1083,7 @@ private:
nodep, "Argument for $display like statement is not constant");
break;
}
const string pformat = string("%") + pos[0];
const string pformat = std::string{"%"} + pos[0];
result += constp->num().displayed(nodep, pformat);
} else {
switch (tolower(pos[0])) {

10
src/V3Stats.cpp
View File

@ -251,7 +251,8 @@ public:
for (int type = 0; type < VNType::_ENUM_END; type++) {
const double count = double(m_statTypeCount.at(type));
if (count != 0.0) {
V3Stats::addStat(m_stage, string("Node count, ") + VNType(type).ascii(), count);
V3Stats::addStat(m_stage, std::string{"Node count, "} + VNType{type}.ascii(),
count);
}
}
for (int type = 0; type < VNType::_ENUM_END; type++) {
@ -259,7 +260,7 @@ public:
const double count = double(m_statAbove[type][type2]);
if (count != 0.0) {
V3Stats::addStat(m_stage,
(string("Node pairs, ") + VNType(type).ascii() + "_"
(std::string{"Node pairs, "} + VNType{type}.ascii() + "_"
+ VNType(type2).ascii()),
count);
}
@ -269,8 +270,9 @@ public:
for (int type = 0; type < VBranchPred::_ENUM_END; type++) {
const double count = double(m_statPred[type]);
if (count != 0.0) {
V3Stats::addStat(
m_stage, (string("Branch prediction, ") + VBranchPred(type).ascii()), count);
V3Stats::addStat(m_stage,
(std::string{"Branch prediction, "} + VBranchPred{type}.ascii()),
count);
}
}
}

2
src/V3Tristate.cpp
View File

@ -436,7 +436,7 @@ class TristateVisitor final : public TristateBaseVisitor {
const auto it = m_lhsmap.find(key);
UINFO(9, " mapInsertLhsVarRef " << nodep << endl);
if (it == m_lhsmap.end()) { // Not found
RefVec* const refsp = new RefVec();
RefVec* const refsp = new RefVec;
refsp->push_back(nodep);
m_lhsmap.emplace(key, refsp);
} else {

2
src/V3Unroll.cpp
View File

@ -65,7 +65,7 @@ private:
nodep->v3warn(E_UNSUPPORTED, "Unsupported: Can't unroll generate for; " << reason);
UINFO(3, " Can't Unroll: " << reason << " :" << nodep << endl);
// if (debug() >= 9) nodep->dumpTree(cout, "-cant-");
V3Stats::addStatSum(string("Unrolling gave up, ") + reason, 1);
V3Stats::addStatSum(std::string{"Unrolling gave up, "} + reason, 1);
return false;
}