diff --git a/src/V3Order.cpp b/src/V3Order.cpp index 5cd52f335..6f4ff8b1e 100644 --- a/src/V3Order.cpp +++ b/src/V3Order.cpp @@ -465,9 +465,6 @@ private: OrderLogicVertex* m_activeSenVxp; // Sensitivity vertex deque m_orderUserps; // All created OrderUser's for later deletion. // STATE... for inside process - OrderLoopId m_loopIdMax; // Maximum BeginLoop id number assigned - vector m_pmlLoopEndps; // processInsLoop: End vertex for each color - vector m_pomLoopMoveps;// processMoveLoop: Loops next nodes are under AstCFunc* m_pomNewFuncp; // Current function being created int m_pomNewStmts; // Statements in function being created V3Graph m_pomGraph; // Graph of logic elements to move @@ -565,10 +562,6 @@ private: void processMoveReadyOne(OrderMoveVertex* vertexp); void processMoveDoneOne(OrderMoveVertex* vertexp); void processMoveOne(OrderMoveVertex* vertexp, OrderMoveDomScope* domScopep, int level); - void processMoveLoopPush(OrderLoopBeginVertex* beginp); - void processMoveLoopPop(OrderLoopBeginVertex* beginp); - void processMoveLoopStmt(AstNode* newSubnodep); - OrderLoopId processMoveLoopCurrent(); string cfuncName(AstNodeModule* modp, AstSenTree* domainp, AstScope* scopep, AstNode* forWhatp) { modp->user3Inc(); @@ -1016,7 +1009,6 @@ public: m_activeSenVxp = NULL; m_logicVxp = NULL; m_pomNewFuncp = NULL; - m_loopIdMax = LOOPID_FIRST; m_pomNewStmts = 0; if (debug()) m_graph.debug(5); // 3 is default if global debug; we want acyc debugging } @@ -1518,7 +1510,7 @@ void OrderVisitor::processMoveOne(OrderMoveVertex* vertexp, OrderMoveDomScope* d scopep->addActivep(m_pomNewFuncp); // Where will we be adding the call? AstActive* callunderp = new AstActive(nodep->fileline(), name, domainp); - processMoveLoopStmt(callunderp); + m_scopetopp->addActivep(callunderp); // Add a top call to it AstCCall* callp = new AstCCall(nodep->fileline(), m_pomNewFuncp); callp->argTypes("vlSymsp"); @@ -1543,40 +1535,6 @@ void OrderVisitor::processMoveOne(OrderMoveVertex* vertexp, OrderMoveDomScope* d processMoveDoneOne (vertexp); } -inline void OrderVisitor::processMoveLoopPush(OrderLoopBeginVertex* beginp) { - UINFO(6," LoopPush "<nodep()->v3fatalSrc("processMoveLoopPop with no push'ed loops"); - OrderLoopBeginVertex* topBeginp = m_pomLoopMoveps.back(); - if (topBeginp != beginp) beginp->nodep()->v3fatalSrc("processMoveLoopPop had different vertex then one expected, got="<