diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-03-09 19:59:35 -0800 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-03-09 19:59:35 -0800 |
commit | fec988f6194fbab17cc18b72e6f907d5f990bbe8 (patch) | |
tree | 0adf99e304f984f32201e3853fa2109ed5405e86 /src/opt | |
parent | c46c957a0721004eb21c5f3d3f316ba1c8ab8df1 (diff) | |
download | abc-fec988f6194fbab17cc18b72e6f907d5f990bbe8.tar.gz abc-fec988f6194fbab17cc18b72e6f907d5f990bbe8.tar.bz2 abc-fec988f6194fbab17cc18b72e6f907d5f990bbe8.zip |
Renamed Aig_ObjPioNum to be Aig_ObjCioId.
Diffstat (limited to 'src/opt')
-rw-r--r-- | src/opt/cgt/cgtAig.c | 6 | ||||
-rw-r--r-- | src/opt/cgt/cgtDecide.c | 2 | ||||
-rw-r--r-- | src/opt/cgt/cgtMan.c | 2 | ||||
-rw-r--r-- | src/opt/dar/darBalance.c | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/opt/cgt/cgtAig.c b/src/opt/cgt/cgtAig.c index 8d403732..047f6875 100644 --- a/src/opt/cgt/cgtAig.c +++ b/src/opt/cgt/cgtAig.c @@ -320,7 +320,7 @@ Aig_Man_t * Cgt_ManDeriveAigForGating( Cgt_Man_t * p ) } } Aig_ManCleanup( pNew ); - Aig_ManSetPioNumbers( pNew ); + Aig_ManSetCioIds( pNew ); return pNew; } @@ -375,14 +375,14 @@ void Cgt_ManConstructCare( Aig_Man_t * pNew, Aig_Man_t * pCare, Vec_Vec_t * vSup Aig_ManIncrementTravId( pCare ); Vec_PtrForEachEntry( Aig_Obj_t *, vLeaves, pLeaf, i ) { - pPi = Aig_ManCi( pCare, Aig_ObjPioNum(pLeaf) ); + pPi = Aig_ManCi( pCare, Aig_ObjCioId(pLeaf) ); Aig_ObjSetTravIdCurrent( pCare, pPi ); pPi->pData = pLeaf->pData; } // construct the constraints Vec_PtrForEachEntry( Aig_Obj_t *, vLeaves, pLeaf, i ) { - vOuts = Vec_VecEntryInt( vSuppsInv, Aig_ObjPioNum(pLeaf) ); + vOuts = Vec_VecEntryInt( vSuppsInv, Aig_ObjCioId(pLeaf) ); Vec_IntForEachEntry( vOuts, iOut, k ) { pPo = Aig_ManCo( pCare, iOut ); diff --git a/src/opt/cgt/cgtDecide.c b/src/opt/cgt/cgtDecide.c index 3370498e..c5b49bbc 100644 --- a/src/opt/cgt/cgtDecide.c +++ b/src/opt/cgt/cgtDecide.c @@ -103,7 +103,7 @@ int Cgt_ManCheckGateComplete( Aig_Man_t * pAig, Vec_Vec_t * vGatesAll, Aig_Obj_t { if ( Saig_ObjIsPo(pAig, pObj) ) return 0; - vGates = Vec_VecEntry( vGatesAll, Aig_ObjPioNum(pObj) - Saig_ManPoNum(pAig) ); + vGates = Vec_VecEntry( vGatesAll, Aig_ObjCioId(pObj) - Saig_ManPoNum(pAig) ); if ( Vec_PtrFind( vGates, pGate ) == -1 ) return 0; } diff --git a/src/opt/cgt/cgtMan.c b/src/opt/cgt/cgtMan.c index 2ba5baae..68a15381 100644 --- a/src/opt/cgt/cgtMan.c +++ b/src/opt/cgt/cgtMan.c @@ -48,7 +48,7 @@ Cgt_Man_t * Cgt_ManCreate( Aig_Man_t * pAig, Aig_Man_t * pCare, Cgt_Par_t * pPar // prepare the sequential AIG assert( Saig_ManRegNum(pAig) > 0 ); Aig_ManFanoutStart( pAig ); - Aig_ManSetPioNumbers( pAig ); + Aig_ManSetCioIds( pAig ); // create interpolation manager p = ABC_ALLOC( Cgt_Man_t, 1 ); memset( p, 0, sizeof(Cgt_Man_t) ); diff --git a/src/opt/dar/darBalance.c b/src/opt/dar/darBalance.c index 558316a6..a1afd2ad 100644 --- a/src/opt/dar/darBalance.c +++ b/src/opt/dar/darBalance.c @@ -495,7 +495,7 @@ Aig_Man_t * Dar_ManBalance( Aig_Man_t * p, int fUpdateLevel ) { float arrTime; Tim_ManIncrementTravId( (Tim_Man_t *)p->pManTime ); - Aig_ManSetPioNumbers( p ); + Aig_ManSetCioIds( p ); Aig_ManForEachObj( p, pObj, i ) { if ( Aig_ObjIsNode(pObj) || Aig_ObjIsConst1(pObj) ) @@ -507,7 +507,7 @@ Aig_Man_t * Dar_ManBalance( Aig_Man_t * p, int fUpdateLevel ) pObj->pData = pObjNew; pObjNew->pHaig = pObj->pHaig; // set the arrival time of the new PI - arrTime = Tim_ManGetCiArrival( (Tim_Man_t *)p->pManTime, Aig_ObjPioNum(pObj) ); + arrTime = Tim_ManGetCiArrival( (Tim_Man_t *)p->pManTime, Aig_ObjCioId(pObj) ); pObjNew->Level = (int)arrTime; } else if ( Aig_ObjIsCo(pObj) ) @@ -518,7 +518,7 @@ Aig_Man_t * Dar_ManBalance( Aig_Man_t * p, int fUpdateLevel ) pObjNew = Aig_NotCond( pObjNew, Aig_IsComplement(pDriver) ); // save arrival time of the output arrTime = (float)Aig_Regular(pObjNew)->Level; - Tim_ManSetCoArrival( (Tim_Man_t *)p->pManTime, Aig_ObjPioNum(pObj), arrTime ); + Tim_ManSetCoArrival( (Tim_Man_t *)p->pManTime, Aig_ObjCioId(pObj), arrTime ); // create PO pObjNew = Aig_ObjCreateCo( pNew, pObjNew ); pObjNew->pHaig = pObj->pHaig; @@ -526,7 +526,7 @@ Aig_Man_t * Dar_ManBalance( Aig_Man_t * p, int fUpdateLevel ) else assert( 0 ); } - Aig_ManCleanPioNumbers( p ); + Aig_ManCleanCioIds( p ); pNew->pManTime = Tim_ManDup( (Tim_Man_t *)p->pManTime, 0 ); } else |