Cleanup trailing whitespace. No functional change
This commit is contained in:
parent
dbaedb5995
commit
37839e2709
|
|
@ -1173,8 +1173,8 @@ struct AstNodeStmt : public AstNode {
|
|||
: AstNode(fl) {}
|
||||
ASTNODE_BASE_FUNCS(NodeStmt)
|
||||
// METHODS
|
||||
virtual void addNextStmt(AstNode* newp, AstNode* belowp); // Stop statement searchback here
|
||||
virtual void addBeforeStmt(AstNode* newp, AstNode* belowp); // Stop statement searchback here
|
||||
virtual void addNextStmt(AstNode* newp, AstNode* belowp); // Stop statement searchback here
|
||||
virtual void addBeforeStmt(AstNode* newp, AstNode* belowp); // Stop statement searchback here
|
||||
};
|
||||
|
||||
struct AstNodeAssign : public AstNodeStmt {
|
||||
|
|
|
|||
|
|
@ -620,7 +620,7 @@ void AstVar::dump(ostream& str) {
|
|||
if (isConst()) str<<" [CONST]";
|
||||
if (isUsedClock()) str<<" [CLK]";
|
||||
if (isSigPublic()) str<<" [P]";
|
||||
if (isUsedLoopIdx()) str<<" [LOOP]";
|
||||
if (isUsedLoopIdx()) str<<" [LOOP]";
|
||||
if (attrClockEn()) str<<" [aCLKEN]";
|
||||
if (attrIsolateAssign()) str<<" [aISO]";
|
||||
if (attrFileDescr()) str<<" [aFD]";
|
||||
|
|
|
|||
|
|
@ -1451,7 +1451,7 @@ struct AstPull : public AstNode {
|
|||
private:
|
||||
bool m_direction;
|
||||
public:
|
||||
AstPull(FileLine* fileline, AstNode* lhsp, bool direction)
|
||||
AstPull(FileLine* fileline, AstNode* lhsp, bool direction)
|
||||
: AstNode(fileline) {
|
||||
setOp1p(lhsp);
|
||||
m_direction = direction;
|
||||
|
|
@ -2069,8 +2069,8 @@ struct AstWhile : public AstNodeStmt {
|
|||
virtual int instrCount() const { return instrCountBranch(); }
|
||||
virtual V3Hash sameHash() const { return V3Hash(); }
|
||||
virtual bool same(AstNode* samep) const { return true; }
|
||||
virtual void addBeforeStmt(AstNode* newp, AstNode* belowp); // Stop statement searchback here
|
||||
virtual void addNextStmt(AstNode* newp, AstNode* belowp); // Stop statement searchback here
|
||||
virtual void addBeforeStmt(AstNode* newp, AstNode* belowp); // Stop statement searchback here
|
||||
virtual void addNextStmt(AstNode* newp, AstNode* belowp); // Stop statement searchback here
|
||||
};
|
||||
|
||||
struct AstBreak : public AstNodeStmt {
|
||||
|
|
@ -2352,7 +2352,7 @@ public:
|
|||
m_code = 0;
|
||||
m_codeInc = varp->dtypep()->arrayElements() * varp->widthWords();
|
||||
AstBasicDType* bdtypep = varp->basicp();
|
||||
m_left = bdtypep ? bdtypep->left() : 0;
|
||||
m_left = bdtypep ? bdtypep->left() : 0;
|
||||
m_right = bdtypep ? bdtypep->right() : 0;
|
||||
if (AstArrayDType* adtypep = varp->dtypeSkipRefp()->castArrayDType()) {
|
||||
m_arrayLsb = adtypep->arrayp()->lsbConst();
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ class V3ConfigIgnores {
|
|||
|
||||
IgnFiles m_ignWilds; // Ignores for each wildcarded filename
|
||||
IgnFiles m_ignFiles; // Ignores for each non-wildcarded filename
|
||||
|
||||
|
||||
static V3ConfigIgnores s_singleton; // Singleton (not via local static, as that's slow)
|
||||
|
||||
V3ConfigIgnores() { m_lastLineno = -1; }
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@ private:
|
|||
// BIASV(CONSTa,BIASV(b...,BIASV(CONSTc,d...))) // hits operandAsvUp
|
||||
// BIASV(CONSTa,BIASV(CONSTc,BIASV(c...,d...))) // hits operandAsvConst
|
||||
// BIASV(BIASV(CONSTa,CONSTc),BIASV(c...,d...))) // hits normal constant propagation
|
||||
// BIASV(CONST_a_c,BIASV(c...,d...)))
|
||||
// BIASV(CONST_a_c,BIASV(c...,d...)))
|
||||
//
|
||||
// Idea for the future: All BiComAsvs could be lists, sorted by if they're constant
|
||||
AstNodeBiComAsv* bnodep = nodep->castNodeBiComAsv();
|
||||
|
|
@ -1382,7 +1382,7 @@ private:
|
|||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Pass2, remove dup edges
|
||||
for (AstNodeSenItem* nextp, * senp = nodep->sensesp()->castNodeSenItem();
|
||||
senp; senp=nextp) {
|
||||
|
|
@ -1953,7 +1953,7 @@ public:
|
|||
PROC_V_EXPENSIVE,
|
||||
PROC_CPP
|
||||
};
|
||||
|
||||
|
||||
// CONSTUCTORS
|
||||
ConstVisitor(ProcMode pmode) {
|
||||
m_params = false;
|
||||
|
|
|
|||
|
|
@ -1062,7 +1062,7 @@ void EmitCStmts::emitOpName(AstNode* nodep, const string& format,
|
|||
++pos;
|
||||
switch (pos[0]) {
|
||||
case 'q': emitIQW(detailp); break;
|
||||
case 'w':
|
||||
case 'w':
|
||||
COMMA;
|
||||
puts(cvtToStr(detailp->widthMin()));
|
||||
needComma = true;
|
||||
|
|
|
|||
|
|
@ -525,7 +525,7 @@ void EmitCSyms::emitDpiHdr() {
|
|||
puts("extern \"C\" {\n");
|
||||
puts("#endif\n");
|
||||
puts("\n");
|
||||
|
||||
|
||||
int firstExp = 0;
|
||||
int firstImp = 0;
|
||||
for (vector<AstCFunc*>::iterator it = m_dpis.begin(); it != m_dpis.end(); ++it) {
|
||||
|
|
@ -571,7 +571,7 @@ void EmitCSyms::emitDpiImp() {
|
|||
puts("// or 2. Compile all __Dpi.cpp files in the same compiler run,\n");
|
||||
puts("// and #ifdefs already inserted here will sort everything out.\n");
|
||||
puts("\n");
|
||||
|
||||
|
||||
puts("#include \""+topClassName()+"__Dpi.h\"\n");
|
||||
puts("#include \""+topClassName()+".h\"\n");
|
||||
puts("\n");
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ class EmitVBaseVisitor : public EmitCBaseVisitor {
|
|||
putsNoTracking(AstNode::quoteName(str));
|
||||
putsNoTracking("\"");
|
||||
}
|
||||
|
||||
|
||||
// VISITORS
|
||||
virtual void visit(AstNetlist* nodep, AstNUser*) {
|
||||
nodep->iterateChildren(*this);
|
||||
|
|
|
|||
|
|
@ -358,7 +358,7 @@ public:
|
|||
void modifyStateInherit(const FileLine* fromp);
|
||||
// Change the current fileline due to actions discovered after parsing
|
||||
// and may have side effects on other nodes sharing this FileLine.
|
||||
// Use only when this is intended
|
||||
// Use only when this is intended
|
||||
void modifyWarnOff(V3ErrorCode code, bool flag) { warnOff(code,flag); }
|
||||
|
||||
// OPERATORS
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ public:
|
|||
typedef list<string> StrList;
|
||||
|
||||
// METHODS
|
||||
// Read file contents and return it. Return true on success.
|
||||
// Read file contents and return it. Return true on success.
|
||||
bool readWholefile(const string& filename, StrList& outl);
|
||||
|
||||
// CONSTRUCTORS
|
||||
|
|
|
|||
|
|
@ -346,7 +346,7 @@ private:
|
|||
|
||||
// Can't just reserve(), unless we modify size() before setting array directly
|
||||
while (m_callTrace.size() <= currentRank) m_callTrace.push_back(vertexp);
|
||||
m_callTrace[currentRank++] = vertexp;
|
||||
m_callTrace[currentRank++] = vertexp;
|
||||
|
||||
if (vertexp->user() == 1) {
|
||||
for (unsigned i=0; i<currentRank; i++) {
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ private:
|
|||
bool m_loopInc; // In loop increment
|
||||
int m_repeatNum; // Repeat counter
|
||||
BeginStack m_beginStack; // All begin blocks above current node
|
||||
|
||||
|
||||
// METHODS
|
||||
static int debug() {
|
||||
static int level = -1;
|
||||
|
|
|
|||
|
|
@ -605,7 +605,7 @@ string V3Options::version() {
|
|||
|
||||
void V3Options::throwSigsegv() {
|
||||
// cppcheck-suppress nullPointer
|
||||
char* zp=NULL; *zp=0;
|
||||
char* zp=NULL; *zp=0;
|
||||
}
|
||||
|
||||
//######################################################################
|
||||
|
|
|
|||
|
|
@ -326,12 +326,12 @@ void ParamVisitor::visit(AstCell* nodep, AstNUser*) {
|
|||
modp = nodep->modp()->cloneTree(false);
|
||||
modp->name(newname);
|
||||
nodep->modp()->addNextHere(modp); // Keep tree sorted by cell occurrences
|
||||
|
||||
|
||||
m_modNameMap.insert(make_pair(modp->name(), ModInfo(modp)));
|
||||
iter = m_modNameMap.find(newname);
|
||||
VarCloneMap* clonemapp = &(iter->second.m_cloneMap);
|
||||
UINFO(4," De-parameterize to new: "<<modp<<endl);
|
||||
|
||||
|
||||
// Grab all I/O so we can remap our pins later
|
||||
// Note we allow multiple users of a parameterized model, thus we need to stash this info.
|
||||
for (AstNode* stmtp=modp->stmtsp(); stmtp; stmtp = stmtp->nextp()) {
|
||||
|
|
@ -344,10 +344,10 @@ void ParamVisitor::visit(AstCell* nodep, AstNUser*) {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Relink parameter vars to the new module
|
||||
relinkPins(clonemapp, nodep->paramsp());
|
||||
|
||||
|
||||
// Assign parameters to the constants specified
|
||||
for (AstPin* pinp = nodep->paramsp(); pinp; pinp=pinp->nextp()->castPin()) {
|
||||
AstVar* modvarp = pinp->modVarp();
|
||||
|
|
@ -362,17 +362,17 @@ void ParamVisitor::visit(AstCell* nodep, AstNUser*) {
|
|||
} else {
|
||||
UINFO(4," De-parameterize to old: "<<modp<<endl);
|
||||
}
|
||||
|
||||
|
||||
// Have child use this module instead.
|
||||
nodep->modp(modp);
|
||||
nodep->modName(newname);
|
||||
|
||||
|
||||
// We need to relink the pins to the new module
|
||||
VarCloneMap* clonemapp = &(iter->second.m_cloneMap);
|
||||
relinkPins(clonemapp, nodep->pinsp());
|
||||
UINFO(8," Done with "<<modp<<endl);
|
||||
} // if any_overrides
|
||||
|
||||
|
||||
// Delete the parameters from the cell; they're not relevant any longer.
|
||||
nodep->paramsp()->unlinkFrBackWithNext()->deleteTree();
|
||||
UINFO(8," Done with "<<nodep<<endl);
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ public:
|
|||
void ftaskCFuncp(AstNodeFTask* nodep, AstCFunc* cfuncp) {
|
||||
getFTaskVertex(nodep)->cFuncp(cfuncp);
|
||||
}
|
||||
|
||||
|
||||
void checkPurity(AstNodeFTask* nodep) {
|
||||
checkPurity(nodep, getFTaskVertex(nodep));
|
||||
}
|
||||
|
|
@ -400,7 +400,7 @@ private:
|
|||
// before here based on this not being a lvalue?
|
||||
// Doesn't seem so; V3Unknown uses it earlier, but works ok.
|
||||
V3LinkLValue::linkLValueSet(pinp);
|
||||
|
||||
|
||||
// Even if it's referencing a varref, we still make a temporary
|
||||
// Else task(x,x,x) might produce incorrect results
|
||||
AstVarScope* outvscp = createVarScope (portp, namePrefix+"__"+portp->shortName());
|
||||
|
|
@ -452,7 +452,7 @@ private:
|
|||
}
|
||||
// Replace variable refs
|
||||
// Iteration requires a back, so put under temporary node
|
||||
{
|
||||
{
|
||||
AstBegin* tempp = new AstBegin(beginp->fileline(),"[EditWrapper]",beginp);
|
||||
TaskRelinkVisitor visit (tempp);
|
||||
tempp->stmtsp()->unlinkFrBackWithNext(); tempp->deleteTree(); tempp=NULL;
|
||||
|
|
@ -500,7 +500,7 @@ private:
|
|||
// before here based on this not being a lvalue?
|
||||
// Doesn't seem so; V3Unknown uses it earlier, but works ok.
|
||||
V3LinkLValue::linkLValueSet(pinp);
|
||||
|
||||
|
||||
// Even if it's referencing a varref, we still make a temporary
|
||||
// Else task(x,x,x) might produce incorrect results
|
||||
AstVarScope* outvscp = createVarScope (portp, namePrefix+"__"+portp->shortName());
|
||||
|
|
@ -965,7 +965,7 @@ private:
|
|||
}
|
||||
// Replace variable refs
|
||||
// Iteration requires a back, so put under temporary node
|
||||
{
|
||||
{
|
||||
AstBegin* tempp = new AstBegin(cfuncp->fileline(),"[EditWrapper]",cfuncp);
|
||||
TaskRelinkVisitor visit (tempp);
|
||||
tempp->stmtsp()->unlinkFrBackWithNext(); tempp->deleteTree(); tempp=NULL;
|
||||
|
|
@ -1081,7 +1081,7 @@ private:
|
|||
if (nodep->dpiExport()) modes++;
|
||||
if (nodep->taskPublic()) modes++;
|
||||
if (modes > 1) nodep->v3error("Cannot mix DPI import, DPI export and/or public on same function: "<<nodep->prettyName());
|
||||
|
||||
|
||||
if (nodep->dpiImport() || nodep->dpiExport()
|
||||
|| nodep->taskPublic() || m_statep->ftaskNoInline(nodep)) {
|
||||
// Clone it first, because we may have later FTaskRef's that still need
|
||||
|
|
@ -1214,7 +1214,7 @@ V3TaskConnects V3Task::taskConnects(AstNodeFTaskRef* nodep, AstNode* taskStmtsp)
|
|||
tconnects[ppinnum].second = pinp;
|
||||
ppinnum++;
|
||||
}
|
||||
|
||||
|
||||
while (ppinnum < tpinnum) {
|
||||
nodep->v3error("Too few arguments in function call to "<<nodep->taskp()->prettyTypeName());
|
||||
UINFO(1,"missing argument for '"<<tconnects[ppinnum].first->prettyName()<<"'"<<endl);
|
||||
|
|
|
|||
|
|
@ -279,7 +279,7 @@ private:
|
|||
m_varValuep = new AstConst(nodep->fileline(), loopValue);
|
||||
|
||||
// Iteration requires a back, so put under temporary node
|
||||
if (oneloopp) {
|
||||
if (oneloopp) {
|
||||
AstBegin* tempp = new AstBegin(oneloopp->fileline(),"[EditWrapper]",oneloopp);
|
||||
m_varModeReplace = true;
|
||||
tempp->stmtsp()->iterateAndNext(*this);
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ public:
|
|||
if (m_varDTypep) { m_varDTypep->deleteTree(); m_varDTypep=NULL; } // It was cloned, so this is safe.
|
||||
m_varDTypep = dtypep;
|
||||
}
|
||||
AstPackage* unitPackage(FileLine* fl) {
|
||||
AstPackage* unitPackage(FileLine* fl) {
|
||||
// Find one made earlier?
|
||||
AstPackage* pkgp = SYMP->symRootp()->findIdFlat(AstPackage::dollarUnitName())->castPackage();
|
||||
if (!pkgp) {
|
||||
|
|
@ -1094,7 +1094,7 @@ integer_vector_type<bdtypep>: // ==IEEE: integer_atom_type
|
|||
| yREG { $$ = new AstBasicDType($1,AstBasicDTypeKwd::LOGIC); } // logic==reg
|
||||
;
|
||||
|
||||
non_integer_type<bdtypep>: // ==IEEE: non_integer_type
|
||||
non_integer_type<bdtypep>: // ==IEEE: non_integer_type
|
||||
yREAL { $$ = new AstBasicDType($1,AstBasicDTypeKwd::DOUBLE); }
|
||||
| yREALTIME { $$ = new AstBasicDType($1,AstBasicDTypeKwd::DOUBLE); }
|
||||
//UNSUP ySHORTREAL { $$ = new AstBasicDType($1,AstBasicDTypeKwd::FLOAT); }
|
||||
|
|
|
|||
Loading…
Reference in New Issue