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

Internals: cppcheck cleanups. No functional change.

This commit is contained in:
Wilson Snyder 2025-02-18 01:14:51 -05:00
parent 4092ac7e72
commit fe15171649
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/verilated_random.cpp
View File

@ -481,13 +481,14 @@ bool VlRandomizer::parseSolution(std::iostream& f) {
} }
const std::string indexed_name = oss.str(); const std::string indexed_name = oss.str();
const auto it = std::find_if(m_arr_vars.begin(), m_arr_vars.end(), const auto iti = std::find_if(m_arr_vars.begin(), m_arr_vars.end(),
[&indexed_name](const auto& entry) { [&indexed_name](const auto& entry) {
return entry.second->m_name == indexed_name; return entry.second->m_name == indexed_name;
}); });
if (it != m_arr_vars.end()) { if (iti != m_arr_vars.end()) {
std::ostringstream ss; std::ostringstream ss;
ss << "#x" << std::hex << std::setw(8) << std::setfill('0') << it->second->m_index; ss << "#x" << std::hex << std::setw(8) << std::setfill('0')
<< iti->second->m_index;
idx = ss.str(); idx = ss.str();
} else { } else {
VL_FATAL_MT(__FILE__, __LINE__, "randomize", VL_FATAL_MT(__FILE__, __LINE__, "randomize",

4
include/verilated_vpi.cpp
View File

@ -2779,7 +2779,6 @@ vpiHandle vpi_put_value(vpiHandle object, p_vpi_value valuep, p_vpi_time /*time_
} }
return object; return object;
} else if (valuep->format == vpiOctStrVal) { } else if (valuep->format == vpiOctStrVal) {
const int chars = (varBits + 2) / 3;
const int len = std::strlen(valuep->value.str); const int len = std::strlen(valuep->value.str);
for (int i = 0; i < len; ++i) { for (int i = 0; i < len; ++i) {
char digit = valuep->value.str[len - i - 1] - '0'; char digit = valuep->value.str[len - i - 1] - '0';
@ -3127,7 +3126,6 @@ void vl_get_value_array(vpiHandle object, p_vpi_arrayvalue arrayvalue_p, PLI_INT
arrayvalue_p->value.shortints = shortintsp; arrayvalue_p->value.shortints = shortintsp;
if (varp->vltype() == VLVT_UINT8) { if (varp->vltype() == VLVT_UINT8) {
const CData* ptr = reinterpret_cast<CData*>(vop->varDatap());
vl_get_value_array_integrals(index, num, size, varp->entBits(), leftIsLow, vl_get_value_array_integrals(index, num, size, varp->entBits(), leftIsLow,
vop->varCDatap(), shortintsp); vop->varCDatap(), shortintsp);
} else if (varp->vltype() == VLVT_UINT16) { } else if (varp->vltype() == VLVT_UINT16) {
@ -3305,8 +3303,6 @@ void vpi_get_value_array(vpiHandle object, p_vpi_arrayvalue arrayvalue_p, PLI_IN
return; return;
} }
const VerilatedVar* const varp = vop->varp();
int lowRange = vop->rangep()->low(); int lowRange = vop->rangep()->low();
int highRange = vop->rangep()->high(); int highRange = vop->rangep()->high();

4
src/V3AstNodeExpr.h
View File

@ -1668,7 +1668,7 @@ class AstParseHolder final : public AstNodeExpr {
// A reference to something soon to replace, used in a select at parse time // A reference to something soon to replace, used in a select at parse time
// that needs conversion to pull the upper lvalue later // that needs conversion to pull the upper lvalue later
public: public:
AstParseHolder(FileLine* fl) explicit AstParseHolder(FileLine* fl)
: ASTGEN_SUPER_ParseHolder(fl) {} : ASTGEN_SUPER_ParseHolder(fl) {}
ASTGEN_MEMBERS_AstParseHolder; ASTGEN_MEMBERS_AstParseHolder;
string emitVerilog() override { V3ERROR_NA_RETURN(""); } string emitVerilog() override { V3ERROR_NA_RETURN(""); }
@ -4511,7 +4511,7 @@ public:
// === AstNodeTermop === // === AstNodeTermop ===
class AstInferredDisable final : public AstNodeTermop { class AstInferredDisable final : public AstNodeTermop {
public: public:
AstInferredDisable(FileLine* fl) explicit AstInferredDisable(FileLine* fl)
: ASTGEN_SUPER_InferredDisable(fl) { : ASTGEN_SUPER_InferredDisable(fl) {
dtypeSetLogicSized(1, VSigning::UNSIGNED); dtypeSetLogicSized(1, VSigning::UNSIGNED);
} }

3
src/V3Randomize.cpp
View File

@ -640,12 +640,11 @@ class ConstraintExprVisitor final : public VNVisitor {
= new AstVarRef{varp->fileline(), classp, varp, VAccess::WRITE}; = new AstVarRef{varp->fileline(), classp, varp, VAccess::WRITE};
varRefp->classOrPackagep(classOrPackagep); varRefp->classOrPackagep(classOrPackagep);
methodp->addPinsp(varRefp); methodp->addPinsp(varRefp);
size_t width = varp->width();
AstNodeDType* tmpDtypep = varp->dtypep(); AstNodeDType* tmpDtypep = varp->dtypep();
while (VN_IS(tmpDtypep, UnpackArrayDType) || VN_IS(tmpDtypep, DynArrayDType) while (VN_IS(tmpDtypep, UnpackArrayDType) || VN_IS(tmpDtypep, DynArrayDType)
|| VN_IS(tmpDtypep, QueueDType) || VN_IS(tmpDtypep, AssocArrayDType)) || VN_IS(tmpDtypep, QueueDType) || VN_IS(tmpDtypep, AssocArrayDType))
tmpDtypep = tmpDtypep->subDTypep(); tmpDtypep = tmpDtypep->subDTypep();
width = tmpDtypep->width(); const size_t width = tmpDtypep->width();
methodp->addPinsp( methodp->addPinsp(
new AstConst{varp->dtypep()->fileline(), AstConst::Unsized64{}, width}); new AstConst{varp->dtypep()->fileline(), AstConst::Unsized64{}, width});
AstNodeExpr* const varnamep AstNodeExpr* const varnamep