github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-04-05 12:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Internals: Cleanup unneeded {}. No functional change

Browse Source
This commit is contained in:
Wilson Snyder 2021-02-21 21:25:21 -05:00
parent 3ae75926e4
commit 9650aefa42
78 changed files with 218 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/verilated.cpp
View File

@ -1510,19 +1510,19 @@ IData VL_FREAD_I(int width, int array_lsb, int array_size, void* memp, IData fpi
IData entry = read_elements + start - array_lsb;
if (width <= 8) {
CData* datap = &(reinterpret_cast<CData*>(memp))[entry];
if (shift == start_shift) { *datap = 0; }
if (shift == start_shift) *datap = 0;
*datap |= (c << shift) & VL_MASK_I(width);
} else if (width <= 16) {
SData* datap = &(reinterpret_cast<SData*>(memp))[entry];
if (shift == start_shift) { *datap = 0; }
if (shift == start_shift) *datap = 0;
*datap |= (c << shift) & VL_MASK_I(width);
} else if (width <= VL_IDATASIZE) {
IData* datap = &(reinterpret_cast<IData*>(memp))[entry];
if (shift == start_shift) { *datap = 0; }
if (shift == start_shift) *datap = 0;
*datap |= (c << shift) & VL_MASK_I(width);
} else if (width <= VL_QUADSIZE) {
QData* datap = &(reinterpret_cast<QData*>(memp))[entry];
if (shift == start_shift) { *datap = 0; }
if (shift == start_shift) *datap = 0;
*datap |= ((static_cast<QData>(c) << static_cast<QData>(shift)) & VL_MASK_Q(width));
} else {
WDataOutP datap = &(reinterpret_cast<WDataOutP>(memp))[entry * VL_WORDS_I(width)];
@ -1909,19 +1909,19 @@ void VlReadMem::setData(void* valuep, const std::string& rhs) {
int value = (c >= 'a' ? (c == 'x' ? VL_RAND_RESET_I(4) : (c - 'a' + 10)) : (c - '0'));
if (m_bits <= 8) {
CData* datap = reinterpret_cast<CData*>(valuep);
if (!innum) { *datap = 0; }
if (!innum) *datap = 0;
*datap = ((*datap << shift) + value) & VL_MASK_I(m_bits);
} else if (m_bits <= 16) {
SData* datap = reinterpret_cast<SData*>(valuep);
if (!innum) { *datap = 0; }
if (!innum) *datap = 0;
*datap = ((*datap << shift) + value) & VL_MASK_I(m_bits);
} else if (m_bits <= VL_IDATASIZE) {
IData* datap = reinterpret_cast<IData*>(valuep);
if (!innum) { *datap = 0; }
if (!innum) *datap = 0;
*datap = ((*datap << shift) + value) & VL_MASK_I(m_bits);
} else if (m_bits <= VL_QUADSIZE) {
QData* datap = reinterpret_cast<QData*>(valuep);
if (!innum) { *datap = 0; }
if (!innum) *datap = 0;
*datap = ((*datap << static_cast<QData>(shift)) + static_cast<QData>(value))
& VL_MASK_Q(m_bits);
} else {
@ -2694,7 +2694,7 @@ void VerilatedScope::exportInsert(int finalize, const char* namep, void* cb) VL_
if (!finalize) {
// Need two passes so we know array size to create
// Alternative is to dynamically stretch the array, which is more code, and slower.
if (funcnum >= m_funcnumMax) { m_funcnumMax = funcnum + 1; }
if (funcnum >= m_funcnumMax) m_funcnumMax = funcnum + 1;
} else {
if (VL_UNCOVERABLE(funcnum >= m_funcnumMax)) {
VL_FATAL_MT(__FILE__, __LINE__, "", // LCOV_EXCL_LINE

16
include/verilated.h
View File

@ -468,7 +468,7 @@ public:
static bool gotFinish() VL_MT_SAFE { return s_s.s_gotFinish; } ///< Return if got a $finish
/// Allow traces to at some point be enabled (disables some optimizations)
static void traceEverOn(bool flag) VL_MT_SAFE {
if (flag) { calcUnusedSigs(flag); }
if (flag) calcUnusedSigs(flag);
}
/// Enable/disable assertions
static void assertOn(bool flag) VL_MT_SAFE;
@ -577,7 +577,7 @@ public:
/// Called at end of each thread mtask, before finishing eval
static void endOfThreadMTask(VerilatedEvalMsgQueue* evalMsgQp) VL_MT_SAFE {
if (VL_UNLIKELY(t_s.t_endOfEvalReqd)) { endOfThreadMTaskGuts(evalMsgQp); }
if (VL_UNLIKELY(t_s.t_endOfEvalReqd)) endOfThreadMTaskGuts(evalMsgQp);
}
/// Called at end of eval loop
static void endOfEval(VerilatedEvalMsgQueue* evalMsgQp) VL_MT_SAFE {
@ -1257,7 +1257,7 @@ static inline IData VL_COUNTBITS_W(int lbits, int words, WDataInP lwp, IData ctr
EData r = 0;
IData wordLbits = 32;
for (int i = 0; i < words; ++i) {
if (i == words - 1) { wordLbits = lbits % 32; }
if (i == words - 1) wordLbits = lbits % 32;
r += VL_COUNTBITS_E(wordLbits, lwp[i], ctrl0, ctrl1, ctrl2);
}
return r;
@ -1330,7 +1330,7 @@ static inline IData VL_MOSTSETBITP1_W(int words, WDataInP lwp) VL_MT_SAFE {
for (int i = words - 1; i >= 0; --i) {
if (VL_UNLIKELY(lwp[i])) { // Shorter worst case if predict not taken
for (int bit = VL_EDATASIZE - 1; bit >= 0; --bit) {
if (VL_UNLIKELY(VL_BITISSET_E(lwp[i], bit))) { return i * VL_EDATASIZE + bit + 1; }
if (VL_UNLIKELY(VL_BITISSET_E(lwp[i], bit))) return i * VL_EDATASIZE + bit + 1;
}
// Can't get here - one bit must be set
}
@ -1627,8 +1627,8 @@ static inline WDataOutP VL_DIVS_WWW(int lbits, WDataOutP owp, WDataInP lwp,
WData rwstore[VL_MULS_MAX_WORDS];
WDataInP ltup = lwp;
WDataInP rtup = rwp;
if (lsign) { ltup = _VL_CLEAN_INPLACE_W(lbits, VL_NEGATE_W(VL_WORDS_I(lbits), lwstore, lwp)); }
if (rsign) { rtup = _VL_CLEAN_INPLACE_W(lbits, VL_NEGATE_W(VL_WORDS_I(lbits), rwstore, rwp)); }
if (lsign) ltup = _VL_CLEAN_INPLACE_W(lbits, VL_NEGATE_W(VL_WORDS_I(lbits), lwstore, lwp));
if (rsign) rtup = _VL_CLEAN_INPLACE_W(lbits, VL_NEGATE_W(VL_WORDS_I(lbits), rwstore, rwp));
if ((lsign && !rsign) || (!lsign && rsign)) {
WData qNoSign[VL_MULS_MAX_WORDS];
VL_DIV_WWW(lbits, qNoSign, ltup, rtup);
@ -1649,8 +1649,8 @@ static inline WDataOutP VL_MODDIVS_WWW(int lbits, WDataOutP owp, WDataInP lwp,
WData rwstore[VL_MULS_MAX_WORDS];
WDataInP ltup = lwp;
WDataInP rtup = rwp;
if (lsign) { ltup = _VL_CLEAN_INPLACE_W(lbits, VL_NEGATE_W(VL_WORDS_I(lbits), lwstore, lwp)); }
if (rsign) { rtup = _VL_CLEAN_INPLACE_W(lbits, VL_NEGATE_W(VL_WORDS_I(lbits), rwstore, rwp)); }
if (lsign) ltup = _VL_CLEAN_INPLACE_W(lbits, VL_NEGATE_W(VL_WORDS_I(lbits), lwstore, lwp));
if (rsign) rtup = _VL_CLEAN_INPLACE_W(lbits, VL_NEGATE_W(VL_WORDS_I(lbits), rwstore, rwp));
if (lsign) { // Only dividend sign matters for modulus
WData qNoSign[VL_MULS_MAX_WORDS];
VL_MODDIV_WWW(lbits, qNoSign, ltup, rtup);

2
include/verilated_cov.cpp
View File

@ -298,7 +298,7 @@ public:
// Keys -> strings
std::string keys[MAX_KEYS];
for (int i = 0; i < MAX_KEYS; ++i) {
if (ckeyps[i] && ckeyps[i][0]) { keys[i] = ckeyps[i]; }
if (ckeyps[i] && ckeyps[i][0]) keys[i] = ckeyps[i];
}
// Ignore empty keys
for (int i = 0; i < MAX_KEYS; ++i) {

2
include/verilated_fst_c.cpp
View File

@ -94,7 +94,7 @@ void VerilatedFst::open(const char* filename) VL_MT_UNSAFE {
m_code2symbol.clear();
// Allocate string buffer for arrays
if (!m_strbuf) { m_strbuf = new char[maxBits() + 32]; }
if (!m_strbuf) m_strbuf = new char[maxBits() + 32];
}
void VerilatedFst::close() {

2
include/verilated_trace.h
View File

@ -74,7 +74,7 @@ public:
// Non blocking get
bool tryGet(T& result) {
const VerilatedLockGuard lockGuard(m_mutex);
if (m_queue.empty()) { return false; }
if (m_queue.empty()) return false;
result = m_queue.front();
m_queue.pop_front();
return true;

6
include/verilated_vcd_c.cpp
View File

@ -138,7 +138,9 @@ void VerilatedVcd::openNext(bool incFilename) {
name[pos - 2] = '0';
if ((++(name[pos - 3])) > '9') {
name[pos - 3] = '0';
if ((++(name[pos - 4])) > '9') { name[pos - 4] = '0'; }
if ((++(name[pos - 4])) > '9') { //
name[pos - 4] = '0';
}
}
}
}
@ -164,7 +166,7 @@ void VerilatedVcd::openNext(bool incFilename) {
}
bool VerilatedVcd::preChangeDump() {
if (VL_UNLIKELY(m_rolloverMB && m_wroteBytes > m_rolloverMB)) { openNext(true); }
if (VL_UNLIKELY(m_rolloverMB && m_wroteBytes > m_rolloverMB)) openNext(true);
return isOpen();
}

2
include/verilated_vcd_c.h
View File

@ -84,7 +84,7 @@ private:
inline void bufferCheck() {
// Flush the write buffer if there's not enough space left for new information
// We only call this once per vector, so we need enough slop for a very wide "b###" line
if (VL_UNLIKELY(m_writep > m_wrFlushp)) { bufferFlush(); }
if (VL_UNLIKELY(m_writep > m_wrFlushp)) bufferFlush();
}
void closePrev();
void closeErr();

4
include/verilated_vpi.cpp
View File

@ -742,7 +742,7 @@ PLI_INT32 VerilatedVpioReasonCb::dovpi_remove_cb() {
VerilatedVpiError* VerilatedVpiImp::error_info() VL_MT_UNSAFE_ONE {
VerilatedVpiImp::assertOneCheck();
if (VL_UNLIKELY(!s_s.m_errorInfop)) { s_s.m_errorInfop = new VerilatedVpiError(); }
if (VL_UNLIKELY(!s_s.m_errorInfop)) s_s.m_errorInfop = new VerilatedVpiError();
return s_s.m_errorInfop;
}
@ -1235,7 +1235,7 @@ vpiHandle vpi_handle_by_name(PLI_BYTE8* namep, vpiHandle scope) {
if (scopename.find('.') == std::string::npos) {
// This is a toplevel, hence search in our TOP ports first.
scopep = Verilated::scopeFind("TOP");
if (scopep) { varp = scopep->varFind(baseNamep); }
if (scopep) varp = scopep->varFind(baseNamep);
}
if (!varp) {
scopep = Verilated::scopeFind(scopename.c_str());

4
src/V3Active.cpp
View File

@ -176,7 +176,7 @@ public:
for (const auto& vrp : m_outputs) {
LatchDetectGraphVertex* vertp = castVertexp(vrp->varp()->user1p());
vertp->user(true); // Identify the output vertex we are checking paths _to_
if (!latchCheckInternal(castVertexp(verticesBeginp()))) { latch_detected = true; }
if (!latchCheckInternal(castVertexp(verticesBeginp()))) latch_detected = true;
if (latch_detected && !latch_expected) {
nodep->v3warn(
LATCH,
@ -185,7 +185,7 @@ public:
<< " (not all control paths of combinational always assign a value)\n"
<< nodep->warnMore()
<< "... Suggest use of always_latch for intentional latches");
if (debug() >= 9) { dumpDotFilePrefixed("latch_" + vrp->name()); }
if (debug() >= 9) dumpDotFilePrefixed("latch_" + vrp->name());
}
vertp->user(false); // Clear again (see above)
vrp->varp()->isLatched(latch_detected);

2
src/V3AssertPre.cpp
View File

@ -148,7 +148,7 @@ private:
AstNode* rhsp = nodep->rhsp()->unlinkFrBack();
AstNode* lhsp = nodep->lhsp()->unlinkFrBack();
if (m_disablep) { lhsp = new AstAnd(fl, new AstNot(fl, m_disablep), lhsp); }
if (m_disablep) lhsp = new AstAnd(fl, new AstNot(fl, m_disablep), lhsp);
AstNode* past = new AstPast(fl, lhsp, nullptr);
past->dtypeFrom(lhsp);

2
src/V3Ast.cpp
View File

@ -1104,7 +1104,7 @@ void AstNode::dumpTree(std::ostream& os, const string& indent, int maxDepth) con
os << indent << " ";
dumpPtrs(os);
}
if (s_debugFileline >= 9) { os << fileline()->warnContextSecondary(); }
if (s_debugFileline >= 9) os << fileline()->warnContextSecondary();
if (maxDepth == 1) {
if (op1p() || op2p() || op3p() || op4p()) os << indent << "1: ...(maxDepth)\n";
} else {

8
src/V3Ast.h
View File

@ -1706,7 +1706,7 @@ public:
}
}
void dtypeFrom(AstNode* fromp) {
if (fromp) { dtypep(fromp->dtypep()); }
if (fromp) dtypep(fromp->dtypep());
}
void dtypeChgSigned(bool flag = true);
void dtypeChgWidth(int width, int widthMin);
@ -2547,7 +2547,7 @@ public:
return nullptr;
}
virtual void cloneRelink() override {
if (m_refDTypep && m_refDTypep->clonep()) { m_refDTypep = m_refDTypep->clonep(); }
if (m_refDTypep && m_refDTypep->clonep()) m_refDTypep = m_refDTypep->clonep();
}
virtual bool same(const AstNode* samep) const override {
const AstNodeArrayDType* asamep = static_cast<const AstNodeArrayDType*>(samep);
@ -2614,7 +2614,7 @@ class AstNodeStream VL_NOT_FINAL : public AstNodeBiop {
public:
AstNodeStream(AstType t, FileLine* fl, AstNode* lhsp, AstNode* rhsp)
: AstNodeBiop{t, fl, lhsp, rhsp} {
if (lhsp->dtypep()) { dtypeSetLogicSized(lhsp->dtypep()->width(), VSigning::UNSIGNED); }
if (lhsp->dtypep()) dtypeSetLogicSized(lhsp->dtypep()->width(), VSigning::UNSIGNED);
}
ASTNODE_BASE_FUNCS(NodeStream)
};
@ -2811,7 +2811,7 @@ public:
ASTNODE_BASE_FUNCS(NodeFTaskRef)
virtual const char* broken() const override;
virtual void cloneRelink() override {
if (m_taskp && m_taskp->clonep()) { m_taskp = m_taskp->clonep(); }
if (m_taskp && m_taskp->clonep()) m_taskp = m_taskp->clonep();
}
virtual void dump(std::ostream& str = std::cout) const override;
virtual string name() const override { return m_name; } // * = Var name

18
src/V3AstNodes.cpp
View File

@ -50,7 +50,7 @@ const char* AstNodeVarRef::broken() const {
}
void AstNodeVarRef::cloneRelink() {
if (m_varp && m_varp->clonep()) { m_varp = m_varp->clonep(); }
if (m_varp && m_varp->clonep()) m_varp = m_varp->clonep();
}
string AstNodeVarRef::hiernameProtect() const {
@ -99,7 +99,7 @@ void AstNodeCCall::dump(std::ostream& str) const {
}
}
void AstNodeCCall::cloneRelink() {
if (m_funcp && m_funcp->clonep()) { m_funcp = m_funcp->clonep(); }
if (m_funcp && m_funcp->clonep()) m_funcp = m_funcp->clonep();
}
const char* AstNodeCCall::broken() const {
BROKEN_RTN(m_funcp && !m_funcp->brokeExists());
@ -1098,7 +1098,7 @@ void AstNode::dump(std::ostream& str) const {
} else {
str << " @dt=" << nodeAddr(dtypep()) << "@";
}
if (AstNodeDType* dtp = dtypep()) { dtp->dumpSmall(str); }
if (AstNodeDType* dtp = dtypep()) dtp->dumpSmall(str);
} else { // V3Broken will throw an error
if (dtypep()) str << " %Error-dtype-exp=null,got=" << nodeAddr(dtypep());
}
@ -1230,9 +1230,9 @@ void AstEnumItemRef::dump(std::ostream& str) const {
}
void AstIfaceRefDType::dump(std::ostream& str) const {
this->AstNode::dump(str);
if (cellName() != "") { str << " cell=" << cellName(); }
if (ifaceName() != "") { str << " if=" << ifaceName(); }
if (modportName() != "") { str << " mp=" << modportName(); }
if (cellName() != "") str << " cell=" << cellName();
if (ifaceName() != "") str << " if=" << ifaceName();
if (modportName() != "") str << " mp=" << modportName();
if (cellp()) {
str << " -> ";
cellp()->dump(str);
@ -1388,7 +1388,7 @@ void AstNodeDType::dump(std::ostream& str) const {
void AstNodeDType::dumpSmall(std::ostream& str) const {
str << "(" << (generic() ? "G/" : "") << ((isSigned() && !isDouble()) ? "s" : "")
<< (isNosign() ? "n" : "") << (isDouble() ? "d" : "") << (isString() ? "str" : "");
if (!isDouble() && !isString()) { str << "w" << (widthSized() ? "" : "u") << width(); }
if (!isDouble() && !isString()) str << "w" << (widthSized() ? "" : "u") << width();
if (!widthSized()) str << "/" << widthMin();
str << ")";
}
@ -1640,7 +1640,7 @@ void AstNodeFTaskRef::dump(std::ostream& str) const {
this->AstNodeStmt::dump(str);
if (classOrPackagep()) str << " pkg=" << nodeAddr(classOrPackagep());
str << " -> ";
if (dotted() != "") { str << ".=" << dotted() << " "; }
if (dotted() != "") str << ".=" << dotted() << " ";
if (taskp()) {
taskp()->dump(str);
} else {
@ -1676,7 +1676,7 @@ void AstCoverDecl::dump(std::ostream& str) const {
str << " -> ";
this->dataDeclNullp()->dump(str);
} else {
if (binNum()) { str << " bin" << std::dec << binNum(); }
if (binNum()) str << " bin" << std::dec << binNum();
}
}
void AstCoverInc::dump(std::ostream& str) const {

30
src/V3AstNodes.h
View File

@ -539,8 +539,8 @@ public:
return nullptr;
}
virtual void cloneRelink() override {
if (m_refDTypep && m_refDTypep->clonep()) { m_refDTypep = m_refDTypep->clonep(); }
if (m_keyDTypep && m_keyDTypep->clonep()) { m_keyDTypep = m_keyDTypep->clonep(); }
if (m_refDTypep && m_refDTypep->clonep()) m_refDTypep = m_refDTypep->clonep();
if (m_keyDTypep && m_keyDTypep->clonep()) m_keyDTypep = m_keyDTypep->clonep();
}
virtual bool same(const AstNode* samep) const override {
const AstAssocArrayDType* asamep = static_cast<const AstAssocArrayDType*>(samep);
@ -641,7 +641,7 @@ public:
return nullptr;
}
virtual void cloneRelink() override {
if (m_refDTypep && m_refDTypep->clonep()) { m_refDTypep = m_refDTypep->clonep(); }
if (m_refDTypep && m_refDTypep->clonep()) m_refDTypep = m_refDTypep->clonep();
}
virtual bool same(const AstNode* samep) const override {
const AstAssocArrayDType* asamep = static_cast<const AstAssocArrayDType*>(samep);
@ -760,7 +760,7 @@ public:
return nullptr;
}
virtual void cloneRelink() override {
if (m_refDTypep && m_refDTypep->clonep()) { m_refDTypep = m_refDTypep->clonep(); }
if (m_refDTypep && m_refDTypep->clonep()) m_refDTypep = m_refDTypep->clonep();
}
virtual bool same(const AstNode* samep) const override {
const AstNodeArrayDType* asamep = static_cast<const AstNodeArrayDType*>(samep);
@ -971,7 +971,7 @@ public:
return nullptr;
}
virtual void cloneRelink() override {
if (m_refDTypep && m_refDTypep->clonep()) { m_refDTypep = m_refDTypep->clonep(); }
if (m_refDTypep && m_refDTypep->clonep()) m_refDTypep = m_refDTypep->clonep();
}
virtual bool same(const AstNode* samep) const override {
const AstConstDType* sp = static_cast<const AstConstDType*>(samep);
@ -1140,7 +1140,7 @@ public:
return nullptr;
}
virtual void cloneRelink() override {
if (m_refDTypep && m_refDTypep->clonep()) { m_refDTypep = m_refDTypep->clonep(); }
if (m_refDTypep && m_refDTypep->clonep()) m_refDTypep = m_refDTypep->clonep();
}
virtual bool same(const AstNode* samep) const override {
const AstQueueDType* asamep = static_cast<const AstQueueDType*>(samep);
@ -1217,8 +1217,8 @@ public:
return nullptr;
}
virtual void cloneRelink() override {
if (m_typedefp && m_typedefp->clonep()) { m_typedefp = m_typedefp->clonep(); }
if (m_refDTypep && m_refDTypep->clonep()) { m_refDTypep = m_refDTypep->clonep(); }
if (m_typedefp && m_typedefp->clonep()) m_typedefp = m_typedefp->clonep();
if (m_refDTypep && m_refDTypep->clonep()) m_refDTypep = m_refDTypep->clonep();
}
virtual bool same(const AstNode* samep) const override {
const AstRefDType* asamep = static_cast<const AstRefDType*>(samep);
@ -1486,7 +1486,7 @@ public:
return nullptr;
}
virtual void cloneRelink() override {
if (m_refDTypep && m_refDTypep->clonep()) { m_refDTypep = m_refDTypep->clonep(); }
if (m_refDTypep && m_refDTypep->clonep()) m_refDTypep = m_refDTypep->clonep();
}
virtual bool same(const AstNode* samep) const override {
const AstEnumDType* sp = static_cast<const AstEnumDType*>(samep);
@ -2047,7 +2047,7 @@ public:
, m_origName{name} {
init();
combineType(type);
if (examplep->childDTypep()) { childDTypep(examplep->childDTypep()->cloneTree(true)); }
if (examplep->childDTypep()) childDTypep(examplep->childDTypep()->cloneTree(true));
dtypeFrom(examplep);
m_declKwd = examplep->declKwd();
}
@ -2677,7 +2677,7 @@ public:
}
ASTNODE_NODE_FUNCS(MemberSel)
virtual void cloneRelink() override {
if (m_varp && m_varp->clonep()) { m_varp = m_varp->clonep(); }
if (m_varp && m_varp->clonep()) m_varp = m_varp->clonep();
}
virtual const char* broken() const override {
BROKEN_RTN(m_varp && !m_varp->brokeExists());
@ -7294,7 +7294,7 @@ class AstShiftL final : public AstNodeBiop {
public:
AstShiftL(FileLine* fl, AstNode* lhsp, AstNode* rhsp, int setwidth = 0)
: ASTGEN_SUPER(fl, lhsp, rhsp) {
if (setwidth) { dtypeSetLogicSized(setwidth, VSigning::UNSIGNED); }
if (setwidth) dtypeSetLogicSized(setwidth, VSigning::UNSIGNED);
}
ASTNODE_NODE_FUNCS(ShiftL)
virtual AstNode* cloneType(AstNode* lhsp, AstNode* rhsp) override {
@ -7318,7 +7318,7 @@ class AstShiftR final : public AstNodeBiop {
public:
AstShiftR(FileLine* fl, AstNode* lhsp, AstNode* rhsp, int setwidth = 0)
: ASTGEN_SUPER(fl, lhsp, rhsp) {
if (setwidth) { dtypeSetLogicSized(setwidth, VSigning::UNSIGNED); }
if (setwidth) dtypeSetLogicSized(setwidth, VSigning::UNSIGNED);
}
ASTNODE_NODE_FUNCS(ShiftR)
virtual AstNode* cloneType(AstNode* lhsp, AstNode* rhsp) override {
@ -7346,7 +7346,7 @@ public:
AstShiftRS(FileLine* fl, AstNode* lhsp, AstNode* rhsp, int setwidth = 0)
: ASTGEN_SUPER(fl, lhsp, rhsp) {
// Important that widthMin be correct, as opExtend requires it after V3Expand
if (setwidth) { dtypeSetLogicSized(setwidth, VSigning::SIGNED); }
if (setwidth) dtypeSetLogicSized(setwidth, VSigning::SIGNED);
}
ASTNODE_NODE_FUNCS(ShiftRS)
virtual AstNode* cloneType(AstNode* lhsp, AstNode* rhsp) override {
@ -9048,7 +9048,7 @@ public:
, m_cleanOut{cleanOut}
, m_pure{true} {
addNOp1p(new AstText(fl, textStmt, true));
if (setwidth) { dtypeSetLogicSized(setwidth, VSigning::UNSIGNED); }
if (setwidth) dtypeSetLogicSized(setwidth, VSigning::UNSIGNED);
}
ASTNODE_NODE_FUNCS(CMath)
virtual bool isGateOptimizable() const override { return m_pure; }

2
src/V3CCtors.cpp
View File

@ -81,7 +81,7 @@ public:
m_tlFuncp->isStatic(false);
m_tlFuncp->slow(!VN_IS(m_modp, Class)); // Only classes construct on fast path
m_tlFuncp->argTypes(m_argsp);
if (stmt != "") { m_tlFuncp->addStmtsp(new AstCStmt(nodep->fileline(), stmt)); }
if (stmt != "") m_tlFuncp->addStmtsp(new AstCStmt(nodep->fileline(), stmt));
m_funcp = m_tlFuncp;
m_modp->addStmtp(m_tlFuncp);
}

2
src/V3Case.cpp
View File

@ -484,7 +484,7 @@ private:
}
//--------------------
virtual void visit(AstNode* nodep) override {
if (VN_IS(nodep, Always)) { m_alwaysp = nodep; }
if (VN_IS(nodep, Always)) m_alwaysp = nodep;
iterateChildren(nodep);
}

2
src/V3Cdc.cpp
View File

@ -599,7 +599,7 @@ private:
}
}
// If multiple domains need to do complicated optimizations
if (senedited) { senoutp = VN_CAST(V3Const::constifyExpensiveEdit(senoutp), SenTree); }
if (senedited) senoutp = VN_CAST(V3Const::constifyExpensiveEdit(senoutp), SenTree);
if (traceDests) {
vertexp->dstDomainSet(true); // Note it's set - domainp may be null, so can't use that
vertexp->dstDomainp(senoutp);

8
src/V3Clean.cpp
View File

@ -162,10 +162,10 @@ private:
void operandQuadop(AstNodeQuadop* nodep) {
iterateChildren(nodep);
computeCppWidth(nodep);
if (nodep->cleanLhs()) { ensureClean(nodep->lhsp()); }
if (nodep->cleanRhs()) { ensureClean(nodep->rhsp()); }
if (nodep->cleanThs()) { ensureClean(nodep->thsp()); }
if (nodep->cleanFhs()) { ensureClean(nodep->fhsp()); }
if (nodep->cleanLhs()) ensureClean(nodep->lhsp());
if (nodep->cleanRhs()) ensureClean(nodep->rhsp());
if (nodep->cleanThs()) ensureClean(nodep->thsp());
if (nodep->cleanFhs()) ensureClean(nodep->fhsp());
// no setClean.. must do it in each user routine.
}

2
src/V3Config.cpp
View File

@ -61,7 +61,7 @@ public:
T* resolve(const string& name) {
// Lookup if it was resolved before, typically not
auto it = m_mapResolved.find(name);
if (VL_UNLIKELY(it != m_mapResolved.end())) { return &it->second; }
if (VL_UNLIKELY(it != m_mapResolved.end())) return &it->second;
T* newp = nullptr;
// Cannot be resolved, create if matched

6
src/V3Const.cpp
View File

@ -2215,8 +2215,8 @@ private:
if (lhsp->varrefp()->name() < rhsp->varrefp()->name()) return true;
if (lhsp->varrefp()->name() > rhsp->varrefp()->name()) return false;
// But might be same name with different scopes
if (lhsp->varrefp()->varScopep() < rhsp->varrefp()->varScopep()) { return true; }
if (lhsp->varrefp()->varScopep() > rhsp->varrefp()->varScopep()) { return false; }
if (lhsp->varrefp()->varScopep() < rhsp->varrefp()->varScopep()) return true;
if (lhsp->varrefp()->varScopep() > rhsp->varrefp()->varScopep()) return false;
// Or rarely, different data types
if (lhsp->varrefp()->dtypep() < rhsp->varrefp()->dtypep()) return true;
if (lhsp->varrefp()->dtypep() > rhsp->varrefp()->dtypep()) return false;
@ -2602,7 +2602,7 @@ private:
// Ignored, can eliminate early
virtual void visit(AstSysIgnore* nodep) override {
iterateChildren(nodep);
if (m_doNConst) { VL_DO_DANGLING(nodep->unlinkFrBack()->deleteTree(), nodep); }
if (m_doNConst) VL_DO_DANGLING(nodep->unlinkFrBack()->deleteTree(), nodep);
}
// Simplify

2
src/V3Descope.cpp
View File

@ -60,7 +60,7 @@ private:
int instances = 0;
for (AstNode* stmtp = modp->stmtsp(); stmtp; stmtp = stmtp->nextp()) {
if (VN_IS(stmtp, Scope)) {
if (++instances > 1) { return false; }
if (++instances > 1) return false;
}
}
return (instances == 1);

8
src/V3EmitC.cpp
View File

@ -1035,8 +1035,8 @@ public:
emitIQW(nodep);
puts("OI(");
puts(cvtToStr(nodep->widthMin()));
if (nodep->lhsp()) { puts("," + cvtToStr(nodep->lhsp()->widthMin())); }
if (nodep->rhsp()) { puts("," + cvtToStr(nodep->rhsp()->widthMin())); }
if (nodep->lhsp()) puts("," + cvtToStr(nodep->lhsp()->widthMin()));
if (nodep->rhsp()) puts("," + cvtToStr(nodep->rhsp()->widthMin()));
puts(",");
iterateAndNextNull(nodep->lhsp());
puts(", ");
@ -2026,7 +2026,7 @@ void EmitCStmts::emitOpName(AstNode* nodep, const string& format, AstNode* lhsp,
nextComma = ",";
needComma = false;
}
if (pos[1] == ' ') { ++pos; } // Must do even if no nextComma
if (pos[1] == ' ') ++pos; // Must do even if no nextComma
} else if (pos[0] == '%') {
++pos;
bool detail = false;
@ -3877,7 +3877,7 @@ public:
// Put out the file
newOutCFile(0);
if (m_slow) { emitTraceSlow(); }
if (m_slow) emitTraceSlow();
iterate(v3Global.rootp());

2
src/V3EmitCMake.cpp
View File

@ -58,7 +58,7 @@ class CMakeEmitter final {
static void cmake_set_raw(std::ofstream& of, const string& name, const string& raw_value,
const string& cache_type = "", const string& docstring = "") {
of << "set(" << name << " " << raw_value;
if (!cache_type.empty()) { of << " CACHE " << cache_type << " \"" << docstring << "\""; }
if (!cache_type.empty()) of << " CACHE " << cache_type << " \"" << docstring << "\"";
of << ")\n";
}

4
src/V3EmitCSyms.cpp
View File

@ -332,7 +332,7 @@ class EmitCSyms final : EmitCBaseVisitor {
virtual void visit(AstVar* nodep) override {
nameCheck(nodep);
iterateChildren(nodep);
if (nodep->isSigUserRdPublic()) { m_modVars.emplace_back(make_pair(m_modp, nodep)); }
if (nodep->isSigUserRdPublic()) m_modVars.emplace_back(make_pair(m_modp, nodep));
}
virtual void visit(AstCoverDecl* nodep) override {
// Assign numbers to all bins, so we know how big of an array to use
@ -620,7 +620,7 @@ void EmitCSyms::emitSymImp() {
+ "& os) {\n");
puts("// LOCAL STATE\n");
// __Vm_namep presumably already correct
if (v3Global.opt.trace()) { puts("os" + op + "__Vm_activity;\n"); }
if (v3Global.opt.trace()) puts("os" + op + "__Vm_activity;\n");
puts("os" + op + "__Vm_didInit;\n");
puts("// SUBCELL STATE\n");
for (std::vector<ScopeModPair>::iterator it = m_scopes.begin(); it != m_scopes.end();

10
src/V3EmitMk.cpp
View File

@ -101,10 +101,10 @@ public:
// have them.
} else if (support == 2 && !slow) {
putMakeClassEntry(of, "verilated.cpp");
if (v3Global.dpi()) { putMakeClassEntry(of, "verilated_dpi.cpp"); }
if (v3Global.opt.vpi()) { putMakeClassEntry(of, "verilated_vpi.cpp"); }
if (v3Global.opt.savable()) { putMakeClassEntry(of, "verilated_save.cpp"); }
if (v3Global.opt.coverage()) { putMakeClassEntry(of, "verilated_cov.cpp"); }
if (v3Global.dpi()) putMakeClassEntry(of, "verilated_dpi.cpp");
if (v3Global.opt.vpi()) putMakeClassEntry(of, "verilated_vpi.cpp");
if (v3Global.opt.savable()) putMakeClassEntry(of, "verilated_save.cpp");
if (v3Global.opt.coverage()) putMakeClassEntry(of, "verilated_cov.cpp");
if (v3Global.opt.trace()) {
putMakeClassEntry(of, v3Global.opt.traceSourceBase() + "_c.cpp");
if (v3Global.opt.systemC()) {
@ -117,7 +117,7 @@ public:
}
}
}
if (v3Global.opt.mtasks()) { putMakeClassEntry(of, "verilated_threads.cpp"); }
if (v3Global.opt.mtasks()) putMakeClassEntry(of, "verilated_threads.cpp");
} else if (support == 2 && slow) {
} else {
for (AstNodeFile* nodep = v3Global.rootp()->filesp(); nodep;

2
src/V3EmitV.cpp
View File

@ -815,7 +815,7 @@ public:
AstSenTree* domainp, bool user3mark)
: EmitVBaseVisitor{false, domainp}
, m_formatter{os, prefix, flWidth} {
if (user3mark) { AstUser3InUse::check(); }
if (user3mark) AstUser3InUse::check();
iterate(nodep);
}
virtual ~EmitVPrefixedVisitor() override = default;

4
src/V3EmitXml.cpp
View File

@ -55,7 +55,7 @@ class EmitXmlFileVisitor final : public AstNVisitor {
// XML methods
void outputId(AstNode* nodep) {
if (!nodep->user1()) { nodep->user1(++m_id); }
if (!nodep->user1()) nodep->user1(++m_id);
puts("\"" + cvtToStr(nodep->user1()) + "\"");
}
void outputTag(AstNode* nodep, const string& tagin) {
@ -336,7 +336,7 @@ private:
}
}
virtual void visit(AstCell* nodep) override {
if (nodep->modp()->dead()) { return; }
if (nodep->modp()->dead()) return;
if (!m_hasChildren) m_os << ">\n";
m_os << "<cell " << nodep->fileline()->xml() << " "
<< nodep->fileline()->xmlDetailedLocation() << " name=\"" << nodep->name() << "\""

4
src/V3Error.h
View File

@ -364,12 +364,12 @@ inline void v3errorEndFatal(std::ostringstream& sstr) {
// Assertion without object, generally UOBJASSERT preferred
#define UASSERT(condition, stmsg) \
do { \
if (VL_UNCOVERABLE(!(condition))) { v3fatalSrc(stmsg); } \
if (VL_UNCOVERABLE(!(condition))) v3fatalSrc(stmsg); \
} while (false)
// Assertion with object
#define UASSERT_OBJ(condition, obj, stmsg) \
do { \
if (VL_UNCOVERABLE(!(condition))) { (obj)->v3fatalSrc(stmsg); } \
if (VL_UNCOVERABLE(!(condition))) (obj)->v3fatalSrc(stmsg); \
} while (false)
// For use in V3Ast static functions only
#define UASSERT_STATIC(condition, stmsg) \

6
src/V3File.cpp
View File

@ -320,7 +320,7 @@ void V3File::createMakeDir() {
if (!created) {
created = true;
V3Os::createDir(v3Global.opt.makeDir());
if (v3Global.opt.hierTop()) { V3Os::createDir(v3Global.opt.hierTopDataDir()); }
if (v3Global.opt.hierTop()) V3Os::createDir(v3Global.opt.hierTopDataDir());
}
}
@ -787,11 +787,11 @@ void V3OutFormatter::puts(const char* strg) {
wordstart = false;
break;
case 'e':
if (wordstart && m_lang == LA_VERILOG && tokenEnd(cp)) { indentDec(); }
if (wordstart && m_lang == LA_VERILOG && tokenEnd(cp)) indentDec();
wordstart = false;
break;
case 'm':
if (wordstart && m_lang == LA_VERILOG && tokenStart(cp, "module")) { indentInc(); }
if (wordstart && m_lang == LA_VERILOG && tokenStart(cp, "module")) indentInc();
wordstart = false;
break;
default: wordstart = false; break;

4
src/V3FileLine.cpp
View File

@ -338,7 +338,7 @@ void FileLine::modifyStateInherit(const FileLine* fromp) {
// Any warnings that are off in "from", become off in "this".
for (int codei = V3ErrorCode::EC_MIN; codei < V3ErrorCode::_ENUM_MAX; codei++) {
V3ErrorCode code = V3ErrorCode(codei);
if (fromp->warnIsOff(code)) { warnOff(code, true); }
if (fromp->warnIsOff(code)) warnOff(code, true);
}
}
@ -358,7 +358,7 @@ void FileLine::v3errorEnd(std::ostringstream& sstr, const string& locationStr) {
} else if (!V3Error::errorContexted()) {
nsstr << warnContextPrimary();
}
if (!m_waive) { V3Waiver::addEntry(V3Error::errorCode(), filename(), sstr.str()); }
if (!m_waive) V3Waiver::addEntry(V3Error::errorCode(), filename(), sstr.str());
V3Error::v3errorEnd(nsstr, lstr.str());
}

4
src/V3Gate.cpp
View File

@ -264,7 +264,7 @@ private:
virtual void visit(AstNode* nodep) override {
// *** Special iterator
if (!m_isSimple) return; // Fastpath
if (++m_ops > v3Global.opt.gateStmts()) { clearSimple("--gate-stmts exceeded"); }
if (++m_ops > v3Global.opt.gateStmts()) clearSimple("--gate-stmts exceeded");
if (!(m_dedupe ? nodep->isGateDedupable() : nodep->isGateOptimizable()) //
|| !nodep->isPure() || nodep->isBrancher()) {
UINFO(5, "Non optimizable type: " << nodep << endl);
@ -282,7 +282,7 @@ public:
// Iterate
iterate(nodep);
// Check results
if (!m_substTreep) { clearSimple("No assignment found\n"); }
if (!m_substTreep) clearSimple("No assignment found\n");
for (GateVarRefList::const_iterator it = m_rhsVarRefs.begin(); it != m_rhsVarRefs.end();
++it) {
if (m_lhsVarRef && m_lhsVarRef->varScopep() == (*it)->varScopep()) {

2
src/V3Graph.cpp
View File

@ -377,7 +377,7 @@ void V3Graph::dumpDotFile(const string& filename, bool colorAsSubgraph) const {
<< (edgep->dotLabel() != "" ? edgep->dotLabel() : "") << "\""
<< " weight=" << edgep->weight() << " color=" << edgep->dotColor();
if (edgep->dotStyle() != "") *logp << " style=" << edgep->dotStyle();
// if (edgep->cutable()) { *logp<<",constraint=false"; } // to rank without
// if (edgep->cutable()) *logp << ",constraint=false"; // to rank without
// following edges
*logp << "];\n";
}

4
src/V3GraphAlg.cpp
View File

@ -271,7 +271,9 @@ private:
}
for (V3GraphVertex* vertexp = m_graphp->verticesBeginp(); vertexp;
vertexp = vertexp->verticesNextp()) {
if (!vertexp->user()) { vertexIterate(vertexp, 1); }
if (!vertexp->user()) { //
vertexIterate(vertexp, 1);
}
}
}

2
src/V3GraphDfa.cpp
View File

@ -445,7 +445,7 @@ private:
for (V3GraphVertex *nextp, *vertexp = m_graphp->verticesBeginp(); vertexp;
vertexp = nextp) {
nextp = vertexp->verticesNextp();
if (!vertexp->user()) { VL_DO_DANGLING(vertexp->unlinkDelete(m_graphp), vertexp); }
if (!vertexp->user()) VL_DO_DANGLING(vertexp->unlinkDelete(m_graphp), vertexp);
}
}

2
src/V3GraphStream.h
View File

@ -175,7 +175,7 @@ public:
// Wrap curIt. Expect to wrap, and make another pass, to find
// newly-ready elements that could have appeared ahead of the
// m_last iterator
if (curIt == m_readyVertices.end()) { curIt = m_readyVertices.begin(); }
if (curIt == m_readyVertices.end()) curIt = m_readyVertices.begin();
}
if (curIt != m_readyVertices.end()) {

2
src/V3HierBlock.cpp
View File

@ -224,7 +224,7 @@ void V3HierBlock::writeCommandArgsFile(bool forCMake) const {
for (const auto& hierblockp : m_children) *of << hierblockp->hierBlockArgs().front() << "\n";
// Hierarchical blocks should not use multi-threading,
// but needs to be thread safe when top is multi-threaded.
if (v3Global.opt.threads() > 0) { *of << "--threads 1\n"; }
if (v3Global.opt.threads() > 0) *of << "--threads 1\n";
*of << v3Global.opt.allArgsStringForHierBlock(false) << "\n";
}

10
src/V3Inline.cpp
View File

@ -381,8 +381,8 @@ private:
string name = m_cellp->name() + "__DOT__" + nodep->name();
if (!nodep->isFuncLocal() && !nodep->isClassMember()) nodep->inlineAttrReset(name);
if (!m_cellp->isTrace()) nodep->trace(false);
if (debug() >= 9) { nodep->dumpTree(cout, "varchanged:"); }
if (debug() >= 9 && nodep->valuep()) { nodep->valuep()->dumpTree(cout, "varchangei:"); }
if (debug() >= 9) nodep->dumpTree(cout, "varchanged:");
if (debug() >= 9 && nodep->valuep()) nodep->valuep()->dumpTree(cout, "varchangei:");
iterateChildren(nodep);
}
virtual void visit(AstNodeFTask* nodep) override {
@ -595,7 +595,7 @@ private:
// Cleanup var names, etc, to not conflict
{ InlineRelinkVisitor(newmodp, m_modp, nodep); }
// Move statements to top module
if (debug() >= 9) { newmodp->dumpTree(cout, "fixmod:"); }
if (debug() >= 9) newmodp->dumpTree(cout, "fixmod:");
AstNode* stmtsp = newmodp->stmtsp();
if (stmtsp) stmtsp->unlinkFrBackWithNext();
if (stmtsp) m_modp->addStmtp(stmtsp);
@ -603,7 +603,7 @@ private:
VL_DO_DANGLING(newmodp->deleteTree(), newmodp); // Clear any leftover ports, etc
nodep->unlinkFrBack();
VL_DO_DANGLING(pushDeletep(nodep), nodep);
if (debug() >= 9) { m_modp->dumpTree(cout, "donemod:"); }
if (debug() >= 9) m_modp->dumpTree(cout, "donemod:");
}
}
@ -638,7 +638,7 @@ private:
// VISITORS
virtual void visit(AstNetlist* nodep) override { iterateChildren(nodep); }
virtual void visit(AstModule* nodep) override {
if (nodep->isTop()) { iterateChildren(nodep); }
if (nodep->isTop()) iterateChildren(nodep);
}
virtual void visit(AstCell* nodep) override {
VL_RESTORER(m_scope);

6
src/V3Inst.cpp
View File

@ -543,7 +543,7 @@ public:
// Done. Constant.
} else {
// Make a new temp wire
// if (1 || debug() >= 9) { pinp->dumpTree(cout, "-in_pin:"); }
// if (1 || debug() >= 9) pinp->dumpTree(cout, "-in_pin:");
V3Inst::checkOutputShort(pinp);
AstNode* pinexprp = pinp->exprp()->unlinkFrBack();
string newvarname
@ -575,8 +575,8 @@ public:
pinp->exprp(new AstVarRef(pinexprp->fileline(), newvarp, VAccess::READ));
}
if (assignp) cellp->addNextHere(assignp);
// if (debug()) { pinp->dumpTree(cout, "- out:"); }
// if (debug()) { assignp->dumpTree(cout, "- aout:"); }
// if (debug()) pinp->dumpTree(cout, "- out:");
// if (debug()) assignp->dumpTree(cout, "- aout:");
}
return assignp;
}

4
src/V3LifePost.cpp
View File

@ -110,8 +110,8 @@ public:
bool operator<(const LifeLocation& b) const {
unsigned a_id = mtaskp ? mtaskp->id() : 0;
unsigned b_id = b.mtaskp ? b.mtaskp->id() : 0;
if (a_id < b_id) { return true; }
if (b_id < a_id) { return false; }
if (a_id < b_id) return true;
if (b_id < a_id) return false;
return sequence < b.sequence;
}
};

4
src/V3LinkCells.cpp
View File

@ -453,7 +453,9 @@ private:
nodep->hasIfaceVar(true);
}
}
if (nodep->modp()) { iterateChildren(nodep); }
if (nodep->modp()) { //
iterateChildren(nodep);
}
UINFO(4, " Link Cell done: " << nodep << endl);
}

8
src/V3LinkDot.cpp
View File

@ -369,7 +369,7 @@ public:
symp->classOrPackagep(classOrPackagep);
symp->fallbackp(abovep);
nodep->user1p(symp);
if (name != "") { checkDuplicate(abovep, nodep, name); }
if (name != "") checkDuplicate(abovep, nodep, name);
// Duplicates are possible, as until resolve generates might have 2 same cells under an if
abovep->reinsert(name, symp);
return symp;
@ -409,7 +409,7 @@ public:
// Mark the given variable name as being allowed to be implicitly declared
if (nodep) {
const auto it = m_implicitNameSet.find(make_pair(nodep, varname));
if (it == m_implicitNameSet.end()) { m_implicitNameSet.emplace(nodep, varname); }
if (it == m_implicitNameSet.end()) m_implicitNameSet.emplace(nodep, varname);
}
}
bool implicitOk(AstNodeModule* nodep, const string& varname) {
@ -2107,7 +2107,7 @@ private:
&& (VN_IS(nodep->lhsp(), CellRef) || VN_IS(nodep->lhsp(), CellArrayRef))) {
m_ds.m_unlinkedScopep = nodep->lhsp();
}
if (VN_IS(nodep->lhsp(), LambdaArgRef)) { m_ds.m_unlinkedScopep = nodep->lhsp(); }
if (VN_IS(nodep->lhsp(), LambdaArgRef)) m_ds.m_unlinkedScopep = nodep->lhsp();
if (!m_ds.m_dotErr) { // Once something wrong, give up
// Top 'final' dot RHS is final RHS, else it's a
// DOT(DOT(x,*here*),real-rhs) which we consider a RHS
@ -2152,7 +2152,7 @@ private:
// Generally resolved during Primay, but might be at param time under AstUnlinkedRef
UASSERT_OBJ(m_statep->forPrimary() || m_statep->forPrearray(), nodep,
"ParseRefs should no longer exist");
if (nodep->name() == "super") { nodep->v3warn(E_UNSUPPORTED, "Unsupported: super"); }
if (nodep->name() == "super") nodep->v3warn(E_UNSUPPORTED, "Unsupported: super");
DotStates lastStates = m_ds;
bool start = (m_ds.m_dotPos == DP_NONE); // Save, as m_dotp will be changed
if (start) {

2
src/V3LinkResolve.cpp
View File

@ -134,7 +134,7 @@ private:
iterateChildren(nodep);
}
m_ftaskp = nullptr;
if (nodep->dpiExport()) { nodep->scopeNamep(new AstScopeName(nodep->fileline())); }
if (nodep->dpiExport()) nodep->scopeNamep(new AstScopeName(nodep->fileline()));
}
virtual void visit(AstNodeFTaskRef* nodep) override {
iterateChildren(nodep);

6
src/V3MergeCond.cpp
View File

@ -147,7 +147,7 @@ private:
return condp;
} else if (AstAnd* const andp = VN_CAST(rhsp, And)) {
if (AstNodeCond* const condp = VN_CAST(andp->rhsp(), NodeCond)) {
if (VN_IS(andp->lhsp(), Const)) { return condp; }
if (VN_IS(andp->lhsp(), Const)) return condp;
}
}
return nullptr;
@ -174,7 +174,9 @@ private:
} else if (AstNodeCond* const condp = extractCond(rhsp)) {
AstNode* const resp
= condTrue ? condp->expr1p()->unlinkFrBack() : condp->expr2p()->unlinkFrBack();
if (condp == rhsp) { return resp; }
if (condp == rhsp) { //
return resp;
}
if (AstAnd* const andp = VN_CAST(rhsp, And)) {
UASSERT_OBJ(andp->rhsp() == condp, rhsp, "Should not try to fold this");
return new AstAnd(andp->fileline(), andp->lhsp()->cloneTree(false), resp);

16
src/V3Number.cpp
View File

@ -401,7 +401,7 @@ V3Number& V3Number::setLongS(vlsint32_t value) {
return *this;
}
V3Number& V3Number::setDouble(double value) {
if (VL_UNCOVERABLE(width() != 64)) { v3fatalSrc("Real operation on wrong sized number"); }
if (VL_UNCOVERABLE(width() != 64)) v3fatalSrc("Real operation on wrong sized number");
m_double = true;
union {
double d;
@ -951,10 +951,10 @@ bool V3Number::isAnyZ() const {
bool V3Number::isLtXZ(const V3Number& rhs) const {
// Include X/Z in comparisons for sort ordering
for (int bit = 0; bit < std::max(this->width(), rhs.width()); bit++) {
if (this->bitIs1(bit) && rhs.bitIs0(bit)) { return true; }
if (rhs.bitIs1(bit) && this->bitIs0(bit)) { return false; }
if (this->bitIsXZ(bit)) { return true; }
if (rhs.bitIsXZ(bit)) { return false; }
if (this->bitIs1(bit) && rhs.bitIs0(bit)) return true;
if (rhs.bitIs1(bit) && this->bitIs0(bit)) return false;
if (this->bitIsXZ(bit)) return true;
if (rhs.bitIsXZ(bit)) return false;
}
return false;
}
@ -1347,14 +1347,14 @@ V3Number& V3Number::opLogAnd(const V3Number& lhs, const V3Number& rhs) {
loutc = 1;
break;
}
if (lhs.bitIsXZ(bit) && loutc == 0) { loutc = 'x'; }
if (lhs.bitIsXZ(bit) && loutc == 0) loutc = 'x';
}
for (int bit = 0; bit < rhs.width(); bit++) {
if (rhs.bitIs1(bit)) {
routc = 1;
break;
}
if (rhs.bitIsXZ(bit) && routc == 0) { routc = 'x'; }
if (rhs.bitIsXZ(bit) && routc == 0) routc = 'x';
}
char outc = 'x';
if (routc == 1 && loutc == 1) outc = 1;
@ -1528,7 +1528,7 @@ bool V3Number::isCaseEq(const V3Number& rhs) const {
if (this->width() != rhs.width()) return false;
for (int bit = 0; bit < std::max(this->width(), rhs.width()); bit++) {
if (this->bitIs(bit) != rhs.bitIs(bit)) { return false; }
if (this->bitIs(bit) != rhs.bitIs(bit)) return false;
}
return true;
}

2
src/V3Number_test.cpp
View File

@ -110,7 +110,7 @@ void test(const string& lhss, const string& op, const string& rhss, const string
V3Number ok(fl, 1);
ok.opCaseEq(expnum, gotnum);
if (ok.toUInt() != 1) { v3fatalSrc("%Error:Test FAILED"); }
if (ok.toUInt() != 1) v3fatalSrc("%Error:Test FAILED");
free(l1);
free(r1);

4
src/V3Options.cpp
View File

@ -1370,7 +1370,7 @@ void V3Options::parseOptsList(FileLine* fl, const string& optdir, int argc, char
string msg = sw + strlen("-Werror-");
V3ErrorCode code(msg.c_str());
if (code == V3ErrorCode::EC_ERROR) {
if (!isFuture(msg)) { fl->v3fatal("Unknown warning specified: " << sw); }
if (!isFuture(msg)) fl->v3fatal("Unknown warning specified: " << sw);
} else {
V3Error::pretendError(code, true);
}
@ -1403,7 +1403,7 @@ void V3Options::parseOptsList(FileLine* fl, const string& optdir, int argc, char
string msg = sw + strlen("-Wwarn-");
V3ErrorCode code(msg.c_str());
if (code == V3ErrorCode::EC_ERROR) {
if (!isFuture(msg)) { fl->v3fatal("Unknown warning specified: " << sw); }
if (!isFuture(msg)) fl->v3fatal("Unknown warning specified: " << sw);
} else {
FileLine::globalWarnOff(code, false);
V3Error::pretendError(code, false);

4
src/V3Order.cpp
View File

@ -487,7 +487,7 @@ public:
for (V3GraphVertex* itp = m_graphp->verticesBeginp(); itp; itp = itp->verticesNextp()) {
if (OrderLogicVertex* lvertexp = dynamic_cast<OrderLogicVertex*>(itp)) {
T_MoveVertex* moveVxp = m_logic2move[lvertexp];
if (moveVxp) { iterate(moveVxp, lvertexp, lvertexp->domainp()); }
if (moveVxp) iterate(moveVxp, lvertexp, lvertexp->domainp());
}
}
}
@ -1661,7 +1661,7 @@ void OrderVisitor::processMovePrepReady() {
UINFO(5, " MovePrepReady\n");
for (OrderMoveVertex* vertexp = m_pomWaiting.begin(); vertexp;) {
OrderMoveVertex* nextp = vertexp->pomWaitingNextp();
if (vertexp->isWait() && vertexp->inEmpty()) { processMoveReadyOne(vertexp); }
if (vertexp->isWait() && vertexp->inEmpty()) processMoveReadyOne(vertexp);
vertexp = nextp;
}
}

2
src/V3Os.cpp
View File

@ -271,7 +271,7 @@ string V3Os::trueRandom(size_t size) {
#if defined(_WIN32) || defined(__MINGW32__)
NTSTATUS hr = BCryptGenRandom(nullptr, reinterpret_cast<BYTE*>(data), size,
BCRYPT_USE_SYSTEM_PREFERRED_RNG);
if (!BCRYPT_SUCCESS(hr)) { v3fatal("Could not acquire random data."); }
if (!BCRYPT_SUCCESS(hr)) v3fatal("Could not acquire random data.");
#else
std::ifstream is("/dev/urandom", std::ios::in | std::ios::binary);
// This read uses the size of the buffer.

4
src/V3ParseImp.cpp
View File

@ -178,7 +178,7 @@ void V3ParseImp::lexErrorPreprocDirective(FileLine* fl, const char* textp) {
string V3ParseImp::lexParseTag(const char* textp) {
string tmp = textp + strlen("/*verilator tag ");
string::size_type pos;
if ((pos = tmp.rfind("*/")) != string::npos) { tmp.erase(pos); }
if ((pos = tmp.rfind("*/")) != string::npos) tmp.erase(pos);
return tmp;
}
@ -468,7 +468,7 @@ void V3ParseImp::tokenPipeline() {
V3ParseBisonYYSType curValue = yylval; // Remember value, as about to read ahead
{
size_t depth = tokenPipeScanParam(0);
if (tokenPeekp(depth)->token == yP_COLONCOLON) { token = yaID__CC; }
if (tokenPeekp(depth)->token == yP_COLONCOLON) token = yaID__CC;
}
yylval = curValue;
}

2
src/V3ParseLex.cpp
View File

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

24
src/V3Partition.cpp
View File

@ -749,8 +749,8 @@ public:
|| LogicMTask::pathExistsFrom(m_bp, m_ap, nullptr));
}
bool operator<(const SiblingMC& other) const {
if (m_ap->id() < other.m_ap->id()) { return true; }
if (m_ap->id() > other.m_ap->id()) { return false; }
if (m_ap->id() < other.m_ap->id()) return true;
if (m_ap->id() > other.m_ap->id()) return false;
return m_bp->id() < other.m_bp->id();
}
};
@ -1245,7 +1245,7 @@ private:
for (SibpSet::iterator it = m_mtask2sibs[mtaskp].begin(); it != m_mtask2sibs[mtaskp].end();
++it) {
const SiblingMC* pairp = *it;
if (!pairp->removedFromSb()) { m_sb.removeElem(pairp); }
if (!pairp->removedFromSb()) m_sb.removeElem(pairp);
LogicMTask* otherp = (pairp->bp() == mtaskp) ? pairp->ap() : pairp->bp();
size_t erased = m_mtask2sibs[otherp].erase(pairp);
UASSERT_OBJ(erased > 0, otherp, "Expected existing mtask");
@ -1409,7 +1409,7 @@ private:
return 1 + edgeScore(edgep);
}
const SiblingMC* sibsp = dynamic_cast<const SiblingMC*>(pairp);
if (sibsp) { return siblingScore(sibsp); }
if (sibsp) return siblingScore(sibsp);
v3fatalSrc("Failed to cast pairp to either MTaskEdge or SiblingMC in mergeCandidateScore");
return 0;
}
@ -1472,10 +1472,10 @@ private:
const LogicMTask* bp = *reinterpret_cast<const LogicMTask* const*>(vbp);
uint32_t aCp = ap->critPathCost(*wp) + ap->stepCost();
uint32_t bCp = bp->critPathCost(*wp) + bp->stepCost();
if (aCp < bCp) { return -1; }
if (aCp > bCp) { return 1; }
if (ap->id() < bp->id()) { return -1; }
if (ap->id() > bp->id()) { return 1; }
if (aCp < bCp) return -1;
if (aCp > bCp) return 1;
if (ap->id() < bp->id()) return -1;
if (ap->id() > bp->id()) return 1;
return 0;
}
@ -1534,7 +1534,7 @@ private:
for (unsigned i = 0; i < chain_len; ++i) {
LogicMTask* mtp = new LogicMTask(&mtasks, nullptr);
mtp->setCost(1);
if (lastp) { new MTaskEdge(&mtasks, lastp, mtp, 1); }
if (lastp) new MTaskEdge(&mtasks, lastp, mtp, 1);
lastp = mtp;
}
partInitCriticalPaths(&mtasks);
@ -1802,7 +1802,7 @@ private:
++it) {
LogicMTask* mtaskp = *it;
if (mergedp) {
if (mergedp->cost() < mtaskp->cost()) { mergedp = mtaskp; }
if (mergedp->cost() < mtaskp->cost()) mergedp = mtaskp;
} else {
mergedp = mtaskp;
}
@ -1983,7 +1983,7 @@ public:
for (V3GraphVertex* vxp = m_mtasksp->verticesBeginp(); vxp;
vxp = vxp->verticesNextp()) {
LogicMTask* mtaskp = dynamic_cast<LogicMTask*>(vxp);
if (hasDpiHazard(mtaskp)) { tasksByRank[vxp->rank()].insert(mtaskp); }
if (hasDpiHazard(mtaskp)) tasksByRank[vxp->rank()].insert(mtaskp);
}
mergeSameRankTasks(&tasksByRank);
}
@ -2415,7 +2415,7 @@ void V3Partition::go(V3Graph* mtasksp) {
mtasksp->orderPreRanked();
int targetParFactor = v3Global.opt.threads();
if (targetParFactor < 2) { v3fatalSrc("We should not reach V3Partition when --threads <= 1"); }
if (targetParFactor < 2) v3fatalSrc("We should not reach V3Partition when --threads <= 1");
// Set cpLimit to roughly totalGraphCost / nThreads
//

2
src/V3PreProc.cpp
View File

@ -953,7 +953,7 @@ int V3PreProcImp::getStateToken() {
// Most states emit white space and comments between tokens. (Unless collecting a string)
if (tok == VP_WHITE && state() != ps_STRIFY) return tok;
if (tok == VP_BACKQUOTE && state() != ps_STRIFY) { tok = VP_TEXT; }
if (tok == VP_BACKQUOTE && state() != ps_STRIFY) tok = VP_TEXT;
if (tok == VP_COMMENT) {
if (!m_off) {
if (m_lexp->m_keepComments == KEEPCMT_SUB) {

4
src/V3ProtectLib.cpp
View File

@ -205,7 +205,7 @@ private:
m_tmpDeclsp = new AstTextBlock(fl);
txtp->addNodep(m_tmpDeclsp);
txtp->addText(fl, "\ntime last_combo_seqnum__V;\n");
if (m_hasClk) { txtp->addText(fl, "time last_seq_seqnum__V;\n\n"); }
if (m_hasClk) txtp->addText(fl, "time last_seq_seqnum__V;\n\n");
// CPP hash value
addComment(txtp, fl, "Hash value to make sure this file and the corresponding");
@ -425,7 +425,7 @@ private:
m_comboPortsp->addNodep(varp->cloneTree(false));
m_comboParamsp->addText(fl, varp->name() + "\n");
m_comboIgnorePortsp->addNodep(varp->cloneTree(false));
if (m_hasClk) { m_comboIgnoreParamsp->addText(fl, varp->name() + "\n"); }
if (m_hasClk) m_comboIgnoreParamsp->addText(fl, varp->name() + "\n");
m_cComboParamsp->addText(fl, varp->dpiArgType(true, false) + "\n");
m_cComboInsp->addText(fl, cInputConnection(varp));
m_cIgnoreParamsp->addText(fl, varp->dpiArgType(true, false) + "\n");

2
src/V3Slice.cpp
View File

@ -141,7 +141,7 @@ class SliceVisitor final : public AstNVisitor {
AstNode* newp = nodep->cloneType // AstNodeAssign
(cloneAndSel(nodep->lhsp(), elements, offset),
cloneAndSel(nodep->rhsp(), elements, offset));
if (debug() >= 9) { newp->dumpTree(cout, "-new "); }
if (debug() >= 9) newp->dumpTree(cout, "-new ");
newlistp = AstNode::addNextNull(newlistp, newp);
}
if (debug() >= 9) nodep->dumpTree(cout, " Deslice-Dn: ");

4
src/V3SplitVar.cpp
View File

@ -853,7 +853,7 @@ public:
// If this is AstVarRef and referred in the sensitivity list of always@,
// return the sensitivity item
AstSenItem* backSenItemp() const {
if (AstVarRef* refp = VN_CAST(m_nodep, VarRef)) { return VN_CAST(refp->backp(), SenItem); }
if (AstVarRef* refp = VN_CAST(m_nodep, VarRef)) return VN_CAST(refp->backp(), SenItem);
return nullptr;
}
};
@ -971,7 +971,7 @@ class SplitPackedVarVisitor final : public AstNVisitor, public SplitVarImpl {
nodep->attrSplitVar(false);
} else { // Finally find a good candidate
const bool inserted = m_refs.insert(std::make_pair(nodep, PackedVarRef(nodep))).second;
if (inserted) { UINFO(3, nodep->prettyNameQ() << " is added to candidate list.\n"); }
if (inserted) UINFO(3, nodep->prettyNameQ() << " is added to candidate list.\n");
}
}
virtual void visit(AstVarRef* nodep) override {

6
src/V3TSP.cpp
View File

@ -379,7 +379,7 @@ public:
for (V3GraphEdge* edgep = vxp->outBeginp(); edgep; edgep = edgep->outNextp()) {
degree++;
}
if (degree & 1) { result.push_back(tspvp->key()); }
if (degree & 1) result.push_back(tspvp->key());
}
return result;
}
@ -402,7 +402,7 @@ void V3TSP::tspSort(const V3TSP::StateVec& states, V3TSP::StateVec* resultp) {
// Make this TSP implementation work for graphs of size 0 or 1
// which, unfortunately, is a special case as the following
// code assumes >= 2 nodes.
if (states.empty()) { return; }
if (states.empty()) return;
if (states.size() == 1) {
resultp->push_back(*(states.begin()));
return;
@ -482,7 +482,7 @@ void V3TSP::tspSort(const V3TSP::StateVec& states, V3TSP::StateVec* resultp) {
while (i != max_cost_idx) {
new_result.push_back((*resultp)[i]);
i++;
if (i >= resultp->size()) { i = 0; }
if (i >= resultp->size()) i = 0;
}
new_result.push_back((*resultp)[i]);

4
src/V3Table.cpp
View File

@ -135,7 +135,9 @@ private:
if (m_totalBytes > TABLE_TOTAL_BYTES) {
chkvis.clearOptimizable(nodep, "Table out of memory");
}
if (!m_outWidth || !m_inWidth) { chkvis.clearOptimizable(nodep, "Table has no outputs"); }
if (!m_outWidth || !m_inWidth) { //
chkvis.clearOptimizable(nodep, "Table has no outputs");
}
UINFO(4, " Test: Opt=" << (chkvis.optimizable() ? "OK" : "NO")
<< ", Instrs=" << chkvis.instrCount()
<< " Data=" << chkvis.dataCount() << " inw=" << m_inWidth

2
src/V3Task.cpp
View File

@ -182,7 +182,7 @@ private:
}
// Likewise, all FTask->scope mappings
for (AstNode* stmtp = nodep->blocksp(); stmtp; stmtp = stmtp->nextp()) {
if (AstNodeFTask* taskp = VN_CAST(stmtp, NodeFTask)) { taskp->user3p(nodep); }
if (AstNodeFTask* taskp = VN_CAST(stmtp, NodeFTask)) taskp->user3p(nodep);
}
iterateChildren(nodep);
}

4
src/V3Trace.cpp
View File

@ -300,7 +300,7 @@ private:
nextp = itp->verticesNextp();
if (TraceActivityVertex* const vtxp = dynamic_cast<TraceActivityVertex*>(itp)) {
// Leave in the always vertex for later use.
if (vtxp != m_alwaysVtxp && !vtxp->outBeginp()) { vtxp->unlinkDelete(&m_graph); }
if (vtxp != m_alwaysVtxp && !vtxp->outBeginp()) vtxp->unlinkDelete(&m_graph);
}
}
}
@ -646,7 +646,7 @@ private:
}
}
ifp = new AstIf(flp, condp, nullptr, nullptr);
if (!always) { ifp->branchPred(VBranchPred::BP_UNLIKELY); }
if (!always) ifp->branchPred(VBranchPred::BP_UNLIKELY);
subFuncp->addStmtsp(ifp);
subStmts += EmitCBaseCounterVisitor(ifp).count();
prevActSet = &actSet;

10
src/V3Unroll.cpp
View File

@ -365,10 +365,10 @@ private:
} else {
nodep->unlinkFrBack();
}
if (bodysp) { VL_DO_DANGLING(pushDeletep(bodysp), bodysp); }
if (precondsp) { VL_DO_DANGLING(pushDeletep(precondsp), precondsp); }
if (initp) { VL_DO_DANGLING(pushDeletep(initp), initp); }
if (incp && !incp->backp()) { VL_DO_DANGLING(pushDeletep(incp), incp); }
if (bodysp) VL_DO_DANGLING(pushDeletep(bodysp), bodysp);
if (precondsp) VL_DO_DANGLING(pushDeletep(precondsp), precondsp);
if (initp) VL_DO_DANGLING(pushDeletep(initp), initp);
if (incp && !incp->backp()) VL_DO_DANGLING(pushDeletep(incp), incp);
if (debug() >= 9 && newbodysp) newbodysp->dumpTree(cout, "- _new: ");
return true;
}
@ -385,7 +385,7 @@ private:
// Grab initial value
AstNode* initp = nullptr; // Should be statement before the while.
if (nodep->backp()->nextp() == nodep) initp = nodep->backp();
if (initp) { VL_DO_DANGLING(V3Const::constifyEdit(initp), initp); }
if (initp) VL_DO_DANGLING(V3Const::constifyEdit(initp), initp);
if (nodep->backp()->nextp() == nodep) initp = nodep->backp();
// Grab assignment
AstNode* incp = nullptr; // Should be last statement

10
src/V3Width.cpp
View File

@ -2669,7 +2669,7 @@ private:
newp = new AstCMethodHard(nodep->fileline(), nodep->fromp()->unlinkFrBack(),
"r_" + nodep->name(), withp);
newp->dtypeFrom(adtypep->subDTypep());
if (!nodep->firstAbovep()) { newp->makeStatement(); }
if (!nodep->firstAbovep()) newp->makeStatement();
} else if (nodep->name() == "min" || nodep->name() == "max" || nodep->name() == "unique"
|| nodep->name() == "unique_index") {
methodOkArguments(nodep, 0, 0);
@ -2762,7 +2762,7 @@ private:
newp = new AstCMethodHard(nodep->fileline(), nodep->fromp()->unlinkFrBack(),
"r_" + nodep->name(), withp);
newp->dtypeFrom(adtypep->subDTypep());
if (!nodep->firstAbovep()) { newp->makeStatement(); }
if (!nodep->firstAbovep()) newp->makeStatement();
} else if (nodep->name() == "reverse" || nodep->name() == "shuffle"
|| nodep->name() == "sort" || nodep->name() == "rsort") {
AstWith* withp = nullptr;
@ -2876,7 +2876,7 @@ private:
newp = new AstCMethodHard(nodep->fileline(), nodep->fromp()->unlinkFrBack(),
nodep->name(), nullptr);
newp->dtypeFrom(adtypep->subDTypep());
if (!nodep->firstAbovep()) { newp->makeStatement(); }
if (!nodep->firstAbovep()) newp->makeStatement();
} else if (nodep->name() == "push_back" || nodep->name() == "push_front") {
methodOkArguments(nodep, 1, 1);
methodCallLValueRecurse(nodep, nodep->fromp(), VAccess::WRITE);
@ -2894,7 +2894,7 @@ private:
newp = new AstCMethodHard(nodep->fileline(), nodep->fromp()->unlinkFrBack(),
"r_" + nodep->name(), withp);
newp->dtypeFrom(adtypep->subDTypep());
if (!nodep->firstAbovep()) { newp->makeStatement(); }
if (!nodep->firstAbovep()) newp->makeStatement();
} else if (nodep->name() == "reverse" || nodep->name() == "shuffle"
|| nodep->name() == "sort" || nodep->name() == "rsort") {
AstWith* withp = nullptr;
@ -5593,7 +5593,7 @@ private:
AstNodeBiop* replaceWithDVersion(AstNodeBiop* nodep) {
// Given a signed/unsigned node type, create the opposite type
// Return new node or nullptr if nothing
if (nodep->doubleFlavor()) { return nullptr; }
if (nodep->doubleFlavor()) return nullptr;
FileLine* fl = nodep->fileline();
AstNode* lhsp = nodep->lhsp()->unlinkFrBack();
AstNode* rhsp = nodep->rhsp()->unlinkFrBack();

14
src/V3WidthSel.cpp
View File

@ -313,7 +313,7 @@ private:
nodep->replaceWith(fromp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
}
if (!rhsp->backp()) { VL_DO_DANGLING(pushDeletep(rhsp), rhsp); }
if (!rhsp->backp()) VL_DO_DANGLING(pushDeletep(rhsp), rhsp);
}
virtual void visit(AstSelExtract* nodep) override {
// Select of a range specified part of an array, i.e. "array[2:3]"
@ -458,9 +458,9 @@ private:
VL_DO_DANGLING(pushDeletep(nodep), nodep);
}
// delete whatever we didn't use in reconstruction
if (!fromp->backp()) { VL_DO_DANGLING(pushDeletep(fromp), fromp); }
if (!msbp->backp()) { VL_DO_DANGLING(pushDeletep(msbp), msbp); }
if (!lsbp->backp()) { VL_DO_DANGLING(pushDeletep(lsbp), lsbp); }
if (!fromp->backp()) VL_DO_DANGLING(pushDeletep(fromp), fromp);
if (!msbp->backp()) VL_DO_DANGLING(pushDeletep(msbp), msbp);
if (!lsbp->backp()) VL_DO_DANGLING(pushDeletep(lsbp), lsbp);
}
void replaceSelPlusMinus(AstNodePreSel* nodep) {
@ -563,9 +563,9 @@ private:
VL_DO_DANGLING(pushDeletep(nodep), nodep);
}
// delete whatever we didn't use in reconstruction
if (!fromp->backp()) { VL_DO_DANGLING(pushDeletep(fromp), fromp); }
if (!rhsp->backp()) { VL_DO_DANGLING(pushDeletep(rhsp), rhsp); }
if (!widthp->backp()) { VL_DO_DANGLING(pushDeletep(widthp), widthp); }
if (!fromp->backp()) VL_DO_DANGLING(pushDeletep(fromp), fromp);
if (!rhsp->backp()) VL_DO_DANGLING(pushDeletep(rhsp), rhsp);
if (!widthp->backp()) VL_DO_DANGLING(pushDeletep(widthp), widthp);
}
virtual void visit(AstSelPlus* nodep) override { replaceSelPlusMinus(nodep); }
virtual void visit(AstSelMinus* nodep) override { replaceSelPlusMinus(nodep); }

2
src/VlcTop.cpp
View File

@ -219,7 +219,7 @@ void VlcTop::annotateCalc() {
for (int lni = start; start && lni <= end; ++lni) {
source.incCount(lni, point.column(), point.count(), ok);
}
if (!*covp) { break; }
if (!*covp) break;
start = 0; // Prep for next
end = 0;
range = false;

2
test_regress/t/t_dpi_accessors.cpp
View File

@ -56,7 +56,7 @@ static void logRegHex(int clk, const char* desc, int bitWidth, int val, const ch
// Convenience function to check we got an expected result. Silent on success.
static void checkResult(bool p, const char* msg_fail) {
if (!p) { vl_fatal(__FILE__, __LINE__, "dut", msg_fail); }
if (!p) vl_fatal(__FILE__, __LINE__, "dut", msg_fail);
}
// Main function instantiates the model and steps through the test.

4
test_regress/t/t_dpi_arg_inout_unpack.cpp
View File

@ -91,7 +91,7 @@ void set_uint(svBitVecVal* v0, sv_longint_unsigned_t val, int bitwidth) {
template <typename T> bool compare(const T& act, const T& exp) {
if (exp == act) {
if (VERBOSE_MESSAGE) { std::cout << "OK Exp:" << exp << " actual:" << act << std::endl; }
if (VERBOSE_MESSAGE) std::cout << "OK Exp:" << exp << " actual:" << act << std::endl;
return true;
} else {
std::cout << "NG Exp:" << exp << " actual:" << act << std::endl;
@ -106,7 +106,7 @@ bool compare_scalar(const svScalar v0, sv_longint_unsigned_t val) {
std::cout << "Mismatch at bit:" << 0 << " exp:" << exp_bit << " act:" << act_bit;
return false;
}
if (VERBOSE_MESSAGE) { std::cout << "OK " << val << " as expected " << std::endl; }
if (VERBOSE_MESSAGE) std::cout << "OK " << val << " as expected " << std::endl;
return true;
}

2
test_regress/t/t_dpi_arg_input_unpack.cpp
View File

@ -77,7 +77,7 @@ const bool VERBOSE_MESSAGE = false;
template <typename T> bool compare(const T& act, const T& exp) {
if (exp == act) {
if (VERBOSE_MESSAGE) { std::cout << "OK Exp:" << exp << " actual:" << act << std::endl; }
if (VERBOSE_MESSAGE) std::cout << "OK Exp:" << exp << " actual:" << act << std::endl;
return true;
} else {
std::cout << "NG Exp:" << exp << " actual:" << act << std::endl;

2
test_regress/t/t_dpi_arg_output_unpack.cpp
View File

@ -175,7 +175,7 @@ void set_3d(svBitVecVal* v, int bitwidth) {
template <typename T> bool compare(const T& act, const T& exp) {
if (exp == act) {
if (VERBOSE_MESSAGE) { std::cout << "OK Exp:" << exp << " actual:" << act << std::endl; }
if (VERBOSE_MESSAGE) std::cout << "OK Exp:" << exp << " actual:" << act << std::endl;
return true;
} else {
std::cout << "NG Exp:" << exp << " actual:" << act << std::endl;

2
test_regress/t/t_dpi_context_c.cpp
View File

@ -55,7 +55,7 @@ int dpic_line() {
#ifdef VERILATOR
static int didDump = 0;
if (didDump++ == 0) { Verilated::scopesDump(); }
if (didDump++ == 0) Verilated::scopesDump();
#endif
const char* scopenamep = svGetNameFromScope(scope);

2
test_regress/t/t_flag_fi.cpp
View File

@ -26,7 +26,7 @@ int main(int argc, char* argv[]) {
Verilated::debug(0);
topp->eval();
if (!gotit) { vl_fatal(__FILE__, __LINE__, "dut", "Never got call to myfunction"); }
if (!gotit) vl_fatal(__FILE__, __LINE__, "dut", "Never got call to myfunction");
topp->final();
VL_DO_DANGLING(delete topp, topp);

2
test_regress/t/t_tri_gate.cpp
View File

@ -44,7 +44,7 @@ int main() {
for (tb->SEL = 0; tb->SEL < 2; tb->SEL++) {
for (tb->A = 0; tb->A < 4; tb->A++) {
tb->eval();
if (!check()) { pass = false; }
if (!check()) pass = false;
}
}

2
test_regress/t/t_tri_inout.cpp
View File

@ -43,7 +43,7 @@ int main() {
for (tb->A = 0; tb->A < 2; tb->A++) {
for (tb->B = 0; tb->B < 2; tb->B++) {
tb->eval();
if (!check()) { pass = false; }
if (!check()) pass = false;
}
}
}

2
test_regress/t/t_tri_pullup.cpp
View File

@ -53,7 +53,7 @@ int main() {
for (tb->OE = 0; tb->OE < 2; tb->OE++) {
for (tb->A = 0; tb->A < 2; tb->A++) {
tb->eval();
if (!check()) { pass = false; }
if (!check()) pass = false;
}
}

2
test_regress/t/t_tri_select.cpp
View File

@ -54,7 +54,7 @@ int main() {
for (tb->A1 = 0; tb->A1 < 4; tb->A1++) {
for (tb->A2 = 0; tb->A2 < 4; tb->A2++) {
tb->eval();
if (!check()) { pass = false; }
if (!check()) pass = false;
}
}
}

12
test_regress/t/t_vpi_cb_iter.cpp
View File

@ -76,7 +76,7 @@ static int the_rw_callback(p_cb_data cb_data) {
static void reregister_value_cb() {
if (vh_value_cb) {
if (verbose) { vpi_printf(const_cast<char*>("- Removing cbValueChange callback\n")); }
if (verbose) vpi_printf(const_cast<char*>("- Removing cbValueChange callback\n"));
int ret = vpi_remove_cb(vh_value_cb);
vh_value_cb.freed();
CHECK_RESULT(ret, 1);
@ -88,7 +88,7 @@ static void reregister_value_cb() {
CHECK_RESULT_NE(main_time, last_value_cb_time);
last_value_cb_time = main_time;
}
if (verbose) { vpi_printf(const_cast<char*>("- Registering cbValueChange callback\n")); }
if (verbose) vpi_printf(const_cast<char*>("- Registering cbValueChange callback\n"));
t_cb_data cb_data_testcase;
bzero(&cb_data_testcase, sizeof(cb_data_testcase));
cb_data_testcase.cb_rtn = the_value_callback;
@ -109,7 +109,7 @@ static void reregister_value_cb() {
static void reregister_rw_cb() {
if (vh_rw_cb) {
if (verbose) { vpi_printf(const_cast<char*>("- Removing cbReadWriteSynch callback\n")); }
if (verbose) vpi_printf(const_cast<char*>("- Removing cbReadWriteSynch callback\n"));
int ret = vpi_remove_cb(vh_rw_cb);
vh_rw_cb.freed();
CHECK_RESULT(ret, 1);
@ -121,7 +121,7 @@ static void reregister_rw_cb() {
CHECK_RESULT_NE(main_time, last_rw_cb_time);
last_rw_cb_time = main_time;
}
if (verbose) { vpi_printf(const_cast<char*>("- Registering cbReadWriteSynch callback\n")); }
if (verbose) vpi_printf(const_cast<char*>("- Registering cbReadWriteSynch callback\n"));
t_cb_data cb_data_testcase;
bzero(&cb_data_testcase, sizeof(cb_data_testcase));
cb_data_testcase.cb_rtn = the_rw_callback;
@ -186,12 +186,12 @@ int main(int argc, char** argv, char** env) {
while (vl_time_stamp64() < sim_time && !Verilated::gotFinish()) {
main_time += 1;
if (verbose) { VL_PRINTF("Sim Time %d got_error %d\n", main_time, got_error); }
if (verbose) VL_PRINTF("Sim Time %d got_error %d\n", main_time, got_error);
topp->clk = !topp->clk;
topp->eval();
VerilatedVpi::callValueCbs();
VerilatedVpi::callCbs(cbReadWriteSynch);
if (got_error) { vl_stop(__FILE__, __LINE__, "TOP-cpp"); }
if (got_error) vl_stop(__FILE__, __LINE__, "TOP-cpp");
}
if (!Verilated::gotFinish()) {

16
test_regress/t/t_vpi_cbs_called.cpp
View File

@ -108,7 +108,7 @@ static int register_cb(const int next_state) {
}
// State of callback next time through loop
if (verbose) { vpi_printf(const_cast<char*>(" Updating callback for next loop:\n")); }
if (verbose) vpi_printf(const_cast<char*>(" Updating callback for next loop:\n"));
switch (next_state) {
case ACTIVE: {
if (verbose) {
@ -141,7 +141,7 @@ static int register_cb(const int next_state) {
break;
}
default:
if (verbose) { vpi_printf(const_cast<char*>(" - No change\n")); }
if (verbose) vpi_printf(const_cast<char*>(" - No change\n"));
break;
}
@ -161,7 +161,7 @@ static int test_callbacks(p_cb_data cb_data) {
t_cb_data cb_data_testcase;
bzero(&cb_data_testcase, sizeof(cb_data_testcase));
if (verbose) { vpi_printf(const_cast<char*>(" Checking callback results\n")); }
if (verbose) vpi_printf(const_cast<char*>(" Checking callback results\n"));
// Check results from previous loop
int cb = *cb_iter;
@ -192,7 +192,7 @@ static int test_callbacks(p_cb_data cb_data) {
}
int ret = register_cb(next_state);
if (ret) { return ret; }
if (ret) return ret;
// Update iterators for next loop
++state_iter;
@ -228,7 +228,7 @@ static int register_test_callback() {
bzero(&cb_data, sizeof(cb_data));
s_vpi_time t1;
if (verbose) { vpi_printf(const_cast<char*>(" Registering test_cbs Timed callback\n")); }
if (verbose) vpi_printf(const_cast<char*>(" Registering test_cbs Timed callback\n"));
cb_data.reason = cbAfterDelay;
t1.type = vpiSimTime;
@ -254,7 +254,7 @@ int main(int argc, char** argv, char** env) {
VM_PREFIX* topp = new VM_PREFIX(""); // Note null name - we're flattening it out
if (verbose) { VL_PRINTF("-- { Sim Time %d } --\n", main_time); }
if (verbose) VL_PRINTF("-- { Sim Time %d } --\n", main_time);
register_test_callback();
@ -279,7 +279,7 @@ int main(int argc, char** argv, char** env) {
} else {
cbs_called = VerilatedVpi::callCbs(i);
}
if (verbose) { VL_PRINTF(" - any callbacks called? %s\n", cbs_called ? "YES" : "NO"); }
if (verbose) VL_PRINTF(" - any callbacks called? %s\n", cbs_called ? "YES" : "NO");
callbacks_called[i] = cbs_called;
}
@ -287,7 +287,7 @@ int main(int argc, char** argv, char** env) {
main_time = VerilatedVpi::cbNextDeadline();
if (main_time == -1 && !Verilated::gotFinish()) {
if (verbose) { VL_PRINTF("-- { Sim Time %d , No more testcases } --\n", main_time); }
if (verbose) VL_PRINTF("-- { Sim Time %d , No more testcases } --\n", main_time);
if (got_error) {
vl_stop(__FILE__, __LINE__, "TOP-cpp");
} else {

2
test_regress/t/t_vpi_get.cpp
View File

@ -123,7 +123,7 @@ static int _mon_check_props(TestVpiHandle& handle, int size, int direction, int
int vpidir = vpi_get(vpiDirection, handle);
// Don't check port directions in verilator
// see #681
if (!TestSimulator::is_verilator()) { CHECK_RESULT(vpidir, direction); }
if (!TestSimulator::is_verilator()) CHECK_RESULT(vpidir, direction);
}
// check type of object

8
test_regress/t/t_vpi_param.cpp
View File

@ -112,7 +112,7 @@ int check_param_int(std::string name, PLI_INT32 format, int exp_value, bool verb
}
// values
if (verbose) { vpi_printf((PLI_BYTE8*)" Try writing value to %s ...\n", name.c_str()); }
if (verbose) vpi_printf((PLI_BYTE8*)" Try writing value to %s ...\n", name.c_str());
value.value.integer = exp_value;
vpi_put_value(param_h, &value, NULL, vpiNoDelay);
CHECK_RESULT_NZ(vpi_chk_error(&e));
@ -120,7 +120,7 @@ int check_param_int(std::string name, PLI_INT32 format, int exp_value, bool verb
vpi_printf((PLI_BYTE8*)" vpi_chk_error: %s\n", e.message);
}
if (verbose) { vpi_printf((PLI_BYTE8*)" Try reading value of %s ...\n", name.c_str()); }
if (verbose) vpi_printf((PLI_BYTE8*)" Try reading value of %s ...\n", name.c_str());
vpi_get_value(param_h, &value);
CHECK_RESULT_NZ(!vpi_chk_error(&e));
if (verbose && vpi_chk_error(&e)) {
@ -166,7 +166,7 @@ int check_param_str(std::string name, PLI_INT32 format, std::string exp_value, b
}
// values
if (verbose) { vpi_printf((PLI_BYTE8*)" Try writing value to %s ...\n", name.c_str()); }
if (verbose) vpi_printf((PLI_BYTE8*)" Try writing value to %s ...\n", name.c_str());
value.value.str = (PLI_BYTE8*)exp_value.c_str();
vpi_put_value(param_h, &value, NULL, vpiNoDelay);
CHECK_RESULT_NZ(vpi_chk_error(&e));
@ -174,7 +174,7 @@ int check_param_str(std::string name, PLI_INT32 format, std::string exp_value, b
vpi_printf((PLI_BYTE8*)" vpi_chk_error: %s\n", e.message);
}
if (verbose) { vpi_printf((PLI_BYTE8*)" Try reading value of %s ...\n", name.c_str()); }
if (verbose) vpi_printf((PLI_BYTE8*)" Try reading value of %s ...\n", name.c_str());
vpi_get_value(param_h, &value);
CHECK_RESULT_NZ(!vpi_chk_error(&e));
if (verbose && vpi_chk_error(&e)) {

4
test_regress/t/t_vpi_var.cpp
View File

@ -475,7 +475,7 @@ int _mon_check_string() {
v.format = vpiStringVal;
vpi_get_value(vh1, &v);
if (vpi_chk_error(&e)) { printf("%%vpi_chk_error : %s\n", e.message); }
if (vpi_chk_error(&e)) printf("%%vpi_chk_error : %s\n", e.message);
(void)vpi_chk_error(NULL);
@ -568,7 +568,7 @@ int _mon_check_putget_str(p_cb_data cb_data) {
TEST_MSG("new value\n");
for (int j = 0; j < 4; j++) {
data[i].value.vector[j].aval = rand_r(&seed);
if (j == (words - 1)) { data[i].value.vector[j].aval &= mask; }
if (j == (words - 1)) data[i].value.vector[j].aval &= mask;
TEST_MSG(" %08x\n", data[i].value.vector[j].aval);
}
v.value.vector = data[i].value.vector;