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

Fix compiler unsigned warnings

This commit is contained in:
Wilson Snyder 2020-05-23 22:38:17 -04:00
parent c9e59e767a
commit 50662751fe
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/verilated.cpp
View File

@ -1370,8 +1370,8 @@ void VL_FWRITEF(IData fpi, const char* formatp, ...) VL_MT_SAFE {
va_end(ap);
FILE* fp[30];
const int n = VerilatedImp::fdToFp(fpi, fp, 30);
for (std::size_t i = 0; i < n; i++) {
const std::size_t n = VerilatedImp::fdToFp(fpi, fp, 30);
for (std::size_t i = 0; i < n; ++i) {
if (VL_UNLIKELY(!fp[i])) continue;
fwrite(output.c_str(), 1, output.size(), fp[i]);
}

10
include/verilated_imp.h
View File

@ -242,7 +242,9 @@ public: // But only for verilated*.cpp
s_s.m_fdps.resize(31);
std::fill(s_s.m_fdps.begin(), s_s.m_fdps.end(), (FILE*)0);
s_s.m_fdFreeMct.resize(30);
for (int i = 0, id = 1; i < s_s.m_fdFreeMct.size(); i++, id++) { s_s.m_fdFreeMct[i] = id; }
for (std::size_t i = 0, id = 1; i < s_s.m_fdFreeMct.size(); ++i, ++id) {
s_s.m_fdFreeMct[i] = id;
}
}
~VerilatedImp() {}
@ -472,7 +474,7 @@ public: // But only for verilated*.cpp
s_s.m_fdps.resize(start + excess);
std::fill(s_s.m_fdps.begin() + start, s_s.m_fdps.end(), (FILE*)0);
s_s.m_fdFree.resize(excess);
for (int i = 0, id = start; i < s_s.m_fdFree.size(); i++, id++) {
for (std::size_t i = 0, id = start; i < s_s.m_fdFree.size(); ++i, ++id) {
s_s.m_fdFree[i] = id;
}
}
@ -539,8 +541,10 @@ public: // But only for verilated*.cpp
}
} else {
// MCD Case
for (int i = 0; (fdi != 0) && (out < max) && (i < 31); i++, fdi >>= 1)
for (int i = 0; (fdi != 0) && (out < static_cast<int>(max)) && (i < 31);
++i, fdi >>= 1) {
if (fdi & VL_MASK_I(1)) fp[out++] = s_s.m_fdps[i];
}
}
return out;
}