luke/verilator
1
0
Fork 0
mirror of https://github.com/verilator/verilator.git synced 2026-10-06 10:03:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove VN_CAST_CONST and VN_AS_CONST.

Browse Source 
The _CONST suffix on these macros is only lexical notation, pointer
constness can be preserved by overloading the underlying
implementations appropriately. Given that the compiler will catch
invalid const usage (trying to assign a non-const pointer to a const
pointer variable, etc.), and that the declarations of symbols should
make their constness obvious, I see no reason to keep the _CONST
flavours.
This commit is contained in:
Geza Lore
2021-10-24 11:43:48 +01:00
parent 20e896ec21
commit 381c87a1eb
18 changed files with 131 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/V3MergeCond.cpp
+8 -8
View File
@@ -169,17 +169,17 @@ private:
// Predicate to check if an expression yields only 0 or 1 (i.e.: a 1-bit value)
static bool yieldsOneOrZero(const AstNode* nodep) {
UASSERT_OBJ(!nodep->isWide(), nodep, "Cannot handle wide nodes");
if (const AstConst* const constp = VN_CAST_CONST(nodep, Const)) {
if (const AstConst* const constp = VN_CAST(nodep, Const)) {
return constp->num().toUQuad() <= 1;
}
if (const AstVarRef* const vrefp = VN_CAST_CONST(nodep, VarRef)) {
if (const AstVarRef* const vrefp = VN_CAST(nodep, VarRef)) {
AstVar* const varp = vrefp->varp();
return varp->widthMin() == 1 && !varp->dtypep()->isSigned();
}
if (const AstShiftR* const shiftp = VN_CAST_CONST(nodep, ShiftR)) {
if (const AstShiftR* const shiftp = VN_CAST(nodep, ShiftR)) {
// Shift right by width - 1 or more
if (const AstConst* const constp = VN_CAST_CONST(shiftp->rhsp(), Const)) {
const AstVarRef* const vrefp = VN_CAST_CONST(shiftp->lhsp(), VarRef);
if (const AstConst* const constp = VN_CAST(shiftp->rhsp(), Const)) {
const AstVarRef* const vrefp = VN_CAST(shiftp->lhsp(), VarRef);
const int width = vrefp && !vrefp->varp()->dtypep()->isSigned()
? vrefp->varp()->widthMin()
: shiftp->width();
@@ -191,17 +191,17 @@ private:
|| VN_IS(nodep, Gt) || VN_IS(nodep, Gte)) {
return true;
}
if (const AstNodeBiop* const biopp = VN_CAST_CONST(nodep, NodeBiop)) {
if (const AstNodeBiop* const biopp = VN_CAST(nodep, NodeBiop)) {
if (VN_IS(nodep, And))
return yieldsOneOrZero(biopp->lhsp()) || yieldsOneOrZero(biopp->rhsp());
if (VN_IS(nodep, Or) || VN_IS(nodep, Xor))
return yieldsOneOrZero(biopp->lhsp()) && yieldsOneOrZero(biopp->rhsp());
return false;
}
if (const AstNodeCond* const condp = VN_CAST_CONST(nodep, NodeCond)) {
if (const AstNodeCond* const condp = VN_CAST(nodep, NodeCond)) {
return yieldsOneOrZero(condp->expr1p()) && yieldsOneOrZero(condp->expr2p());
}
if (const AstCCast* const castp = VN_CAST_CONST(nodep, CCast)) {
if (const AstCCast* const castp = VN_CAST(nodep, CCast)) {
// Cast never sign extends
return yieldsOneOrZero(castp->lhsp());
}