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

Internals: Cleanup some spacing. No functional change.

This commit is contained in:
Wilson Snyder 2023-08-26 05:59:56 -04:00
parent 77bd565ef6
commit e66b28823d
3 changed files with 71 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
src/V3Ast.h
View File

@ -1329,55 +1329,55 @@ protected:
class VNUser1InUse final : VNUserInUseBase { class VNUser1InUse final : VNUserInUseBase {
protected: protected:
friend class AstNode; friend class AstNode;
static uint32_t s_userCntGbl; // Count of which usage of userp() this is static uint32_t s_userCntGbl; // Count of which usage of userp() this is
static bool s_userBusy; // Count is in use static bool s_userBusy; // Count is in use
public: public:
VNUser1InUse() { allocate(1, s_userCntGbl/*ref*/, s_userBusy/*ref*/); } VNUser1InUse() { allocate(1, s_userCntGbl/*ref*/, s_userBusy/*ref*/); }
~VNUser1InUse() { free (1, s_userCntGbl/*ref*/, s_userBusy/*ref*/); } ~VNUser1InUse() { free (1, s_userCntGbl/*ref*/, s_userBusy/*ref*/); }
static void clear() { clearcnt(1, s_userCntGbl/*ref*/, s_userBusy/*ref*/); } static void clear() { clearcnt(1, s_userCntGbl/*ref*/, s_userBusy/*ref*/); }
static void check() { checkcnt(1, s_userCntGbl/*ref*/, s_userBusy/*ref*/); } static void check() { checkcnt(1, s_userCntGbl/*ref*/, s_userBusy/*ref*/); }
}; };
class VNUser2InUse final : VNUserInUseBase { class VNUser2InUse final : VNUserInUseBase {
protected: protected:
friend class AstNode; friend class AstNode;
static uint32_t s_userCntGbl; // Count of which usage of userp() this is static uint32_t s_userCntGbl; // Count of which usage of userp() this is
static bool s_userBusy; // Count is in use static bool s_userBusy; // Count is in use
public: public:
VNUser2InUse() { allocate(2, s_userCntGbl/*ref*/, s_userBusy/*ref*/); } VNUser2InUse() { allocate(2, s_userCntGbl/*ref*/, s_userBusy/*ref*/); }
~VNUser2InUse() { free (2, s_userCntGbl/*ref*/, s_userBusy/*ref*/); } ~VNUser2InUse() { free (2, s_userCntGbl/*ref*/, s_userBusy/*ref*/); }
static void clear() { clearcnt(2, s_userCntGbl/*ref*/, s_userBusy/*ref*/); } static void clear() { clearcnt(2, s_userCntGbl/*ref*/, s_userBusy/*ref*/); }
static void check() { checkcnt(2, s_userCntGbl/*ref*/, s_userBusy/*ref*/); } static void check() { checkcnt(2, s_userCntGbl/*ref*/, s_userBusy/*ref*/); }
}; };
class VNUser3InUse final : VNUserInUseBase { class VNUser3InUse final : VNUserInUseBase {
protected: protected:
friend class AstNode; friend class AstNode;
static uint32_t s_userCntGbl; // Count of which usage of userp() this is static uint32_t s_userCntGbl; // Count of which usage of userp() this is
static bool s_userBusy; // Count is in use static bool s_userBusy; // Count is in use
public: public:
VNUser3InUse() { allocate(3, s_userCntGbl/*ref*/, s_userBusy/*ref*/); } VNUser3InUse() { allocate(3, s_userCntGbl/*ref*/, s_userBusy/*ref*/); }
~VNUser3InUse() { free (3, s_userCntGbl/*ref*/, s_userBusy/*ref*/); } ~VNUser3InUse() { free (3, s_userCntGbl/*ref*/, s_userBusy/*ref*/); }
static void clear() { clearcnt(3, s_userCntGbl/*ref*/, s_userBusy/*ref*/); } static void clear() { clearcnt(3, s_userCntGbl/*ref*/, s_userBusy/*ref*/); }
static void check() { checkcnt(3, s_userCntGbl/*ref*/, s_userBusy/*ref*/); } static void check() { checkcnt(3, s_userCntGbl/*ref*/, s_userBusy/*ref*/); }
}; };
class VNUser4InUse final : VNUserInUseBase { class VNUser4InUse final : VNUserInUseBase {
protected: protected:
friend class AstNode; friend class AstNode;
static uint32_t s_userCntGbl; // Count of which usage of userp() this is static uint32_t s_userCntGbl; // Count of which usage of userp() this is
static bool s_userBusy; // Count is in use static bool s_userBusy; // Count is in use
public: public:
VNUser4InUse() { allocate(4, s_userCntGbl/*ref*/, s_userBusy/*ref*/); } VNUser4InUse() { allocate(4, s_userCntGbl/*ref*/, s_userBusy/*ref*/); }
~VNUser4InUse() { free (4, s_userCntGbl/*ref*/, s_userBusy/*ref*/); } ~VNUser4InUse() { free (4, s_userCntGbl/*ref*/, s_userBusy/*ref*/); }
static void clear() { clearcnt(4, s_userCntGbl/*ref*/, s_userBusy/*ref*/); } static void clear() { clearcnt(4, s_userCntGbl/*ref*/, s_userBusy/*ref*/); }
static void check() { checkcnt(4, s_userCntGbl/*ref*/, s_userBusy/*ref*/); } static void check() { checkcnt(4, s_userCntGbl/*ref*/, s_userBusy/*ref*/); }
}; };
class VNUser5InUse final : VNUserInUseBase { class VNUser5InUse final : VNUserInUseBase {
protected: protected:
friend class AstNode; friend class AstNode;
static uint32_t s_userCntGbl; // Count of which usage of userp() this is static uint32_t s_userCntGbl; // Count of which usage of userp() this is
static bool s_userBusy; // Count is in use static bool s_userBusy; // Count is in use
public: public:
VNUser5InUse() { allocate(5, s_userCntGbl/*ref*/, s_userBusy/*ref*/); } VNUser5InUse() { allocate(5, s_userCntGbl/*ref*/, s_userBusy/*ref*/); }
~VNUser5InUse() { free (5, s_userCntGbl/*ref*/, s_userBusy/*ref*/); } ~VNUser5InUse() { free (5, s_userCntGbl/*ref*/, s_userBusy/*ref*/); }
static void clear() { clearcnt(5, s_userCntGbl/*ref*/, s_userBusy/*ref*/); } static void clear() { clearcnt(5, s_userCntGbl/*ref*/, s_userBusy/*ref*/); }
static void check() { checkcnt(5, s_userCntGbl/*ref*/, s_userBusy/*ref*/); } static void check() { checkcnt(5, s_userCntGbl/*ref*/, s_userBusy/*ref*/); }
}; };
@ -1768,74 +1768,74 @@ public:
inline bool isString() const VL_MT_STABLE; inline bool isString() const VL_MT_STABLE;
// clang-format off // clang-format off
VNUser user1u() const VL_MT_STABLE { VNUser user1u() const VL_MT_STABLE {
// Slows things down measurably, so disabled by default // Slows things down measurably, so disabled by default
//UASSERT_STATIC(VNUser1InUse::s_userBusy, "userp set w/o busy"); //UASSERT_STATIC(VNUser1InUse::s_userBusy, "user1p used without AstUserInUse");
return ((m_user1Cnt==VNUser1InUse::s_userCntGbl) ? m_user1u : VNUser{0}); return ((m_user1Cnt == VNUser1InUse::s_userCntGbl) ? m_user1u : VNUser{0});
} }
AstNode* user1p() const VL_MT_STABLE { return user1u().toNodep(); } AstNode* user1p() const VL_MT_STABLE { return user1u().toNodep(); }
void user1u(const VNUser& user) { m_user1u=user; m_user1Cnt=VNUser1InUse::s_userCntGbl; } void user1u(const VNUser& user) { m_user1u = user; m_user1Cnt = VNUser1InUse::s_userCntGbl; }
void user1p(void* userp) { user1u(VNUser{userp}); } void user1p(void* userp) { user1u(VNUser{userp}); }
int user1() const { return user1u().toInt(); } void user1(int val) { user1u(VNUser{val}); }
void user1(int val) { user1u(VNUser{val}); } int user1() const { return user1u().toInt(); }
int user1Inc(int val=1) { int v=user1(); user1(v+val); return v; } int user1Inc(int val = 1) { int v = user1(); user1(v + val); return v; }
int user1SetOnce() { int v=user1(); if (!v) user1(1); return v; } // Better for cache than user1Inc() int user1SetOnce() { int v = user1(); if (!v) user1(1); return v; } // Better for cache than user1Inc()
static void user1ClearTree() { VNUser1InUse::clear(); } // Clear userp()'s across the entire tree static void user1ClearTree() { VNUser1InUse::clear(); } // Clear userp()'s across the entire tree
VNUser user2u() const VL_MT_STABLE { VNUser user2u() const VL_MT_STABLE {
// Slows things down measurably, so disabled by default // Slows things down measurably, so disabled by default
//UASSERT_STATIC(VNUser2InUse::s_userBusy, "userp set w/o busy"); //UASSERT_STATIC(VNUser2InUse::s_userBusy, "user2p used without AstUserInUse");
return ((m_user2Cnt==VNUser2InUse::s_userCntGbl) ? m_user2u : VNUser{0}); return ((m_user2Cnt == VNUser2InUse::s_userCntGbl) ? m_user2u : VNUser{0});
} }
AstNode* user2p() const VL_MT_STABLE { return user2u().toNodep(); } AstNode* user2p() const VL_MT_STABLE { return user2u().toNodep(); }
void user2u(const VNUser& user) { m_user2u=user; m_user2Cnt=VNUser2InUse::s_userCntGbl; } void user2u(const VNUser& user) { m_user2u = user; m_user2Cnt = VNUser2InUse::s_userCntGbl; }
void user2p(void* userp) { user2u(VNUser{userp}); } void user2p(void* userp) { user2u(VNUser{userp}); }
int user2() const { return user2u().toInt(); } void user2(int val) { user2u(VNUser{val}); }
void user2(int val) { user2u(VNUser{val}); } int user2() const { return user2u().toInt(); }
int user2Inc(int val=1) { int v=user2(); user2(v+val); return v; } int user2Inc(int val = 1) { int v = user2(); user2(v + val); return v; }
int user2SetOnce() { int v=user2(); if (!v) user2(1); return v; } // Better for cache than user2Inc() int user2SetOnce() { int v = user2(); if (!v) user2(1); return v; } // Better for cache than user2Inc()
static void user2ClearTree() { VNUser2InUse::clear(); } // Clear userp()'s across the entire tree static void user2ClearTree() { VNUser2InUse::clear(); } // Clear userp()'s across the entire tree
VNUser user3u() const VL_MT_STABLE { VNUser user3u() const VL_MT_STABLE {
// Slows things down measurably, so disabled by default // Slows things down measurably, so disabled by default
//UASSERT_STATIC(VNUser3InUse::s_userBusy, "userp set w/o busy"); //UASSERT_STATIC(VNUser3InUse::s_userBusy, "user3p used without AstUserInUse");
return ((m_user3Cnt==VNUser3InUse::s_userCntGbl) ? m_user3u : VNUser{0}); return ((m_user3Cnt == VNUser3InUse::s_userCntGbl) ? m_user3u : VNUser{0});
} }
AstNode* user3p() const VL_MT_STABLE { return user3u().toNodep(); } AstNode* user3p() const VL_MT_STABLE { return user3u().toNodep(); }
void user3u(const VNUser& user) { m_user3u=user; m_user3Cnt=VNUser3InUse::s_userCntGbl; } void user3u(const VNUser& user) { m_user3u = user; m_user3Cnt = VNUser3InUse::s_userCntGbl; }
void user3p(void* userp) { user3u(VNUser{userp}); } void user3p(void* userp) { user3u(VNUser{userp}); }
int user3() const { return user3u().toInt(); } void user3(int val) { user3u(VNUser{val}); }
void user3(int val) { user3u(VNUser{val}); } int user3() const { return user3u().toInt(); }
int user3Inc(int val=1) { int v=user3(); user3(v+val); return v; } int user3Inc(int val = 1) { int v = user3(); user3(v + val); return v; }
int user3SetOnce() { int v=user3(); if (!v) user3(1); return v; } // Better for cache than user3Inc() int user3SetOnce() { int v = user3(); if (!v) user3(1); return v; } // Better for cache than user3Inc()
static void user3ClearTree() { VNUser3InUse::clear(); } // Clear userp()'s across the entire tree static void user3ClearTree() { VNUser3InUse::clear(); } // Clear userp()'s across the entire tree
VNUser user4u() const VL_MT_STABLE { VNUser user4u() const VL_MT_STABLE {
// Slows things down measurably, so disabled by default // Slows things down measurably, so disabled by default
//UASSERT_STATIC(VNUser4InUse::s_userBusy, "userp set w/o busy"); //UASSERT_STATIC(VNUser4InUse::s_userBusy, "user4p used without AstUserInUse");
return ((m_user4Cnt==VNUser4InUse::s_userCntGbl) ? m_user4u : VNUser{0}); return ((m_user4Cnt == VNUser4InUse::s_userCntGbl) ? m_user4u : VNUser{0});
} }
AstNode* user4p() const VL_MT_STABLE { return user4u().toNodep(); } AstNode* user4p() const VL_MT_STABLE { return user4u().toNodep(); }
void user4u(const VNUser& user) { m_user4u=user; m_user4Cnt=VNUser4InUse::s_userCntGbl; } void user4u(const VNUser& user) { m_user4u = user; m_user4Cnt = VNUser4InUse::s_userCntGbl; }
void user4p(void* userp) { user4u(VNUser{userp}); } void user4p(void* userp) { user4u(VNUser{userp}); }
int user4() const { return user4u().toInt(); } void user4(int val) { user4u(VNUser{val}); }
void user4(int val) { user4u(VNUser{val}); } int user4() const { return user4u().toInt(); }
int user4Inc(int val=1) { int v=user4(); user4(v+val); return v; } int user4Inc(int val = 1) { int v = user4(); user4(v + val); return v; }
int user4SetOnce() { int v=user4(); if (!v) user4(1); return v; } // Better for cache than user4Inc() int user4SetOnce() { int v = user4(); if (!v) user4(1); return v; } // Better for cache than user4Inc()
static void user4ClearTree() { VNUser4InUse::clear(); } // Clear userp()'s across the entire tree static void user4ClearTree() { VNUser4InUse::clear(); } // Clear userp()'s across the entire tree
VNUser user5u() const VL_MT_STABLE { VNUser user5u() const VL_MT_STABLE {
// Slows things down measurably, so disabled by default // Slows things down measurably, so disabled by default
//UASSERT_STATIC(VNUser5InUse::s_userBusy, "userp set w/o busy"); //UASSERT_STATIC(VNUser5InUse::s_userBusy, "user5p used without AstUserInUse");
return ((m_user5Cnt==VNUser5InUse::s_userCntGbl) ? m_user5u : VNUser{0}); return ((m_user5Cnt == VNUser5InUse::s_userCntGbl) ? m_user5u : VNUser{0});
} }
AstNode* user5p() const VL_MT_STABLE { return user5u().toNodep(); } AstNode* user5p() const VL_MT_STABLE { return user5u().toNodep(); }
void user5u(const VNUser& user) { m_user5u=user; m_user5Cnt=VNUser5InUse::s_userCntGbl; } void user5u(const VNUser& user) { m_user5u = user; m_user5Cnt = VNUser5InUse::s_userCntGbl; }
void user5p(void* userp) { user5u(VNUser{userp}); } void user5p(void* userp) { user5u(VNUser{userp}); }
int user5() const { return user5u().toInt(); } void user5(int val) { user5u(VNUser{val}); }
void user5(int val) { user5u(VNUser{val}); } int user5() const { return user5u().toInt(); }
int user5Inc(int val=1) { int v=user5(); user5(v+val); return v; } int user5Inc(int val = 1) { int v = user5(); user5(v + val); return v; }
int user5SetOnce() { int v=user5(); if (!v) user5(1); return v; } // Better for cache than user5Inc() int user5SetOnce() { int v = user5(); if (!v) user5(1); return v; } // Better for cache than user5Inc()
static void user5ClearTree() { VNUser5InUse::clear(); } // Clear userp()'s across the entire tree static void user5ClearTree() { VNUser5InUse::clear(); } // Clear userp()'s across the entire tree
// clang-format on // clang-format on

