luke
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Internals: Allow statement-in-statement recursion in V3Premit

This commit is contained in:
Wilson Snyder 2023-05-21 12:03:13 -04:00
parent 4818130e4f
commit 6b393e9d7c
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/V3EmitCFunc.h
View File

@ -467,7 +467,7 @@ public:
void visit(AstLambdaArgRef* nodep) override { putbs(nodep->nameProtect()); } void visit(AstLambdaArgRef* nodep) override { putbs(nodep->nameProtect()); }
void visit(AstWith* nodep) override { void visit(AstWith* nodep) override {
// With uses a C++11 lambda // With uses a C++11 lambda
putbs("[=]("); putbs("[&](");
if (auto* const argrefp = nodep->indexArgRefp()) { if (auto* const argrefp = nodep->indexArgRefp()) {
putbs(argrefp->dtypep()->cType(argrefp->nameProtect(), false, false)); putbs(argrefp->dtypep()->cType(argrefp->nameProtect(), false, false));
puts(","); puts(",");

38
src/V3Premit.cpp
View File

@ -157,30 +157,39 @@ private:
} }
void visit(AstCFunc* nodep) override { void visit(AstCFunc* nodep) override {
VL_RESTORER(m_cfuncp); VL_RESTORER(m_cfuncp);
{ m_cfuncp = nodep;
m_cfuncp = nodep; m_tempNames.reset();
m_tempNames.reset(); iterateChildren(nodep);
iterateChildren(nodep);
}
} }
#define RESTORER_START_STATEMENT() \
VL_RESTORER(m_assignLhs); \
VL_RESTORER(m_stmtp);
// Must use RESTORER_START_STATEMENT() in visitors using this
void startStatement(AstNode* nodep) { void startStatement(AstNode* nodep) {
m_assignLhs = false; m_assignLhs = false;
if (m_cfuncp) m_stmtp = nodep; if (m_cfuncp) m_stmtp = nodep;
} }
void visit(AstWhile* nodep) override { void visit(AstWhile* nodep) override {
UINFO(4, " WHILE " << nodep << endl); UINFO(4, " WHILE " << nodep << endl);
RESTORER_START_STATEMENT();
startStatement(nodep); startStatement(nodep);
iterateAndNextNull(nodep->precondsp()); iterateAndNextNull(nodep->precondsp());
startStatement(nodep); startStatement(nodep);
m_inWhilep = nodep; {
iterateAndNextNull(nodep->condp()); VL_RESTORER(m_inWhilep);
m_inWhilep = nullptr; m_inWhilep = nodep;
iterateAndNextNull(nodep->condp());
}
startStatement(nodep); startStatement(nodep);
iterateAndNextNull(nodep->stmtsp()); iterateAndNextNull(nodep->stmtsp());
iterateAndNextNull(nodep->incsp()); iterateAndNextNull(nodep->incsp());
m_stmtp = nullptr; m_stmtp = nullptr;
} }
void visit(AstNodeAssign* nodep) override { void visit(AstNodeAssign* nodep) override {
RESTORER_START_STATEMENT();
startStatement(nodep); startStatement(nodep);
{ {
bool noopt = false; bool noopt = false;
@ -202,22 +211,26 @@ private:
} }
} }
iterateAndNextNull(nodep->rhsp()); iterateAndNextNull(nodep->rhsp());
m_assignLhs = true; {
iterateAndNextNull(nodep->lhsp()); VL_RESTORER(m_assignLhs);
m_assignLhs = false; m_assignLhs = true;
iterateAndNextNull(nodep->lhsp());
}
m_stmtp = nullptr; m_stmtp = nullptr;
} }
void visit(AstNodeStmt* nodep) override { void visit(AstNodeStmt* nodep) override {
UINFO(4, " STMT " << nodep << endl); UINFO(4, " STMT " << nodep << endl);
RESTORER_START_STATEMENT();
startStatement(nodep); startStatement(nodep);
iterateChildren(nodep); iterateChildren(nodep);
m_stmtp = nullptr; m_stmtp = nullptr;
} }
void visit(AstTraceInc* nodep) override { void visit(AstTraceInc* nodep) override {
RESTORER_START_STATEMENT();
startStatement(nodep); startStatement(nodep);
VL_RESTORER(m_inTracep);
m_inTracep = nodep; m_inTracep = nodep;
iterateChildren(nodep); iterateChildren(nodep);
m_inTracep = nullptr;
m_stmtp = nullptr; m_stmtp = nullptr;
} }
void visitShift(AstNodeBiop* nodep) { void visitShift(AstNodeBiop* nodep) {
@ -345,6 +358,7 @@ private:
// Autoflush // Autoflush
void visit(AstDisplay* nodep) override { void visit(AstDisplay* nodep) override {
RESTORER_START_STATEMENT();
startStatement(nodep); startStatement(nodep);
iterateChildren(nodep); iterateChildren(nodep);
m_stmtp = nullptr; m_stmtp = nullptr;