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

Internals: Remove usage of global state in V3EmitCFunc (#3615). No functional change intended.

This commit is contained in:
Kamil Rakoczy 2022-09-12 17:59:14 +02:00 committed by GitHub
parent 752f425025
commit 9b2266f68c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/V3EmitCFunc.h
View File

@ -36,18 +36,20 @@ constexpr int EMITC_NUM_CONSTW = 8;
class EmitCLazyDecls final : public VNVisitor { class EmitCLazyDecls final : public VNVisitor {
// NODE STATE/TYPES // NODE STATE/TYPES
// AstNode::user2() -> bool. Already emitted decl for symbols. // None allowed to support threaded emitting
const VNUser2InUse m_inuser2;
// MEMBERS // MEMBERS
std::unordered_set<string> m_emittedManually; // Set of names already declared manually. std::unordered_set<string> m_emittedManually; // Set of names already declared manually.
EmitCBaseVisitor& m_emitter; // For access to file output EmitCBaseVisitor& m_emitter; // For access to file output
bool m_needsBlankLine = false; // Emit blank line if any declarations were emitted (cosmetic) bool m_needsBlankLine = false; // Emit blank line if any declarations were emitted (cosmetic)
std::set<AstNode*> m_emitted; // -> in set. Already emitted decl for symbols.
// METHODS // METHODS
bool declaredOnce(AstNode* nodep) { return m_emitted.insert(nodep).second; }
void lazyDeclare(AstCFunc* funcp) { void lazyDeclare(AstCFunc* funcp) {
// Already declared in this compilation unit // Already declared in this compilation unit
if (funcp->user2SetOnce()) return; if (!declaredOnce(funcp)) return;
// Check if this kind of function is lazily declared // Check if this kind of function is lazily declared
if (!(funcp->isMethod() && funcp->isLoose()) && !funcp->dpiImportPrototype()) return; if (!(funcp->isMethod() && funcp->isLoose()) && !funcp->dpiImportPrototype()) return;
// Already declared manually // Already declared manually
@ -58,7 +60,7 @@ class EmitCLazyDecls final : public VNVisitor {
} }
void lazyDeclareConstPoolVar(AstVar* varp) { void lazyDeclareConstPoolVar(AstVar* varp) {
if (varp->user2SetOnce()) return; // Already declared if (!declaredOnce(varp)) return; // Already declared
const string nameProtect const string nameProtect
= m_emitter.topClassName() + "__ConstPool__" + varp->nameProtect(); = m_emitter.topClassName() + "__ConstPool__" + varp->nameProtect();
m_emitter.puts("extern const "); m_emitter.puts("extern const ");
@ -106,8 +108,8 @@ public:
m_emitter.puts(suffix); m_emitter.puts(suffix);
m_emitter.ensureNewLine(); m_emitter.ensureNewLine();
} }
void declared(AstCFunc* nodep) { nodep->user2SetOnce(); } void declared(AstCFunc* nodep) { m_emitted.insert(nodep); }
void reset() { AstNode::user2ClearTree(); } void reset() { m_emitted.clear(); }
}; };
//###################################################################### //######################################################################