diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2015-06-22 23:04:56 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2015-06-22 23:04:56 -0700 |
| commit | 270f6db24625e4838dcafe7d45e69cc9522d703e (patch) | |
| tree | 2183a977adcce56464f4584fde7db96eb19ee367 /src/aig/ntl/ntlExtract.c | |
| parent | 0398ced8243806439b814f21ca7d6e584cea13a1 (diff) | |
| download | abc-270f6db24625e4838dcafe7d45e69cc9522d703e.tar.gz abc-270f6db24625e4838dcafe7d45e69cc9522d703e.tar.bz2 abc-270f6db24625e4838dcafe7d45e69cc9522d703e.zip | |
Version abc90715
committer: Baruch Sterin <baruchs@gmail.com>
Diffstat (limited to 'src/aig/ntl/ntlExtract.c')
| -rw-r--r-- | src/aig/ntl/ntlExtract.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/aig/ntl/ntlExtract.c b/src/aig/ntl/ntlExtract.c index 55a961df..ae278585 100644 --- a/src/aig/ntl/ntlExtract.c +++ b/src/aig/ntl/ntlExtract.c @@ -116,13 +116,12 @@ Aig_Obj_t * Ntl_GraphToNetworkAig( Aig_Man_t * pMan, Dec_Graph_t * pGraph ) SeeAlso [] ***********************************************************************/ -Aig_Obj_t * Ntl_ManBuildNodeAig( Ntl_Obj_t * pNode ) +Aig_Obj_t * Ntl_ManBuildNodeAig( Ntl_Man_t * p, Ntl_Obj_t * pNode ) { - Aig_Man_t * pMan = pNode->pModel->pMan->pAig; int fUseFactor = 1; // consider the constant node if ( Kit_PlaGetVarNum(pNode->pSop) == 0 ) - return Aig_NotCond( Aig_ManConst1(pMan), Kit_PlaIsConst0(pNode->pSop) ); + return Aig_NotCond( Aig_ManConst1(p->pAig), Kit_PlaIsConst0(pNode->pSop) ); // decide when to use factoring if ( fUseFactor && Kit_PlaGetVarNum(pNode->pSop) > 2 && Kit_PlaGetCubeNum(pNode->pSop) > 1 ) { @@ -136,11 +135,11 @@ Aig_Obj_t * Ntl_ManBuildNodeAig( Ntl_Obj_t * pNode ) Dec_GraphForEachLeaf( pFForm, pFFNode, i ) pFFNode->pFunc = Ntl_ObjFanin(pNode, i)->pCopy; // perform strashing - pFunc = Ntl_GraphToNetworkAig( pMan, pFForm ); + pFunc = Ntl_GraphToNetworkAig( p->pAig, pFForm ); Dec_GraphFree( pFForm ); return pFunc; } - return Ntl_ConvertSopToAigInternal( pMan, pNode, pNode->pSop ); + return Ntl_ConvertSopToAigInternal( p->pAig, pNode, pNode->pSop ); } /**Function************************************************************* @@ -198,7 +197,7 @@ int Ntl_ManExtract_rec( Ntl_Man_t * p, Ntl_Net_t * pNet ) } Vec_PtrPush( p->vVisNodes, pObj ); if ( Ntl_ObjIsNode(pObj) ) - pNet->pCopy = Ntl_ManBuildNodeAig( pObj ); + pNet->pCopy = Ntl_ManBuildNodeAig( p, pObj ); pNet->nVisits = 2; return 1; } @@ -371,7 +370,7 @@ int Ntl_ManCollapseBoxSeq1_rec( Ntl_Man_t * p, Ntl_Obj_t * pBox, int fSeq ) pNet->nVisits = 2; // remember the class of this register Vec_IntPush( p->vRegClasses, p->pNal ? pBox->iTemp : pObj->LatchId.regClass ); - Vec_IntPush( p->vRstClasses, p->pNal ? pBox->Reset : -1 ); +// Vec_IntPush( p->vRstClasses, p->pNal ? pBox->Reset : -1 ); } // compute AIG for the internal nodes Ntl_ModelForEachPo( pModel, pObj, i ) @@ -478,7 +477,7 @@ int Ntl_ManCollapse_rec( Ntl_Man_t * p, Ntl_Net_t * pNet, int fSeq ) return 0; } if ( Ntl_ObjIsNode(pObj) ) - pNet->pCopy = Ntl_ManBuildNodeAig( pObj ); + pNet->pCopy = Ntl_ManBuildNodeAig( p, pObj ); pNet->nVisits = 2; return 1; } |