diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2009-04-08 08:01:00 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2009-04-08 08:01:00 -0700 |
| commit | df6fdd1dffd8ce83dfc4a7868ebdd25241f8f24b (patch) | |
| tree | d320da2793b6d667ec661827c6efc0a9dd86504d /src/aig/nwk | |
| parent | e3e2918eb8a4750b9ce51de821ea6b58941fe65c (diff) | |
| download | abc-df6fdd1dffd8ce83dfc4a7868ebdd25241f8f24b.tar.gz abc-df6fdd1dffd8ce83dfc4a7868ebdd25241f8f24b.tar.bz2 abc-df6fdd1dffd8ce83dfc4a7868ebdd25241f8f24b.zip | |
Version abc90408
Diffstat (limited to 'src/aig/nwk')
| -rw-r--r-- | src/aig/nwk/nwkFanio.c | 2 | ||||
| -rw-r--r-- | src/aig/nwk/nwkMan.c | 2 | ||||
| -rw-r--r-- | src/aig/nwk/nwkTiming.c | 4 | ||||
| -rw-r--r-- | src/aig/nwk/nwkUtil.c | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/aig/nwk/nwkFanio.c b/src/aig/nwk/nwkFanio.c index 56a13741..daea19d5 100644 --- a/src/aig/nwk/nwkFanio.c +++ b/src/aig/nwk/nwkFanio.c @@ -172,7 +172,7 @@ void Nwk_ObjAddFanin( Nwk_Obj_t * pObj, Nwk_Obj_t * pFanin ) pObj->pFanio[i] = pObj->pFanio[i-1]; pObj->pFanio[pObj->nFanins++] = pFanin; pFanin->pFanio[pFanin->nFanins + pFanin->nFanouts++] = pObj; - pObj->Level = AIG_MAX( pObj->Level, pFanin->Level + Nwk_ObjIsNode(pObj) ); + pObj->Level = ABC_MAX( pObj->Level, pFanin->Level + Nwk_ObjIsNode(pObj) ); } /**Function************************************************************* diff --git a/src/aig/nwk/nwkMan.c b/src/aig/nwk/nwkMan.c index d6e20672..8f971871 100644 --- a/src/aig/nwk/nwkMan.c +++ b/src/aig/nwk/nwkMan.c @@ -127,7 +127,7 @@ int Nwk_ManCompareAndSaveBest( Nwk_Man_t * pNtk, void * pNtl ) int nPis; // the number of primary inputs int nPos; // the number of primary outputs } ParsNew, ParsBest = { 0 }; - // ABC_FREE storage for the name + // free storage for the name if ( pNtk == NULL ) { ABC_FREE( ParsBest.pName ); diff --git a/src/aig/nwk/nwkTiming.c b/src/aig/nwk/nwkTiming.c index 80391c66..5c53038c 100644 --- a/src/aig/nwk/nwkTiming.c +++ b/src/aig/nwk/nwkTiming.c @@ -736,7 +736,7 @@ int Nwk_ObjLevelNew( Nwk_Obj_t * pObj ) for ( i = 0; i < nTerms; i++ ) { pFanin = Nwk_ManCo(pObj->pMan, iTerm1 + i); - Level = AIG_MAX( Level, Nwk_ObjLevel(pFanin) ); + Level = ABC_MAX( Level, Nwk_ObjLevel(pFanin) ); } Level++; } @@ -745,7 +745,7 @@ int Nwk_ObjLevelNew( Nwk_Obj_t * pObj ) } assert( Nwk_ObjIsNode(pObj) || Nwk_ObjIsCo(pObj) ); Nwk_ObjForEachFanin( pObj, pFanin, i ) - Level = AIG_MAX( Level, Nwk_ObjLevel(pFanin) ); + Level = ABC_MAX( Level, Nwk_ObjLevel(pFanin) ); return Level + (Nwk_ObjIsNode(pObj) && Nwk_ObjFaninNum(pObj) > 0); } diff --git a/src/aig/nwk/nwkUtil.c b/src/aig/nwk/nwkUtil.c index fccac175..10b7b462 100644 --- a/src/aig/nwk/nwkUtil.c +++ b/src/aig/nwk/nwkUtil.c @@ -368,12 +368,12 @@ void Nwk_ManPrintFanioNew( Nwk_Man_t * pNtk ) nFanouts = Nwk_ObjFanoutNum(pNode); nFaninsAll += nFanins; nFanoutsAll += nFanouts; - nFaninsMax = AIG_MAX( nFaninsMax, nFanins ); - nFanoutsMax = AIG_MAX( nFanoutsMax, nFanouts ); + nFaninsMax = ABC_MAX( nFaninsMax, nFanins ); + nFanoutsMax = ABC_MAX( nFanoutsMax, nFanouts ); } // allocate storage for fanin/fanout numbers - nSizeMax = AIG_MAX( 10 * (Aig_Base10Log(nFaninsMax) + 1), 10 * (Aig_Base10Log(nFanoutsMax) + 1) ); + nSizeMax = ABC_MAX( 10 * (Aig_Base10Log(nFaninsMax) + 1), 10 * (Aig_Base10Log(nFanoutsMax) + 1) ); vFanins = Vec_IntStart( nSizeMax ); vFanouts = Vec_IntStart( nSizeMax ); |