diff options
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/abc/abcNtk.c | 2 | ||||
| -rw-r--r-- | src/base/abci/abcRec.c | 7 | ||||
| -rw-r--r-- | src/base/abci/abcRec2.c | 6 | ||||
| -rw-r--r-- | src/base/io/ioWriteBook.c | 12 |
4 files changed, 16 insertions, 11 deletions
diff --git a/src/base/abc/abcNtk.c b/src/base/abc/abcNtk.c index 687d130f..07ee429b 100644 --- a/src/base/abc/abcNtk.c +++ b/src/base/abc/abcNtk.c @@ -1857,7 +1857,7 @@ Vec_Int_t * Abc_NtkReadFlopPerm( char * pFileName, int nFlops ) char Buffer[1000]; FILE * pFile; Vec_Int_t * vFlops; - int iFlop; + int iFlop = -1; pFile = fopen( pFileName, "rb" ); if ( pFile == NULL ) { diff --git a/src/base/abci/abcRec.c b/src/base/abci/abcRec.c index b86b7b04..4cc1b86e 100644 --- a/src/base/abci/abcRec.c +++ b/src/base/abci/abcRec.c @@ -300,7 +300,7 @@ char If_CutDepthRecComput_rec(Abc_Obj_t* pObj, int iLeaf) Depth1 = If_CutDepthRecComput_rec(Abc_ObjFanin1(pObj), iLeaf); Depth = Abc_MaxInt(Depth0, Depth1); Depth = (Depth == -IF_BIG_CHAR) ? -IF_BIG_CHAR : Depth + 1; - assert(Depth <= 127); +// assert(Depth <= 127); return Depth; } @@ -324,7 +324,7 @@ unsigned char Abc_NtkRecAreaAndMark_rec(Abc_Obj_t* pObj) Area0 = Abc_NtkRecAreaAndMark_rec(Abc_ObjFanin0(pObj)); Area1 = Abc_NtkRecAreaAndMark_rec(Abc_ObjFanin1(pObj)); Area = Area1 + Area0 + 1; - assert(Area <= 255); +// assert(Area <= 255); pObj->fMarkA = 1; return Area; } @@ -2642,7 +2642,7 @@ char Abc_NtkRecCurrentDepth_rec(If_Obj_t * pObj, int iLeaf) Depth1 = Abc_NtkRecCurrentDepth_rec(If_ObjFanin1(pObj), iLeaf); Depth = Abc_MaxInt(Depth0, Depth1); Depth = (Depth == -IF_BIG_CHAR) ? -IF_BIG_CHAR : Depth + 1; - assert(Depth <= 127); +// assert(Depth <= 127); return Depth; } @@ -3107,3 +3107,4 @@ int If_CutDelayRecCost(If_Man_t* p, If_Cut_t* pCut, If_Obj_t * pObj) ABC_NAMESPACE_IMPL_END + diff --git a/src/base/abci/abcRec2.c b/src/base/abci/abcRec2.c index 66e1e8a6..cdc1fe13 100644 --- a/src/base/abci/abcRec2.c +++ b/src/base/abci/abcRec2.c @@ -702,7 +702,7 @@ static unsigned char Abc_NtkRecAreaAndMark_rec(Gia_Obj_t* pObj) Area0 = Abc_NtkRecAreaAndMark_rec(Gia_ObjFanin0(pObj)); Area1 = Abc_NtkRecAreaAndMark_rec(Gia_ObjFanin1(pObj)); Area = Area1 + Area0 + 1; - assert(Area <= 255); +// assert(Area <= 255); pObj->fMark0 = 1; return Area; } @@ -771,7 +771,7 @@ char If_CutDepthRecComput_rec2(Gia_Obj_t* pObj, int iLeaf) Depth1 = If_CutDepthRecComput_rec2(Gia_ObjFanin1(pObj), iLeaf); Depth = Abc_MaxInt(Depth0, Depth1); Depth = (Depth == -IF_BIG_CHAR) ? -IF_BIG_CHAR : Depth + 1; - assert(Depth <= 127); +// assert(Depth <= 127); return Depth; } @@ -2439,4 +2439,4 @@ void Abc_NtkRecLibMerge2(Gia_Man_t* pGia2) -ABC_NAMESPACE_IMPL_END
\ No newline at end of file +ABC_NAMESPACE_IMPL_END diff --git a/src/base/io/ioWriteBook.c b/src/base/io/ioWriteBook.c index 92f49d62..8dacbc12 100644 --- a/src/base/io/ioWriteBook.c +++ b/src/base/io/ioWriteBook.c @@ -201,10 +201,12 @@ unsigned Io_NtkWriteNodes( FILE * pFile, Abc_Ntk_t * pNtk ) Io_NtkWritePiPoNodes( pFile, pNtk ); // write the latches if ( !Abc_NtkIsComb(pNtk) ) - Abc_NtkForEachLatch( pNtk, pLatch, i ) { - Io_NtkWriteLatchNode( pFile, pLatch, NODES ); - coreCellArea+=6*coreHeight; + Abc_NtkForEachLatch( pNtk, pLatch, i ) + { + Io_NtkWriteLatchNode( pFile, pLatch, NODES ); + coreCellArea+=6*coreHeight; + } } // write each internal node pProgress = Extra_ProgressBarStart( stdout, Abc_NtkNodeNum(pNtk) ); @@ -692,11 +694,13 @@ void Io_NtkWritePl( FILE * pFile, Abc_Ntk_t * pNtk, unsigned numTerms, double la } if( !Abc_NtkIsComb(pNtk) ) + { Abc_NtkForEachLatch( pNtk, pLatch, i ) { Io_NtkWriteLatchNode( pFile, pLatch, PL ); fprintf( pFile, "\t%d\t\t%d\t: %s\n", 0, 0, "N" ); } + } Abc_NtkForEachNode( pNtk, pNode, i ) { @@ -724,7 +728,7 @@ Vec_Ptr_t * Io_NtkOrderingPads( Abc_Ntk_t * pNtk, Vec_Ptr_t * vTerms ) int * pOrdered = ABC_ALLOC(int, numTerms); int newNeighbor=1; Vec_Ptr_t * vOrderedTerms = Vec_PtrAlloc ( numTerms ); - Abc_Obj_t * pNeighbor, * pNextTerm; + Abc_Obj_t * pNeighbor = NULL, * pNextTerm; unsigned i; for( i=0 ; i<numTerms ; i++ ) |