From 251812638d0e330f8b8dc63f3a63578ab04aebd6 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Mon, 7 Dec 2020 18:45:54 -0500 Subject: [PATCH] Internals: Rename accessor. No functional change. --- src/V3Ast.h | 9 ++++----- src/V3AstNodes.cpp | 2 +- src/V3AstNodes.h | 6 +++--- src/V3Inst.cpp | 9 ++++----- src/V3LinkDot.cpp | 4 ++-- src/V3LinkLValue.cpp | 2 +- src/V3LinkResolve.cpp | 2 +- src/V3WidthSel.cpp | 6 +++--- 8 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/V3Ast.h b/src/V3Ast.h index 03236e147..7762a084d 100644 --- a/src/V3Ast.h +++ b/src/V3Ast.h @@ -2144,19 +2144,18 @@ public: class AstNodePreSel VL_NOT_FINAL : public AstNode { // Something that becomes an AstSel public: - AstNodePreSel(AstType t, FileLine* fl, AstNode* lhs, AstNode* rhs, AstNode* ths) + AstNodePreSel(AstType t, FileLine* fl, AstNode* fromp, AstNode* rhs, AstNode* ths) : AstNode{t, fl} { - setOp1p(lhs); + setOp1p(fromp); setOp2p(rhs); setNOp3p(ths); } ASTNODE_BASE_FUNCS(NodePreSel) - AstNode* lhsp() const { return op1p(); } - AstNode* fromp() const { return lhsp(); } + AstNode* fromp() const { return op1p(); } AstNode* rhsp() const { return op2p(); } AstNode* thsp() const { return op3p(); } AstAttrOf* attrp() const { return VN_CAST(op4p(), AttrOf); } - void lhsp(AstNode* nodep) { return setOp1p(nodep); } + void fromp(AstNode* nodep) { return setOp1p(nodep); } void rhsp(AstNode* nodep) { return setOp2p(nodep); } void thsp(AstNode* nodep) { return setOp3p(nodep); } void attrp(AstAttrOf* nodep) { return setOp4p((AstNode*)nodep); } diff --git a/src/V3AstNodes.cpp b/src/V3AstNodes.cpp index 55af1229f..4db2a9fdd 100644 --- a/src/V3AstNodes.cpp +++ b/src/V3AstNodes.cpp @@ -809,7 +809,7 @@ AstNode* AstArraySel::baseFromp(AstNode* nodep) { if (VN_CAST(nodep, NodePreSel)->attrp()) { nodep = VN_CAST(nodep, NodePreSel)->attrp(); } else { - nodep = VN_CAST(nodep, NodePreSel)->lhsp(); + nodep = VN_CAST(nodep, NodePreSel)->fromp(); } continue; } else { diff --git a/src/V3AstNodes.h b/src/V3AstNodes.h index e7f9a6473..0b6ae6cce 100644 --- a/src/V3AstNodes.h +++ b/src/V3AstNodes.h @@ -5458,9 +5458,9 @@ public: : (m_urandom ? "%f$urandom()" : "%f$random()"); } virtual string emitC() override { - return m_reset ? "VL_RAND_RESET_%nq(%nw, %P)" - : seedp() ? "VL_RANDOM_SEEDED_%nq%lq(%nw, %P, %li)" - : "VL_RANDOM_%nq(%nw, %P)"; + return m_reset + ? "VL_RAND_RESET_%nq(%nw, %P)" + : seedp() ? "VL_RANDOM_SEEDED_%nq%lq(%nw, %P, %li)" : "VL_RANDOM_%nq(%nw, %P)"; } virtual bool cleanOut() const override { return true; } virtual bool isGateOptimizable() const override { return false; } diff --git a/src/V3Inst.cpp b/src/V3Inst.cpp index 91dad4008..783b07beb 100644 --- a/src/V3Inst.cpp +++ b/src/V3Inst.cpp @@ -341,11 +341,10 @@ private: // Arrayed instants: one bit for each of the instants (each // assign is 1 pinwidth wide) if (m_cellRangep->littleEndian()) { - nodep->exprp()->v3warn( - LITENDIAN, - "Little endian cell range connecting to vector: left < right of cell range: [" - << m_cellRangep->leftConst() << ":" << m_cellRangep->rightConst() - << "]"); + nodep->exprp()->v3warn(LITENDIAN, "Little endian cell range connecting to " + "vector: left < right of cell range: [" + << m_cellRangep->leftConst() << ":" + << m_cellRangep->rightConst() << "]"); } AstNode* exprp = nodep->exprp()->unlinkFrBack(); bool inputPin = nodep->modVarp()->isNonOutput(); diff --git a/src/V3LinkDot.cpp b/src/V3LinkDot.cpp index 413636d81..792770c29 100644 --- a/src/V3LinkDot.cpp +++ b/src/V3LinkDot.cpp @@ -2731,7 +2731,7 @@ private: } virtual void visit(AstSelBit* nodep) override { if (nodep->user3SetOnce()) return; - iterateAndNextNull(nodep->lhsp()); + iterateAndNextNull(nodep->fromp()); if (m_ds.m_dotPos == DP_SCOPE) { // Already under dot, so this is {modulepart} DOT {modulepart} UINFO(9, " deferring until after a V3Param pass: " << nodep << endl); @@ -2767,7 +2767,7 @@ private: m_ds.m_dotErr = true; return; } - iterateAndNextNull(nodep->lhsp()); + iterateAndNextNull(nodep->fromp()); VL_RESTORER(m_ds); { m_ds.init(m_curSymp); diff --git a/src/V3LinkLValue.cpp b/src/V3LinkLValue.cpp index 1497a9d21..1e63d1dbd 100644 --- a/src/V3LinkLValue.cpp +++ b/src/V3LinkLValue.cpp @@ -249,7 +249,7 @@ private: virtual void visit(AstNodePreSel* nodep) override { VL_RESTORER(m_setRefLvalue); { // Only set lvalues on the from - iterateAndNextNull(nodep->lhsp()); + iterateAndNextNull(nodep->fromp()); m_setRefLvalue = VAccess::NOCHANGE; iterateAndNextNull(nodep->rhsp()); iterateAndNextNull(nodep->thsp()); diff --git a/src/V3LinkResolve.cpp b/src/V3LinkResolve.cpp index 6e8c4ca45..4367d28a3 100644 --- a/src/V3LinkResolve.cpp +++ b/src/V3LinkResolve.cpp @@ -196,7 +196,7 @@ private: did = true; } if (AstNodePreSel* selp = VN_CAST(nodep->sensp(), NodePreSel)) { - AstNode* fromp = selp->lhsp()->unlinkFrBack(); + AstNode* fromp = selp->fromp()->unlinkFrBack(); selp->replaceWith(fromp); VL_DO_DANGLING(selp->deleteTree(), selp); did = true; diff --git a/src/V3WidthSel.cpp b/src/V3WidthSel.cpp index 3c3526e01..0b2455c63 100644 --- a/src/V3WidthSel.cpp +++ b/src/V3WidthSel.cpp @@ -204,7 +204,7 @@ private: UINFO(6, "SELBIT " << nodep << endl); if (debug() >= 9) nodep->backp()->dumpTree(cout, "--SELBT0: "); // lhsp/rhsp do not need to be constant - AstNode* fromp = nodep->lhsp()->unlinkFrBack(); + AstNode* fromp = nodep->fromp()->unlinkFrBack(); AstNode* rhsp = nodep->rhsp()->unlinkFrBack(); // bit we're extracting if (debug() >= 9) nodep->dumpTree(cout, "--SELBT2: "); FromData fromdata = fromDataForArray(nodep, fromp); @@ -331,7 +331,7 @@ private: "First value of [a:b] isn't a constant, maybe you want +: or -:"); checkConstantOrReplace(nodep->rightp(), "Second value of [a:b] isn't a constant, maybe you want +: or -:"); - AstNode* fromp = nodep->lhsp()->unlinkFrBack(); + AstNode* fromp = nodep->fromp()->unlinkFrBack(); AstNode* msbp = nodep->rhsp()->unlinkFrBack(); AstNode* lsbp = nodep->thsp()->unlinkFrBack(); vlsint32_t msb = VN_CAST(msbp, Const)->toSInt(); @@ -474,7 +474,7 @@ private: checkConstantOrReplace(nodep->thsp(), "Width of :+ or :- bit extract isn't a constant"); if (debug() >= 9) nodep->dumpTree(cout, "--SELPM3: "); // Now replace it with an AstSel - AstNode* fromp = nodep->lhsp()->unlinkFrBack(); + AstNode* fromp = nodep->fromp()->unlinkFrBack(); AstNode* rhsp = nodep->rhsp()->unlinkFrBack(); AstNode* widthp = nodep->thsp()->unlinkFrBack(); warnTri(rhsp);