Skip to content

Commit 415a383

Browse files
alaindargelasalaindargelas
authored
Merge pull request #4078 from alainmarcel/format
Formatting
2 parents abf5027 + cf085e0 commit 415a383

3 files changed

Lines changed: 47 additions & 19 deletions

File tree

‎src/DesignCompile/CompileExpression.cpp‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1750,8 +1750,10 @@ UHDM::any *CompileHelper::compileExpression(
17501750
uint32_t vopType = UhdmWriter::getVpiOpType(childType);
17511751
// This is the PREFIX (pre-increment/pre-decrement) case:
17521752
// operator comes before operand. Map to vpiPreIncOp/vpiPreDecOp.
1753-
if (vopType == vpiPostIncOp) vopType = vpiPreIncOp;
1754-
else if (vopType == vpiPostDecOp) vopType = vpiPreDecOp;
1753+
if (vopType == vpiPostIncOp)
1754+
vopType = vpiPreIncOp;
1755+
else if (vopType == vpiPostDecOp)
1756+
vopType = vpiPreDecOp;
17551757
if (vopType) {
17561758
UHDM::operation *op = s.MakeOperation();
17571759
op->VpiOpType(vopType);
@@ -3249,8 +3251,10 @@ UHDM::any *CompileHelper::compileExpression(
32493251
uint32_t vopType = UhdmWriter::getVpiOpType(type);
32503252
// This is the PREFIX (pre-increment/pre-decrement) case:
32513253
// operator comes before operand. Map to vpiPreIncOp/vpiPreDecOp.
3252-
if (vopType == vpiPostIncOp) vopType = vpiPreIncOp;
3253-
else if (vopType == vpiPostDecOp) vopType = vpiPreDecOp;
3254+
if (vopType == vpiPostIncOp)
3255+
vopType = vpiPreIncOp;
3256+
else if (vopType == vpiPostDecOp)
3257+
vopType = vpiPreDecOp;
32543258
if (vopType) {
32553259
UHDM::operation *op = s.MakeOperation();
32563260
if (attributes != nullptr) {

‎src/DesignCompile/DesignElaboration.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,11 +1157,13 @@ void DesignElaboration::elaborateInstance_(
11571157
allSubInstances);
11581158
parent->addSubInstance(child);
11591159

1160-
// First try the simple expression evaluator (handles i = i + 1, etc.)
1160+
// First try the simple expression evaluator (handles i = i + 1,
1161+
// etc.)
11611162
Value* newVal = m_exprBuilder.evalExpr(fC, expr, parent);
11621163
if (!newVal->isValid()) {
1163-
// Fallback: use full expression compilation for complex increments
1164-
// like step = step * CHUNK (where CHUNK is a parameter)
1164+
// Fallback: use full expression compilation for complex
1165+
// increments like step = step * CHUNK (where CHUNK is a
1166+
// parameter)
11651167
m_helper.checkForLoops(true);
11661168
int64_t newValInt = m_helper.getValue(
11671169
validValue, parentDef, fC, expr, m_compileDesign, Reduce::Yes,

‎src/DesignCompile/NetlistElaboration.cpp‎

Lines changed: 34 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1999,7 +1999,9 @@ bool NetlistElaboration::elabSignal(Signal* sig, ModuleInstance* instance,
19991999
for (auto a : *sig->attributes()) a->VpiParent(logicn);
20002000
}
20012001
logicn->VpiSigned(sig->isSigned());
2002-
logicn->VpiNetType(UhdmWriter::getVpiNetType(netKeyword != VObjectType::slNoType ? netKeyword : sig->getType()));
2002+
logicn->VpiNetType(UhdmWriter::getVpiNetType(
2003+
netKeyword != VObjectType::slNoType ? netKeyword
2004+
: sig->getType()));
20032005
// Move range to typespec for simple types
20042006
// logicn->Ranges(packedDimensions);
20052007
ref_typespec* rt = s.MakeRef_typespec();
@@ -2115,9 +2117,13 @@ bool NetlistElaboration::elabSignal(Signal* sig, ModuleInstance* instance,
21152117
stv->VpiParent(pnets);
21162118
for (auto r : *packedDimensions) r->VpiParent(pnets);
21172119
obj = pnets;
2118-
pnets->VpiNetType(UhdmWriter::getVpiNetType(netKeyword != VObjectType::slNoType ? netKeyword : sig->getType()));
2120+
pnets->VpiNetType(UhdmWriter::getVpiNetType(
2121+
netKeyword != VObjectType::slNoType ? netKeyword
2122+
: sig->getType()));
21192123
} else {
2120-
stv->VpiNetType(UhdmWriter::getVpiNetType(netKeyword != VObjectType::slNoType ? netKeyword : sig->getType()));
2124+
stv->VpiNetType(UhdmWriter::getVpiNetType(
2125+
netKeyword != VObjectType::slNoType ? netKeyword
2126+
: sig->getType()));
21212127
}
21222128
} else if (const Struct* st = datatype_cast<const Struct*>(dtype)) {
21232129
struct_net* stv = s.MakeStruct_net();
@@ -2139,9 +2145,13 @@ bool NetlistElaboration::elabSignal(Signal* sig, ModuleInstance* instance,
21392145
stv->VpiParent(pnets);
21402146
for (auto r : *packedDimensions) r->VpiParent(pnets);
21412147
obj = pnets;
2142-
pnets->VpiNetType(UhdmWriter::getVpiNetType(netKeyword != VObjectType::slNoType ? netKeyword : sig->getType()));
2148+
pnets->VpiNetType(UhdmWriter::getVpiNetType(
2149+
netKeyword != VObjectType::slNoType ? netKeyword
2150+
: sig->getType()));
21432151
} else {
2144-
stv->VpiNetType(UhdmWriter::getVpiNetType(netKeyword != VObjectType::slNoType ? netKeyword : sig->getType()));
2152+
stv->VpiNetType(UhdmWriter::getVpiNetType(
2153+
netKeyword != VObjectType::slNoType ? netKeyword
2154+
: sig->getType()));
21452155
}
21462156
} else if (dtype->getCategory() == DataType::Category::PARAMETER ||
21472157
dtype->getCategory() == DataType::Category::SIMPLE_TYPEDEF) {
@@ -2163,7 +2173,9 @@ bool NetlistElaboration::elabSignal(Signal* sig, ModuleInstance* instance,
21632173
for (auto a : *sig->attributes()) a->VpiParent(logicn);
21642174
}
21652175
logicn->VpiSigned(sig->isSigned());
2166-
logicn->VpiNetType(UhdmWriter::getVpiNetType(netKeyword != VObjectType::slNoType ? netKeyword : sig->getType()));
2176+
logicn->VpiNetType(UhdmWriter::getVpiNetType(
2177+
netKeyword != VObjectType::slNoType ? netKeyword
2178+
: sig->getType()));
21672179
// Move range to typespec for simple types
21682180
// logicn->Ranges(packedDimensions);
21692181
ref_typespec* rt = s.MakeRef_typespec();
@@ -2194,9 +2206,13 @@ bool NetlistElaboration::elabSignal(Signal* sig, ModuleInstance* instance,
21942206
stv->VpiParent(pnets);
21952207
for (auto r : *packedDimensions) r->VpiParent(pnets);
21962208
obj = pnets;
2197-
pnets->VpiNetType(UhdmWriter::getVpiNetType(netKeyword != VObjectType::slNoType ? netKeyword : sig->getType()));
2209+
pnets->VpiNetType(UhdmWriter::getVpiNetType(
2210+
netKeyword != VObjectType::slNoType ? netKeyword
2211+
: sig->getType()));
21982212
} else {
2199-
stv->VpiNetType(UhdmWriter::getVpiNetType(netKeyword != VObjectType::slNoType ? netKeyword : sig->getType()));
2213+
stv->VpiNetType(UhdmWriter::getVpiNetType(
2214+
netKeyword != VObjectType::slNoType ? netKeyword
2215+
: sig->getType()));
22002216
}
22012217
} else if (spec->UhdmType() == uhdmenum_typespec) {
22022218
enum_net* stv = s.MakeEnum_net();
@@ -2219,9 +2235,13 @@ bool NetlistElaboration::elabSignal(Signal* sig, ModuleInstance* instance,
22192235
stv->VpiParent(pnets);
22202236
for (auto r : *packedDimensions) r->VpiParent(pnets);
22212237
obj = pnets;
2222-
pnets->VpiNetType(UhdmWriter::getVpiNetType(netKeyword != VObjectType::slNoType ? netKeyword : sig->getType()));
2238+
pnets->VpiNetType(UhdmWriter::getVpiNetType(
2239+
netKeyword != VObjectType::slNoType ? netKeyword
2240+
: sig->getType()));
22232241
} else {
2224-
stv->VpiNetType(UhdmWriter::getVpiNetType(netKeyword != VObjectType::slNoType ? netKeyword : sig->getType()));
2242+
stv->VpiNetType(UhdmWriter::getVpiNetType(
2243+
netKeyword != VObjectType::slNoType ? netKeyword
2244+
: sig->getType()));
22252245
}
22262246
} else if (spec->UhdmType() == uhdmbit_typespec) {
22272247
bit_var* logicn = s.MakeBit_var();
@@ -2274,7 +2294,8 @@ bool NetlistElaboration::elabSignal(Signal* sig, ModuleInstance* instance,
22742294
for (auto a : *sig->attributes()) a->VpiParent(logicn);
22752295
}
22762296
logicn->VpiSigned(sig->isSigned());
2277-
logicn->VpiNetType(UhdmWriter::getVpiNetType(netKeyword != VObjectType::slNoType ? netKeyword : sig->getType()));
2297+
logicn->VpiNetType(UhdmWriter::getVpiNetType(
2298+
netKeyword != VObjectType::slNoType ? netKeyword : sig->getType()));
22782299
ref_typespec* rt = s.MakeRef_typespec();
22792300
rt->VpiParent(logicn);
22802301
rt->Actual_typespec(tps);
@@ -2379,7 +2400,8 @@ bool NetlistElaboration::elabSignal(Signal* sig, ModuleInstance* instance,
23792400
} else {
23802401
logic_net* logicn = s.MakeLogic_net();
23812402
logicn->VpiSigned(sig->isSigned());
2382-
logicn->VpiNetType(UhdmWriter::getVpiNetType(netKeyword != VObjectType::slNoType ? netKeyword : sig->getType()));
2403+
logicn->VpiNetType(UhdmWriter::getVpiNetType(
2404+
netKeyword != VObjectType::slNoType ? netKeyword : sig->getType()));
23832405
if (sig->attributes()) {
23842406
logicn->Attributes(sig->attributes());
23852407
for (auto a : *sig->attributes()) a->VpiParent(logicn);

0 commit comments

Comments
 (0)