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

Apply 'make format' [ci skip]

This commit is contained in:
github action 2026-06-22 15:24:47 +00:00
parent 5a3998b8ff
commit 7e71377b9b
4 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/verilated_sym_props.h
View File

@ -274,8 +274,7 @@ protected:
VerilatedVar(const char* namep, void* datap, VerilatedVarType vltype,
VerilatedVarFlags vlflags, int udims, int pdims, bool isParam);
VerilatedVar(const char* namep, void* datap, VerilatedVarType vltype,
VerilatedVarFlags vlflags, int udims, int pdims, bool isParam,
uint32_t entSize);
VerilatedVarFlags vlflags, int udims, int pdims, bool isParam, uint32_t entSize);
VerilatedVar(const char* namep, void* datap, VerilatedVarType vltype,
VerilatedVarFlags vlflags, int udims, int pdims, bool isParam,
std::unique_ptr<const VerilatedForceControlSignals> forceControlSignals);

33
include/verilated_vpi.cpp
View File

@ -398,7 +398,8 @@ public:
: VerilatedVpioVarBase{varp, scopep} {
m_entSize = varp->entSize();
m_varDatap = varp->datap();
if (vl_vpi_find_unescaped_dot(varp->name())) m_name = vl_vpi_member_local_name(varp->name());
if (vl_vpi_find_unescaped_dot(varp->name()))
m_name = vl_vpi_member_local_name(varp->name());
}
VerilatedVpioVar(const VerilatedVar* varp, const VerilatedScope* scopep, void* datap,
const std::string& name, const std::string& fullname)
@ -516,8 +517,7 @@ public:
const std::string localName = vl_vpi_member_local_name(memberVarp->name());
return new VerilatedVpioVar{memberVarp, scopep(),
static_cast<uint8_t*>(varDatap()) + offset,
localName,
static_cast<uint8_t*>(varDatap()) + offset, localName,
std::string{fullname()} + memberName.substr(parentLen)};
}
uint32_t type() const override {
@ -535,8 +535,9 @@ public:
return type;
}
const char* fullname() const override {
m_fullname = m_fullNameOverride.empty() ? std::string{scopep()->name()} + "." + varp()->name()
: m_fullNameOverride;
m_fullname = m_fullNameOverride.empty()
? std::string{scopep()->name()} + "." + varp()->name()
: m_fullNameOverride;
for (auto idx : index()) m_fullname += "[" + std::to_string(idx) + "]";
return m_fullname.c_str();
}
@ -2621,12 +2622,11 @@ vl_vpi_handle_indexed_member_from_scope(const VerilatedScope* const scopep,
if (!baseVarp) baseVarp = scopep->varFind(baseName.c_str());
if (!baseVarp) return nullptr;
VerilatedVpioVar* baseVop = fullnameOverride.empty()
? new VerilatedVpioVar{baseVarp, varScopep}
: new VerilatedVpioVar{
baseVarp, varScopep, baseVarp->datap(),
vl_vpi_member_local_name(baseVarp->name()),
fullnameOverride};
VerilatedVpioVar* baseVop
= fullnameOverride.empty()
? new VerilatedVpioVar{baseVarp, varScopep}
: new VerilatedVpioVar{baseVarp, varScopep, baseVarp->datap(),
vl_vpi_member_local_name(baseVarp->name()), fullnameOverride};
VerilatedVpioVar* vop = vl_vpi_handle_apply_indices(baseVop, indices);
if (!vop) return nullptr;
@ -2783,10 +2783,10 @@ vpiHandle vpi_handle_by_name(PLI_BYTE8* namep, vpiHandle scope) {
if (varp->isParam()) {
resultHandle = (new VerilatedVpioParam{varp, scopep})->castVpiHandle();
} else if (!fullnameOverride.empty()) {
resultHandle = (new VerilatedVpioVar{varp, scopep, varp->datap(),
vl_vpi_member_local_name(varp->name()),
fullnameOverride})
->castVpiHandle();
resultHandle
= (new VerilatedVpioVar{varp, scopep, varp->datap(),
vl_vpi_member_local_name(varp->name()), fullnameOverride})
->castVpiHandle();
} else {
resultHandle = (new VerilatedVpioVar{varp, scopep})->castVpiHandle();
}
@ -3030,8 +3030,7 @@ PLI_INT32 vpi_get(PLI_INT32 property, vpiHandle object) {
if (VL_LIKELY(vop && vop->isStructOrUnion())) return 0;
break;
}
default:
break;
default: break;
}
VL_VPI_ERROR_(__FILE__, __LINE__, "%s: Unsupported property %s, nothing will be returned",
__func__, VerilatedVpiError::strFromVpiProp(property));

22
src/V3EmitCSyms.cpp
View File

@ -247,8 +247,7 @@ class EmitCSyms final : EmitCBaseVisitorConst {
static void appendVarProperties(std::string& stmt, const std::string& vlEnumType,
const std::string& vlEnumDir, const int udim, const int pdim,
const std::string& bounds,
const std::string& entSize = "") {
const std::string& bounds, const std::string& entSize = "") {
stmt += vlEnumType; // VLVT_UINT32 etc
stmt += ", ";
stmt += vlEnumDir; // VLVD_IN etc
@ -302,10 +301,10 @@ class EmitCSyms final : EmitCBaseVisitorConst {
stmt += "))), true, ";
}
const std::string entSize = needsEntSize ? "sizeof(" + varName + ") / "
+ std::to_string(getUnpackedElements(
varp->dtypep()))
: "";
const std::string entSize = needsEntSize
? "sizeof(" + varName + ") / "
+ std::to_string(getUnpackedElements(varp->dtypep()))
: "";
appendVarProperties(stmt, vlEnumType, varp->vlEnumDir(), udim, pdim, bounds, entSize);
return stmt;
}
@ -327,11 +326,12 @@ class EmitCSyms final : EmitCBaseVisitorConst {
stmt += ".";
stmt += cName;
stmt += "), false, ";
const std::string varName = VIdProtect::protectIf(scopep->nameDotless(), scopep->protect())
+ "." + cName;
const std::string entSize = needsEntSize ? "sizeof(" + varName + ") / "
+ std::to_string(getUnpackedElements(dtypep))
: "";
const std::string varName
= VIdProtect::protectIf(scopep->nameDotless(), scopep->protect()) + "." + cName;
const std::string entSize
= needsEntSize
? "sizeof(" + varName + ") / " + std::to_string(getUnpackedElements(dtypep))
: "";
appendVarProperties(stmt, vlEnumType, memberVlEnumDir(svd.m_varp, dtypep), udim, pdim,
bounds, entSize);
return stmt;

4
test_regress/t/t_vpi_var.cpp
View File

@ -567,8 +567,8 @@ int _mon_check_unpacked_struct_members() {
CHECK_RESULT_CSTR(p, "member_c");
p = vpi_get_str(vpiFullName, vh153);
{
const std::string expectedFullName = std::string{vpi_get_str(vpiFullName, vh152)}
+ ".member_c";
const std::string expectedFullName
= std::string{vpi_get_str(vpiFullName, vh152)} + ".member_c";
CHECK_RESULT_CSTR(p, expectedFullName.c_str());
}