diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2008-04-03 08:01:00 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2008-04-03 08:01:00 -0700 |
| commit | 087951655efdc20b5b4beb64b15edf86a27850a8 (patch) | |
| tree | 4dbba88e1e7e4470478ad295dbc9cd829672a371 /src/aig/nwk | |
| parent | 0080244a89eaaccd64c64af8f394486ab5d3e5b5 (diff) | |
| download | abc-087951655efdc20b5b4beb64b15edf86a27850a8.tar.gz abc-087951655efdc20b5b4beb64b15edf86a27850a8.tar.bz2 abc-087951655efdc20b5b4beb64b15edf86a27850a8.zip | |
Version abc80403
Diffstat (limited to 'src/aig/nwk')
| -rw-r--r-- | src/aig/nwk/nwkDfs.c | 4 | ||||
| -rw-r--r-- | src/aig/nwk/nwkMap.c | 8 | ||||
| -rw-r--r-- | src/aig/nwk/nwkStrash.c | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/aig/nwk/nwkDfs.c b/src/aig/nwk/nwkDfs.c index bf669086..308f4693 100644 --- a/src/aig/nwk/nwkDfs.c +++ b/src/aig/nwk/nwkDfs.c @@ -66,9 +66,9 @@ int Nwk_ManVerifyTopoOrder( Nwk_Man_t * pNtk ) { iTerm1 = Tim_ManBoxInputFirst( pNtk->pManTime, iBox ); nTerms = Tim_ManBoxInputNum( pNtk->pManTime, iBox ); - for ( i = 0; i < nTerms; i++ ) + for ( k = 0; k < nTerms; k++ ) { - pNext = Nwk_ManCo( pNtk, iTerm1 + i ); + pNext = Nwk_ManCo( pNtk, iTerm1 + k ); if ( !Nwk_ObjIsTravIdCurrent(pNext) ) { printf( "Box %d has input %d that is not in a topological order.\n", iBox, pNext->Id ); diff --git a/src/aig/nwk/nwkMap.c b/src/aig/nwk/nwkMap.c index eae3bd24..44aecc03 100644 --- a/src/aig/nwk/nwkMap.c +++ b/src/aig/nwk/nwkMap.c @@ -115,9 +115,13 @@ If_Man_t * Nwk_ManToIf( Aig_Man_t * p, If_Par_t * pPars, Vec_Ptr_t * vAigToIf ) { pIfObj = If_ManCreateCi( pIfMan ); If_ObjSetLevel( pIfObj, Aig_ObjLevel(pNode) ); +// printf( "pi=%d ", pIfObj->Level ); } else if ( Aig_ObjIsPo(pNode) ) + { pIfObj = If_ManCreateCo( pIfMan, If_NotCond( Aig_ObjFanin0(pNode)->pData, Aig_ObjFaninC0(pNode) ) ); +// printf( "po=%d ", pIfObj->Level ); + } else if ( Aig_ObjIsConst1(pNode) ) pIfObj = If_ManConst1( pIfMan ); else // add the node to the mapper @@ -130,11 +134,11 @@ If_Man_t * Nwk_ManToIf( Aig_Man_t * p, If_Par_t * pPars, Vec_Ptr_t * vAigToIf ) if ( Aig_ObjIsChoice( p, pNode ) ) { pIfMan->nChoices++; - for ( pPrev = pNode, pFanin = pNode->pData; pFanin; pPrev = pFanin, pFanin = pFanin->pData ) + for ( pPrev = pNode, pFanin = p->pEquivs[pNode->Id]; pFanin; pPrev = pFanin, pFanin = p->pEquivs[pFanin->Id] ) If_ObjSetChoice( pPrev->pData, pFanin->pData ); If_ManCreateChoice( pIfMan, pNode->pData ); } - assert( If_ObjLevel(pIfObj) == Aig_ObjLevel(pNode) ); +// assert( If_ObjLevel(pIfObj) == Aig_ObjLevel(pNode) ); } return pIfMan; } diff --git a/src/aig/nwk/nwkStrash.c b/src/aig/nwk/nwkStrash.c index 627bfa67..3bcfcd41 100644 --- a/src/aig/nwk/nwkStrash.c +++ b/src/aig/nwk/nwkStrash.c @@ -127,7 +127,7 @@ Aig_Man_t * Nwk_ManStrash( Nwk_Man_t * pNtk ) pObj->pCopy = pObjNew; } Aig_ManCleanup( pMan ); -// pMan = Aig_ManDup( pTemp = pMan, 1 ); +// pMan = Aig_ManDupOrdered( pTemp = pMan ); // Aig_ManStop( pTemp ); return pMan; } |