diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2008-04-03 20:01:00 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2008-04-03 20:01:00 -0700 |
| commit | 69b5bcad56f9352eea80d3e9b5e1322782522059 (patch) | |
| tree | 9381d7ce208e93fc82efc5606bcd59ec1dbed765 /src/aig/ntl | |
| parent | 087951655efdc20b5b4beb64b15edf86a27850a8 (diff) | |
| download | abc-69b5bcad56f9352eea80d3e9b5e1322782522059.tar.gz abc-69b5bcad56f9352eea80d3e9b5e1322782522059.tar.bz2 abc-69b5bcad56f9352eea80d3e9b5e1322782522059.zip | |
Version abc80403_2
Diffstat (limited to 'src/aig/ntl')
| -rw-r--r-- | src/aig/ntl/ntlExtract.c | 2 | ||||
| -rw-r--r-- | src/aig/ntl/ntlInsert.c | 9 | ||||
| -rw-r--r-- | src/aig/ntl/ntlReadBlif.c | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/aig/ntl/ntlExtract.c b/src/aig/ntl/ntlExtract.c index 0654bb27..55356654 100644 --- a/src/aig/ntl/ntlExtract.c +++ b/src/aig/ntl/ntlExtract.c @@ -387,7 +387,7 @@ int Ntl_ManExtract_rec( Ntl_Man_t * p, Ntl_Net_t * pNet ) // add box inputs/outputs to COs/CIs if ( Ntl_ObjIsBox(pObj) ) { - int LevelCur, LevelMax = -AIG_INFINITY; + int LevelCur, LevelMax = -TIME_ETERNITY; Vec_IntPush( p->vBox1Cos, Aig_ManPoNum(p->pAig) ); Ntl_ObjForEachFanin( pObj, pNetFanin, i ) { diff --git a/src/aig/ntl/ntlInsert.c b/src/aig/ntl/ntlInsert.c index 2eb48e84..f02b4716 100644 --- a/src/aig/ntl/ntlInsert.c +++ b/src/aig/ntl/ntlInsert.c @@ -137,6 +137,7 @@ int Ntl_ManInsert( Ntl_Man_t * p, Vec_Ptr_t * vMapping, Aig_Man_t * pAig ) int Ntl_ManInsertNtk( Ntl_Man_t * p, Nwk_Man_t * pNtk ) { char Buffer[100]; + Vec_Ptr_t * vObjs; Vec_Int_t * vTruth; Vec_Int_t * vCover; Ntl_Mod_t * pRoot; @@ -160,8 +161,13 @@ int Ntl_ManInsertNtk( Ntl_Man_t * p, Nwk_Man_t * pNtk ) vTruth = Vec_IntAlloc( 1 << 16 ); vCover = Vec_IntAlloc( 1 << 16 ); nDigits = Aig_Base10Log( Nwk_ManNodeNum(pNtk) ); - Nwk_ManForEachNode( pNtk, pObj, i ) +// Nwk_ManForEachObj( pNtk, pObj, i ) + vObjs = Nwk_ManDfs( pNtk ); + Vec_PtrForEachEntry( vObjs, pObj, i ) +// Nwk_ManForEachNode( pNtk, pObj, i ) { + if ( !Nwk_ObjIsNode(pObj) ) + continue; pNode = Ntl_ModelCreateNode( pRoot, Nwk_ObjFaninNum(pObj) ); pTruth = Hop_ManConvertAigToTruth( pNtk->pManHop, Hop_Regular(pObj->pFunc), Nwk_ObjFaninNum(pObj), vTruth, 0 ); if ( Hop_IsComplement(pObj->pFunc) ) @@ -194,6 +200,7 @@ int Ntl_ManInsertNtk( Ntl_Man_t * p, Nwk_Man_t * pNtk ) } pObj->pCopy = pNet; } + Vec_PtrFree( vObjs ); Vec_IntFree( vCover ); Vec_IntFree( vTruth ); // mark CIs and outputs of the registers diff --git a/src/aig/ntl/ntlReadBlif.c b/src/aig/ntl/ntlReadBlif.c index e5a94610..81ea2a2c 100644 --- a/src/aig/ntl/ntlReadBlif.c +++ b/src/aig/ntl/ntlReadBlif.c @@ -974,9 +974,9 @@ static int Ioa_ReadParseLineTimes( Ioa_ReadMod_t * p, char * pLine, int fOutput // find the delay number pTokenNum = Vec_PtrEntryLast(vTokens); if ( !strcmp( pTokenNum, "-inf" ) ) - Delay = -AIG_INFINITY; + Delay = -TIME_ETERNITY; else if ( !strcmp( pTokenNum, "inf" ) ) - Delay = AIG_INFINITY; + Delay = TIME_ETERNITY; else Delay = atof( pTokenNum ); if ( Delay == 0.0 && pTokenNum[0] != '0' ) |