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

rename enumerators to avoid win32 compilation error 

Signed-off-by: Matthew Ballance <matt.ballance@gmail.com>
This commit is contained in:
Matthew Ballance 2026-06-09 01:51:29 +00:00
parent 8b2eb579d5
commit 04ac61a197
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/verilated_cov_model.h
View File

@ -30,11 +30,13 @@
// Per-bin classification. A bin's kind is which set it lives in (structural), // Per-bin classification. A bin's kind is which set it lives in (structural),
// not a per-bin field. Only Normal feeds coverage(); the rest are recorded. // not a per-bin field. Only Normal feeds coverage(); the rest are recorded.
// Enumerators are 'KIND_'-prefixed because the bare LRM terms collide with
// <windows.h> macros (e.g. IGNORE), which the preprocessor would expand.
enum class VlCovBinKind : uint8_t { enum class VlCovBinKind : uint8_t {
NORMAL = 0, // Base coverage-collecting bin KIND_NORMAL = 0, // Base coverage-collecting bin
DEFAULT = 1, // Bin declared with 'default' range (which is excluded per LRM) KIND_DEFAULT = 1, // Bin declared with 'default' range (which is excluded per LRM)
IGNORE = 2, // Ignore bin KIND_IGNORE = 2, // Ignore bin
ILLEGAL = 3 // Illegal bin KIND_ILLEGAL = 3 // Illegal bin
}; };
//============================================================================= //=============================================================================

10
include/verilated_covergroup.cpp
View File

@ -35,7 +35,7 @@ void VlCoverpoint::addNamer(VlCovBinKind set, int count, VlCovBinNaming naming,
const char* file, int line, int col) { const char* file, int line, int col) {
m_namers.emplace_back(set, count, m_nextBase, naming, name, file, line, col); m_namers.emplace_back(set, count, m_nextBase, naming, name, file, line, col);
m_nextBase += count; m_nextBase += count;
if (set == VlCovBinKind::NORMAL) m_normal += count; if (set == VlCovBinKind::KIND_NORMAL) m_normal += count;
} }
const VlCovNamer& VlCoverpoint::namerFor(int i) const { const VlCovNamer& VlCoverpoint::namerFor(int i) const {
@ -62,14 +62,14 @@ void VlCoverpoint::registerBins(VerilatedCovContext* covcontextp, const char* pa
const std::string full = m_hier + "." + binp; const std::string full = m_hier + "." + binp;
const std::string lineStr = std::to_string(nm.line()); const std::string lineStr = std::to_string(nm.line());
const std::string colStr = std::to_string(nm.col()); const std::string colStr = std::to_string(nm.col());
if (kind == VlCovBinKind::NORMAL) { if (kind == VlCovBinKind::KIND_NORMAL) {
VL_COVER_INSERT(covcontextp, full.c_str(), &m_counts[i], "page", page, "filename", VL_COVER_INSERT(covcontextp, full.c_str(), &m_counts[i], "page", page, "filename",
nm.file(), "lineno", lineStr.c_str(), "column", colStr.c_str(), "bin", nm.file(), "lineno", lineStr.c_str(), "column", colStr.c_str(), "bin",
binp.c_str()); binp.c_str());
} else { } else {
const char* const binType = kind == VlCovBinKind::IGNORE ? "ignore" const char* const binType = kind == VlCovBinKind::KIND_IGNORE ? "ignore"
: kind == VlCovBinKind::ILLEGAL ? "illegal" : kind == VlCovBinKind::KIND_ILLEGAL ? "illegal"
: "default"; : "default";
VL_COVER_INSERT(covcontextp, full.c_str(), &m_counts[i], "page", page, "filename", VL_COVER_INSERT(covcontextp, full.c_str(), &m_counts[i], "page", page, "filename",
nm.file(), "lineno", lineStr.c_str(), "column", colStr.c_str(), "bin", nm.file(), "lineno", lineStr.c_str(), "column", colStr.c_str(), "bin",
binp.c_str(), "bin_type", binType); binp.c_str(), "bin_type", binType);

2
include/verilated_covergroup.h
View File

@ -131,7 +131,7 @@ public:
// path (incrementBin) stays a plain counter bump. // path (incrementBin) stays a plain counter bump.
int numCovered = 0; int numCovered = 0;
for (const VlCovNamer& nm : m_namers) { for (const VlCovNamer& nm : m_namers) {
if (nm.set() != VlCovBinKind::NORMAL) continue; if (nm.set() != VlCovBinKind::KIND_NORMAL) continue;
for (int i = nm.base(); i < nm.base() + nm.count(); ++i) { for (int i = nm.base(); i < nm.base() + nm.count(); ++i) {
if (m_counts[i] >= m_atLeast) ++numCovered; if (m_counts[i] >= m_atLeast) ++numCovered;
} }

8
src/V3AstAttr.h
View File

@ -1194,10 +1194,10 @@ public:
// VlCovBinKind enumerator naming the bin's set // VlCovBinKind enumerator naming the bin's set
const char* binSetEnum() const { const char* binSetEnum() const {
switch (m_e) { switch (m_e) {
case BINS_IGNORE: return "VlCovBinKind::IGNORE"; case BINS_IGNORE: return "VlCovBinKind::KIND_IGNORE";
case BINS_ILLEGAL: return "VlCovBinKind::ILLEGAL"; case BINS_ILLEGAL: return "VlCovBinKind::KIND_ILLEGAL";
case BINS_DEFAULT: return "VlCovBinKind::DEFAULT"; case BINS_DEFAULT: return "VlCovBinKind::KIND_DEFAULT";
default: return "VlCovBinKind::NORMAL"; default: return "VlCovBinKind::KIND_NORMAL";
} }
} }
// Normal bins (feed coverage) are anything but ignore/illegal/default // Normal bins (feed coverage) are anything but ignore/illegal/default