diff options
| -rw-r--r-- | src/base/abc/abc.h | 3 | ||||
| -rw-r--r-- | src/map/scl/sclLoad.c | 4 | ||||
| -rw-r--r-- | src/map/scl/sclMan.h | 2 | ||||
| -rw-r--r-- | src/map/scl/sclSize.c | 2 | ||||
| -rw-r--r-- | src/map/scl/sclTime.c | 5 | ||||
| -rw-r--r-- | src/map/scl/sclUtil.c | 4 |
6 files changed, 12 insertions, 8 deletions
diff --git a/src/base/abc/abc.h b/src/base/abc/abc.h index d123514a..26264586 100644 --- a/src/base/abc/abc.h +++ b/src/base/abc/abc.h @@ -463,6 +463,9 @@ static inline void Abc_ObjSetMvVar( Abc_Obj_t * pObj, void * pV) { Vec_At #define Abc_NtkForEachNode( pNtk, pNode, i ) \ for ( i = 0; (i < Vec_PtrSize((pNtk)->vObjs)) && (((pNode) = Abc_NtkObj(pNtk, i)), 1); i++ ) \ if ( (pNode) == NULL || !Abc_ObjIsNode(pNode) ) {} else +#define Abc_NtkForEachNode1( pNtk, pNode, i ) \ + for ( i = 0; (i < Vec_PtrSize((pNtk)->vObjs)) && (((pNode) = Abc_NtkObj(pNtk, i)), 1); i++ ) \ + if ( (pNode) == NULL || !Abc_ObjIsNode(pNode) || !Abc_ObjFaninNum(pNode) ) {} else #define Abc_NtkForEachNodeReverse( pNtk, pNode, i ) \ for ( i = Vec_PtrSize((pNtk)->vObjs) - 1; (i >= 0) && (((pNode) = Abc_NtkObj(pNtk, i)), 1); i-- ) \ if ( (pNode) == NULL || !Abc_ObjIsNode(pNode) ) {} else diff --git a/src/map/scl/sclLoad.c b/src/map/scl/sclLoad.c index 686000a9..29f73a60 100644 --- a/src/map/scl/sclLoad.c +++ b/src/map/scl/sclLoad.c @@ -132,7 +132,7 @@ void Abc_SclComputeLoad( SC_Man * p ) pLoad->rise = pLoad->fall = 0.0; } // add cell load - Abc_NtkForEachNode( p->pNtk, pObj, i ) + Abc_NtkForEachNode1( p->pNtk, pObj, i ) { SC_Cell * pCell = Abc_SclObjCell( p, pObj ); Abc_ObjForEachFanin( pObj, pFanin, k ) @@ -147,7 +147,7 @@ void Abc_SclComputeLoad( SC_Man * p ) vWireCaps = Abc_SclFindWireCaps( p ); if ( vWireCaps ) { - Abc_NtkForEachNode( p->pNtk, pObj, i ) + Abc_NtkForEachNode1( p->pNtk, pObj, i ) { SC_Pair * pLoad = Abc_SclObjLoad( p, pObj ); k = Abc_MinInt( Vec_FltSize(vWireCaps)-1, Abc_ObjFanoutNum(pObj) ); diff --git a/src/map/scl/sclMan.h b/src/map/scl/sclMan.h index 3257430b..9a500a9a 100644 --- a/src/map/scl/sclMan.h +++ b/src/map/scl/sclMan.h @@ -181,7 +181,7 @@ static inline float Abc_SclGetTotalArea( SC_Man * p ) double Area = 0; Abc_Obj_t * pObj; int i; - Abc_NtkForEachNode( p->pNtk, pObj, i ) + Abc_NtkForEachNode1( p->pNtk, pObj, i ) Area += Abc_SclObjCell( p, pObj )->area; return Area; } diff --git a/src/map/scl/sclSize.c b/src/map/scl/sclSize.c index 6c561bd3..00c05e3c 100644 --- a/src/map/scl/sclSize.c +++ b/src/map/scl/sclSize.c @@ -49,7 +49,7 @@ Vec_Int_t * Abc_SclCollectNodes( Abc_Ntk_t * p ) Abc_Obj_t * pObj; int i; vRes = Vec_IntAlloc( Abc_NtkNodeNum(p) ); - Abc_NtkForEachNode( p, pObj, i ) + Abc_NtkForEachNode1( p, pObj, i ) Vec_IntPush( vRes, i ); return vRes; } diff --git a/src/map/scl/sclTime.c b/src/map/scl/sclTime.c index 350281f4..80123754 100644 --- a/src/map/scl/sclTime.c +++ b/src/map/scl/sclTime.c @@ -108,7 +108,8 @@ void Abc_SclTimeNtkPrint( SC_Man * p, int fShowAll ) { // printf( "Timing information for all nodes: \n" ); Abc_NtkForEachNodeReverse( p->pNtk, pObj, i ) - Abc_SclTimeGatePrint( p, pObj, -1 ); + if ( Abc_ObjFaninNum(pObj) > 0 ) + Abc_SclTimeGatePrint( p, pObj, -1 ); } else { @@ -238,7 +239,7 @@ void Abc_SclTimeNtk( SC_Man * p ) { Abc_Obj_t * pObj; int i; - Abc_NtkForEachNode( p->pNtk, pObj, i ) + Abc_NtkForEachNode1( p->pNtk, pObj, i ) Abc_SclTimeGate( p, pObj ); Abc_NtkForEachCo( p->pNtk, pObj, i ) Abc_SclObjDupFanin( p, pObj ); diff --git a/src/map/scl/sclUtil.c b/src/map/scl/sclUtil.c index b541bfc8..2ae0ddca 100644 --- a/src/map/scl/sclUtil.c +++ b/src/map/scl/sclUtil.c @@ -198,7 +198,7 @@ Vec_Int_t * Abc_SclManFindGates( SC_Lib * pLib, Abc_Ntk_t * p ) Abc_Obj_t * pObj; int i; vVec = Vec_IntStartFull( Abc_NtkObjNumMax(p) ); - Abc_NtkForEachNode( p, pObj, i ) + Abc_NtkForEachNode1( p, pObj, i ) { char * pName = Mio_GateReadName((Mio_Gate_t *)pObj->pData); int gateId = Abc_SclCellFind( pLib, pName ); @@ -212,7 +212,7 @@ void Abc_SclManSetGates( SC_Lib * pLib, Abc_Ntk_t * p, Vec_Int_t * vGates ) { Abc_Obj_t * pObj; int i; - Abc_NtkForEachNode( p, pObj, i ) + Abc_NtkForEachNode1( p, pObj, i ) { SC_Cell * pCell = SC_LibCell( pLib, Vec_IntEntry(vGates, Abc_ObjId(pObj)) ); assert( pCell->n_inputs == Abc_ObjFaninNum(pObj) ); |