diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2011-08-01 13:47:51 +0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2011-08-01 13:47:51 +0700 |
| commit | 961f7532d703060ef2e053df1f1b7a672e7dae30 (patch) | |
| tree | 4acbe7857d51c5d80d3f2c7315ef5b80450c9723 /src/base | |
| parent | 820a147ef1e8ff307c3d4e675001372e8f636404 (diff) | |
| download | abc-961f7532d703060ef2e053df1f1b7a672e7dae30.tar.gz abc-961f7532d703060ef2e053df1f1b7a672e7dae30.tar.bz2 abc-961f7532d703060ef2e053df1f1b7a672e7dae30.zip | |
Changing the ordering of arguments in two iterators.
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/abc/abc.h | 2 | ||||
| -rw-r--r-- | src/base/abci/abcMffc.c | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/base/abc/abc.h b/src/base/abc/abc.h index fb7abae9..e707c57e 100644 --- a/src/base/abc/abc.h +++ b/src/base/abc/abc.h @@ -451,7 +451,7 @@ static inline void Abc_ObjSetMvVar( Abc_Obj_t * pObj, void * pV) { Vec_At #define Abc_NtkForEachObj( pNtk, pObj, i ) \ for ( i = 0; (i < Vec_PtrSize((pNtk)->vObjs)) && (((pObj) = Abc_NtkObj(pNtk, i)), 1); i++ ) \ if ( (pObj) == NULL ) {} else -#define Abc_NtkForEachObjVec( pNtk, vIds, pObj, i ) \ +#define Abc_NtkForEachObjVec( vIds, pNtk, pObj, i ) \ for ( i = 0; i < Vec_IntSize(vIds) && (((pObj) = Abc_NtkObj(pNtk, Vec_IntEntry(vIds,i))), 1); i++ ) \ if ( (pObj) == NULL ) {} else #define Abc_NtkForEachNet( pNtk, pNet, i ) \ diff --git a/src/base/abci/abcMffc.c b/src/base/abci/abcMffc.c index 0ffc6f1d..3fb4bdf1 100644 --- a/src/base/abci/abcMffc.c +++ b/src/base/abci/abcMffc.c @@ -455,14 +455,14 @@ void Abc_NktMffcPrintInt( char * pFileName, Abc_Ntk_t * pNtk, Vec_Int_t * vRoots pFile = fopen( pFileName, "wb" ); fprintf( pFile, ".model %s_part\n", pNtk->pName ); fprintf( pFile, ".inputs" ); - Abc_NtkForEachObjVec( pNtk, vLeaves, pObj, i ) + Abc_NtkForEachObjVec( vLeaves, pNtk, pObj, i ) fprintf( pFile, " %s", Abc_ObjName(pObj) ); fprintf( pFile, "\n" ); fprintf( pFile, ".outputs" ); - Abc_NtkForEachObjVec( pNtk, vRoots, pObj, i ) + Abc_NtkForEachObjVec( vRoots, pNtk, pObj, i ) fprintf( pFile, " %s", Abc_ObjName(pObj) ); fprintf( pFile, "\n" ); - Abc_NtkForEachObjVec( pNtk, vNodes, pObj, i ) + Abc_NtkForEachObjVec( vNodes, pNtk, pObj, i ) { fprintf( pFile, ".names" ); Abc_ObjForEachFanin( pObj, pFanin, k ) @@ -757,12 +757,12 @@ void Abc_NktMffCollectLeafRootInt( Abc_Ntk_t * pNtk, Vec_Int_t * vNodes, Vec_Int Abc_Obj_t * pObj, * pNext; int i, k; // mark - Abc_NtkForEachObjVec( pNtk, vNodes, pObj, i ) + Abc_NtkForEachObjVec( vNodes, pNtk, pObj, i ) pObj->fMarkA = 1; // collect leaves Vec_IntClear( vLeaves ); Abc_NtkIncrementTravId( pNtk ); - Abc_NtkForEachObjVec( pNtk, vNodes, pObj, i ) + Abc_NtkForEachObjVec( vNodes, pNtk, pObj, i ) Abc_ObjForEachFanin( pObj, pNext, k ) { if ( pNext->fMarkA || Abc_NodeIsTravIdCurrent(pNext) ) @@ -774,7 +774,7 @@ void Abc_NktMffCollectLeafRootInt( Abc_Ntk_t * pNtk, Vec_Int_t * vNodes, Vec_Int if ( vRoots ) { Vec_IntClear( vRoots ); - Abc_NtkForEachObjVec( pNtk, vNodes, pObj, i ) + Abc_NtkForEachObjVec( vNodes, pNtk, pObj, i ) { Abc_ObjForEachFanout( pObj, pNext, k ) if ( !pNext->fMarkA ) @@ -785,7 +785,7 @@ void Abc_NktMffCollectLeafRootInt( Abc_Ntk_t * pNtk, Vec_Int_t * vNodes, Vec_Int } } // unmark - Abc_NtkForEachObjVec( pNtk, vNodes, pObj, i ) + Abc_NtkForEachObjVec( vNodes, pNtk, pObj, i ) pObj->fMarkA = 0; } @@ -1051,7 +1051,7 @@ Abc_Obj_t * Abc_NktMffcFindBest( Abc_Ntk_t * pNtk, Vec_Int_t * vMarks, Vec_Int_t int i, Volume; // collect the fanouts of the fanins vOuts = Vec_IntAlloc( 100 ); - Abc_NtkForEachObjVec( pNtk, vIns, pObj, i ) + Abc_NtkForEachObjVec( vIns, pNtk, pObj, i ) { vOuts2 = (Vec_Int_t *)Vec_PtrEntry( vFanouts, Abc_ObjId(pObj) ); if ( Vec_IntSize(vOuts2) > 16 ) @@ -1060,7 +1060,7 @@ Abc_Obj_t * Abc_NktMffcFindBest( Abc_Ntk_t * pNtk, Vec_Int_t * vMarks, Vec_Int_t Vec_IntFree( vTemp ); } // check the pairs - Abc_NtkForEachObjVec( pNtk, vOuts, pPivot2, i ) + Abc_NtkForEachObjVec( vOuts, pNtk, pPivot2, i ) { if ( Vec_IntEntry(vMarks, Abc_ObjId(pPivot2)) == 0 ) continue; |