diff options
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/abc/abcDfs.c | 10 | ||||
| -rw-r--r-- | src/base/cba/cba.h | 4 | ||||
| -rw-r--r-- | src/base/cmd/cmd.c | 1 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/base/abc/abcDfs.c b/src/base/abc/abcDfs.c index 811a6929..8784ec1a 100644 --- a/src/base/abc/abcDfs.c +++ b/src/base/abc/abcDfs.c @@ -88,11 +88,13 @@ Vec_Ptr_t * Abc_NtkDfs( Abc_Ntk_t * pNtk, int fCollectAll ) // start the array of nodes vNodes = Vec_PtrAlloc( 100 ); if ( pNtk->nBarBufs2 > 0 ) - Abc_NtkForEachBarBuf( pNtk, pObj, i ) { - Abc_NodeSetTravIdCurrent( pObj ); - Abc_NtkDfs_rec( Abc_ObjFanin0Ntk(Abc_ObjFanin0(pObj)), vNodes ); - Vec_PtrPush( vNodes, pObj ); + Abc_NtkForEachBarBuf( pNtk, pObj, i ) + { + Abc_NodeSetTravIdCurrent( pObj ); + Abc_NtkDfs_rec( Abc_ObjFanin0Ntk(Abc_ObjFanin0(pObj)), vNodes ); + Vec_PtrPush( vNodes, pObj ); + } } Abc_NtkForEachCo( pNtk, pObj, i ) { diff --git a/src/base/cba/cba.h b/src/base/cba/cba.h index 33030f35..b9a02a01 100644 --- a/src/base/cba/cba.h +++ b/src/base/cba/cba.h @@ -294,8 +294,8 @@ static inline void Cba_ObjSetName( Cba_Ntk_t * p, int i, int x ) { a static inline void Cba_ObjSetCopy( Cba_Ntk_t * p, int i, int x ) { assert(Cba_ObjCopy(p, i) == -1); Vec_IntSetEntry( &p->vCopy, i, x ); } static inline int Cba_ObjGetConst( Cba_Ntk_t * p, int i ) { assert(Cba_ObjIsCi(p, i)); return Cba_ObjIsBo(p, i) && Cba_ObjIsConst(p, i-1) ? Cba_ObjType(p, i-1) : 0; } -static inline int Cba_BoxBiNum( Cba_Ntk_t * p, int i ) { int s = i-1; assert(Cba_ObjIsBox(p, i)); while (--i >= 0 && Cba_ObjIsBi(p, i)); return s - i; } -static inline int Cba_BoxBoNum( Cba_Ntk_t * p, int i ) { int s = i+1; assert(Cba_ObjIsBox(p, i)); while (++i < Cba_NtkObjNum(p) && Cba_ObjIsBo(p, i)); return i - s; } +static inline int Cba_BoxBiNum( Cba_Ntk_t * p, int i ) { int s = i-1; assert(Cba_ObjIsBox(p, i)); while (--i >= 0 && Cba_ObjIsBi(p, i)) {} return s - i; } +static inline int Cba_BoxBoNum( Cba_Ntk_t * p, int i ) { int s = i+1; assert(Cba_ObjIsBox(p, i)); while (++i < Cba_NtkObjNum(p) && Cba_ObjIsBo(p, i)) {} return i - s; } static inline int Cba_BoxSize( Cba_Ntk_t * p, int i ) { return 1 + Cba_BoxBiNum(p, i) + Cba_BoxBoNum(p, i); } static inline int Cba_BoxBi( Cba_Ntk_t * p, int b, int i ) { assert(Cba_ObjIsBox(p, b)); return b - 1 - i; } static inline int Cba_BoxBo( Cba_Ntk_t * p, int b, int i ) { assert(Cba_ObjIsBox(p, b)); return b + 1 + i; } diff --git a/src/base/cmd/cmd.c b/src/base/cmd/cmd.c index 8b536a5f..55402fc5 100644 --- a/src/base/cmd/cmd.c +++ b/src/base/cmd/cmd.c @@ -2316,6 +2316,7 @@ int CmdCommandCapo( Abc_Frame_t * pAbc, int argc, char **argv ) pProgNameGnuplotUnix = Cmd_FlagReadByName(pAbc, "gnuplotunix"); // check if Gnuplot is available + pProgNameGnuplot = NULL; if ( (pFile = fopen( pProgNameGnuplotWin, "r" )) ) pProgNameGnuplot = pProgNameGnuplotWin; else if ( (pFile = fopen( pProgNameGnuplotUnix, "r" )) ) |