4
src/V3EmitCFunc.h
View File

@ -192,12 +192,10 @@ public:
} }
void emitScIQW(AstVar* nodep) { void emitScIQW(AstVar* nodep) {
UASSERT_OBJ(nodep->isSc(), nodep, "emitting SystemC operator on non-SC variable"); UASSERT_OBJ(nodep->isSc(), nodep, "emitting SystemC operator on non-SC variable");
// clang-format off
puts(nodep->isScBigUint() ? "SB" puts(nodep->isScBigUint() ? "SB"
: nodep->isScUint() ? "SU" : nodep->isScUint() ? "SU"
: nodep->isScBv() ? "SW" : nodep->isScBv() ? "SW"
: (nodep->isScQuad() ? "SQ" : "SI")); : (nodep->isScQuad() ? "SQ" : "SI"));
// clang-format on
} }
void emitDatap(AstNode* nodep) { void emitDatap(AstNode* nodep) {
// When passing to a function with va_args the compiler doesn't // When passing to a function with va_args the compiler doesn't

2
src/V3GraphTest.cpp
View File

@ -293,10 +293,8 @@ public:
void V3Graph::selfTest() { void V3Graph::selfTest() {
// Execute all of the tests // Execute all of the tests
UINFO(2, __FUNCTION__ << ": " << endl); UINFO(2, __FUNCTION__ << ": " << endl);
// clang-format off
{ V3GraphTestStrong{}.run(); } { V3GraphTestStrong{}.run(); }
{ V3GraphTestAcyc{}.run(); } { V3GraphTestAcyc{}.run(); }
{ V3GraphTestVars{}.run(); } { V3GraphTestVars{}.run(); }
{ V3GraphTestImport{}.run(); } { V3GraphTestImport{}.run(); }
// clang-format on
} }