diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-03-09 19:32:44 -0800 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-03-09 19:32:44 -0800 |
| commit | 2c8f1a67ec9295450a72fc27cbb3ed1177945734 (patch) | |
| tree | 5386dd978ded397a75b6a9c06fe46b3789468beb /src/proof/dch | |
| parent | 34078de8d6414bb832d26c33578a1fcdfa21b750 (diff) | |
| download | abc-2c8f1a67ec9295450a72fc27cbb3ed1177945734.tar.gz abc-2c8f1a67ec9295450a72fc27cbb3ed1177945734.tar.bz2 abc-2c8f1a67ec9295450a72fc27cbb3ed1177945734.zip | |
Renamed Aig_ManForEachPi/Po to be ...Ci/Co and Aig_ObjCreatePi/Po to be ...Ci/Co.
Diffstat (limited to 'src/proof/dch')
| -rw-r--r-- | src/proof/dch/dchAig.c | 8 | ||||
| -rw-r--r-- | src/proof/dch/dchChoice.c | 18 | ||||
| -rw-r--r-- | src/proof/dch/dchSim.c | 2 | ||||
| -rw-r--r-- | src/proof/dch/dchSweep.c | 4 |
4 files changed, 16 insertions, 16 deletions
diff --git a/src/proof/dch/dchAig.c b/src/proof/dch/dchAig.c index 91a00c63..59828443 100644 --- a/src/proof/dch/dchAig.c +++ b/src/proof/dch/dchAig.c @@ -83,21 +83,21 @@ Aig_Man_t * Dch_DeriveTotalAig( Vec_Ptr_t * vAigs ) Vec_PtrForEachEntry( Aig_Man_t *, vAigs, pAig2, k ) Aig_ManConst1(pAig2)->pData = Aig_ManConst1(pAigTotal); // map primary inputs - Aig_ManForEachPi( pAig, pObj, i ) + Aig_ManForEachCi( pAig, pObj, i ) { - pObjPi = Aig_ObjCreatePi( pAigTotal ); + pObjPi = Aig_ObjCreateCi( pAigTotal ); Vec_PtrForEachEntry( Aig_Man_t *, vAigs, pAig2, k ) Aig_ManPi( pAig2, i )->pData = pObjPi; } // construct the AIG in the order of POs - Aig_ManForEachPo( pAig, pObj, i ) + Aig_ManForEachCo( pAig, pObj, i ) { Vec_PtrForEachEntry( Aig_Man_t *, vAigs, pAig2, k ) { pObjPo = Aig_ManPo( pAig2, i ); Dch_DeriveTotalAig_rec( pAigTotal, Aig_ObjFanin0(pObjPo) ); } - Aig_ObjCreatePo( pAigTotal, Aig_ObjChild0Copy(pObj) ); + Aig_ObjCreateCo( pAigTotal, Aig_ObjChild0Copy(pObj) ); } /* // mark the cone of the first AIG diff --git a/src/proof/dch/dchChoice.c b/src/proof/dch/dchChoice.c index 1772f8aa..1de11509 100644 --- a/src/proof/dch/dchChoice.c +++ b/src/proof/dch/dchChoice.c @@ -255,14 +255,14 @@ Aig_Man_t * Dch_DeriveChoiceAig_old( Aig_Man_t * pAig ) // map constants and PIs Aig_ManCleanData( pAig ); Aig_ManConst1(pAig)->pData = Aig_ManConst1(pChoices); - Aig_ManForEachPi( pAig, pObj, i ) - pObj->pData = Aig_ObjCreatePi( pChoices ); + Aig_ManForEachCi( pAig, pObj, i ) + pObj->pData = Aig_ObjCreateCi( pChoices ); // construct choices for the internal nodes assert( pAig->pReprs != NULL ); Aig_ManForEachNode( pAig, pObj, i ) Dch_DeriveChoiceAigNode( pChoices, pAig, pObj ); - Aig_ManForEachPo( pAig, pObj, i ) - Aig_ObjCreatePo( pChoices, Aig_ObjChild0CopyRepr(pChoices, pObj) ); + Aig_ManForEachCo( pAig, pObj, i ) + Aig_ObjCreateCo( pChoices, Aig_ObjChild0CopyRepr(pChoices, pObj) ); Dch_DeriveChoiceCountEquivs( pChoices ); // there is no need for cleanup ABC_FREE( pChoices->pReprs ); @@ -384,7 +384,7 @@ int Aig_ManCheckAcyclic( Aig_Man_t * p, int fVerbose ) // pNode->TravId < pNet->nTravIds - 1 means "pNode is not visited" // traverse the network to detect cycles fAcyclic = 1; - Aig_ManForEachPo( p, pNode, i ) + Aig_ManForEachCo( p, pNode, i ) { pNode = Aig_ObjFanin0(pNode); if ( Aig_ObjIsTravIdPrevious(p, pNode) ) @@ -454,14 +454,14 @@ Aig_Man_t * Dch_DeriveChoiceAigInt( Aig_Man_t * pAig ) // map constants and PIs Aig_ManCleanData( pAig ); Aig_ManConst1(pAig)->pData = Aig_ManConst1(pChoices); - Aig_ManForEachPi( pAig, pObj, i ) - pObj->pData = Aig_ObjCreatePi( pChoices ); + Aig_ManForEachCi( pAig, pObj, i ) + pObj->pData = Aig_ObjCreateCi( pChoices ); // construct choices for the internal nodes assert( pAig->pReprs != NULL ); Aig_ManForEachNode( pAig, pObj, i ) Dch_DeriveChoiceAigNode( pChoices, pAig, pObj ); - Aig_ManForEachPo( pAig, pObj, i ) - Aig_ObjCreatePo( pChoices, Aig_ObjChild0CopyRepr(pChoices, pObj) ); + Aig_ManForEachCo( pAig, pObj, i ) + Aig_ObjCreateCo( pChoices, Aig_ObjChild0CopyRepr(pChoices, pObj) ); Dch_DeriveChoiceCountEquivs( pChoices ); Aig_ManSetRegNum( pChoices, Aig_ManRegNum(pAig) ); return pChoices; diff --git a/src/proof/dch/dchSim.c b/src/proof/dch/dchSim.c index b2d24761..3e7c575b 100644 --- a/src/proof/dch/dchSim.c +++ b/src/proof/dch/dchSim.c @@ -211,7 +211,7 @@ void Dch_PerformRandomSimulation( Aig_Man_t * pAig, Vec_Ptr_t * vSims ) memset( pSim, 0xff, sizeof(unsigned) * nWords ); // assign primary input random sim info - Aig_ManForEachPi( pAig, pObj, i ) + Aig_ManForEachCi( pAig, pObj, i ) { pSim = Dch_ObjSim( vSims, pObj ); for ( k = 0; k < nWords; k++ ) diff --git a/src/proof/dch/dchSweep.c b/src/proof/dch/dchSweep.c index a1c4f79b..dafab06e 100644 --- a/src/proof/dch/dchSweep.c +++ b/src/proof/dch/dchSweep.c @@ -112,8 +112,8 @@ void Dch_ManSweep( Dch_Man_t * p ) p->pAigFraig = Aig_ManStart( Aig_ManObjNumMax(p->pAigTotal) ); Aig_ManCleanData( p->pAigTotal ); Aig_ManConst1(p->pAigTotal)->pData = Aig_ManConst1(p->pAigFraig); - Aig_ManForEachPi( p->pAigTotal, pObj, i ) - pObj->pData = Aig_ObjCreatePi( p->pAigFraig ); + Aig_ManForEachCi( p->pAigTotal, pObj, i ) + pObj->pData = Aig_ObjCreateCi( p->pAigFraig ); // sweep internal nodes pProgress = Bar_ProgressStart( stdout, Aig_ManObjNumMax(p->pAigTotal) ); Aig_ManForEachNode( p->pAigTotal, pObj, i ) |
