Commit cb4631e6 by Alan Mishchenko

Compiler warnings.

parent 9f2c4e99
...@@ -149,8 +149,8 @@ int Saig_ManAddUniqueness( sat_solver * pSat, Vec_Int_t * vState, int nRegs, int ...@@ -149,8 +149,8 @@ int Saig_ManAddUniqueness( sat_solver * pSat, Vec_Int_t * vState, int nRegs, int
int Saig_ManInduction( Aig_Man_t * p, int nTimeOut, int nFramesMax, int nConfMax, int fUnique, int fUniqueAll, int fGetCex, int fVerbose, int fVeryVerbose ) int Saig_ManInduction( Aig_Man_t * p, int nTimeOut, int nFramesMax, int nConfMax, int fUnique, int fUniqueAll, int fGetCex, int fVerbose, int fVeryVerbose )
{ {
sat_solver * pSat; sat_solver * pSat;
Aig_Man_t * pAigPart; Aig_Man_t * pAigPart = NULL;
Cnf_Dat_t * pCnfPart; Cnf_Dat_t * pCnfPart = NULL;
Vec_Int_t * vTopVarNums, * vState, * vTopVarIds = NULL; Vec_Int_t * vTopVarNums, * vState, * vTopVarIds = NULL;
Vec_Ptr_t * vTop, * vBot; Vec_Ptr_t * vTop, * vBot;
Aig_Obj_t * pObjPi, * pObjPiCopy, * pObjPo; Aig_Obj_t * pObjPi, * pObjPiCopy, * pObjPo;
......
...@@ -407,7 +407,7 @@ Vec_Str_t * Saig_SynchSequence( Aig_Man_t * pAig, int nWords ) ...@@ -407,7 +407,7 @@ Vec_Str_t * Saig_SynchSequence( Aig_Man_t * pAig, int nWords )
int fVerify = 1; // verify the resulting pattern int fVerify = 1; // verify the resulting pattern
Vec_Str_t * vSequence; Vec_Str_t * vSequence;
Vec_Ptr_t * vSimInfo; Vec_Ptr_t * vSimInfo;
int nTerPrev, nTerCur, nTerCur2; int nTerPrev, nTerCur = 0, nTerCur2;
int iPatBest, RetValue, s, t; int iPatBest, RetValue, s, t;
assert( Saig_ManRegNum(pAig) > 0 ); assert( Saig_ManRegNum(pAig) > 0 );
// reset random numbers // reset random numbers
......
...@@ -1857,7 +1857,7 @@ Vec_Int_t * Abc_NtkReadFlopPerm( char * pFileName, int nFlops ) ...@@ -1857,7 +1857,7 @@ Vec_Int_t * Abc_NtkReadFlopPerm( char * pFileName, int nFlops )
char Buffer[1000]; char Buffer[1000];
FILE * pFile; FILE * pFile;
Vec_Int_t * vFlops; Vec_Int_t * vFlops;
int iFlop; int iFlop = -1;
pFile = fopen( pFileName, "rb" ); pFile = fopen( pFileName, "rb" );
if ( pFile == NULL ) if ( pFile == NULL )
{ {
......
...@@ -300,7 +300,7 @@ char If_CutDepthRecComput_rec(Abc_Obj_t* pObj, int iLeaf) ...@@ -300,7 +300,7 @@ char If_CutDepthRecComput_rec(Abc_Obj_t* pObj, int iLeaf)
Depth1 = If_CutDepthRecComput_rec(Abc_ObjFanin1(pObj), iLeaf); Depth1 = If_CutDepthRecComput_rec(Abc_ObjFanin1(pObj), iLeaf);
Depth = Abc_MaxInt(Depth0, Depth1); Depth = Abc_MaxInt(Depth0, Depth1);
Depth = (Depth == -IF_BIG_CHAR) ? -IF_BIG_CHAR : Depth + 1; Depth = (Depth == -IF_BIG_CHAR) ? -IF_BIG_CHAR : Depth + 1;
assert(Depth <= 127); // assert(Depth <= 127);
return Depth; return Depth;
} }
...@@ -324,7 +324,7 @@ unsigned char Abc_NtkRecAreaAndMark_rec(Abc_Obj_t* pObj) ...@@ -324,7 +324,7 @@ unsigned char Abc_NtkRecAreaAndMark_rec(Abc_Obj_t* pObj)
Area0 = Abc_NtkRecAreaAndMark_rec(Abc_ObjFanin0(pObj)); Area0 = Abc_NtkRecAreaAndMark_rec(Abc_ObjFanin0(pObj));
Area1 = Abc_NtkRecAreaAndMark_rec(Abc_ObjFanin1(pObj)); Area1 = Abc_NtkRecAreaAndMark_rec(Abc_ObjFanin1(pObj));
Area = Area1 + Area0 + 1; Area = Area1 + Area0 + 1;
assert(Area <= 255); // assert(Area <= 255);
pObj->fMarkA = 1; pObj->fMarkA = 1;
return Area; return Area;
} }
...@@ -2642,7 +2642,7 @@ char Abc_NtkRecCurrentDepth_rec(If_Obj_t * pObj, int iLeaf) ...@@ -2642,7 +2642,7 @@ char Abc_NtkRecCurrentDepth_rec(If_Obj_t * pObj, int iLeaf)
Depth1 = Abc_NtkRecCurrentDepth_rec(If_ObjFanin1(pObj), iLeaf); Depth1 = Abc_NtkRecCurrentDepth_rec(If_ObjFanin1(pObj), iLeaf);
Depth = Abc_MaxInt(Depth0, Depth1); Depth = Abc_MaxInt(Depth0, Depth1);
Depth = (Depth == -IF_BIG_CHAR) ? -IF_BIG_CHAR : Depth + 1; Depth = (Depth == -IF_BIG_CHAR) ? -IF_BIG_CHAR : Depth + 1;
assert(Depth <= 127); // assert(Depth <= 127);
return Depth; return Depth;
} }
...@@ -3107,3 +3107,4 @@ int If_CutDelayRecCost(If_Man_t* p, If_Cut_t* pCut, If_Obj_t * pObj) ...@@ -3107,3 +3107,4 @@ int If_CutDelayRecCost(If_Man_t* p, If_Cut_t* pCut, If_Obj_t * pObj)
ABC_NAMESPACE_IMPL_END ABC_NAMESPACE_IMPL_END
...@@ -702,7 +702,7 @@ static unsigned char Abc_NtkRecAreaAndMark_rec(Gia_Obj_t* pObj) ...@@ -702,7 +702,7 @@ static unsigned char Abc_NtkRecAreaAndMark_rec(Gia_Obj_t* pObj)
Area0 = Abc_NtkRecAreaAndMark_rec(Gia_ObjFanin0(pObj)); Area0 = Abc_NtkRecAreaAndMark_rec(Gia_ObjFanin0(pObj));
Area1 = Abc_NtkRecAreaAndMark_rec(Gia_ObjFanin1(pObj)); Area1 = Abc_NtkRecAreaAndMark_rec(Gia_ObjFanin1(pObj));
Area = Area1 + Area0 + 1; Area = Area1 + Area0 + 1;
assert(Area <= 255); // assert(Area <= 255);
pObj->fMark0 = 1; pObj->fMark0 = 1;
return Area; return Area;
} }
...@@ -771,7 +771,7 @@ char If_CutDepthRecComput_rec2(Gia_Obj_t* pObj, int iLeaf) ...@@ -771,7 +771,7 @@ char If_CutDepthRecComput_rec2(Gia_Obj_t* pObj, int iLeaf)
Depth1 = If_CutDepthRecComput_rec2(Gia_ObjFanin1(pObj), iLeaf); Depth1 = If_CutDepthRecComput_rec2(Gia_ObjFanin1(pObj), iLeaf);
Depth = Abc_MaxInt(Depth0, Depth1); Depth = Abc_MaxInt(Depth0, Depth1);
Depth = (Depth == -IF_BIG_CHAR) ? -IF_BIG_CHAR : Depth + 1; Depth = (Depth == -IF_BIG_CHAR) ? -IF_BIG_CHAR : Depth + 1;
assert(Depth <= 127); // assert(Depth <= 127);
return Depth; return Depth;
} }
......
...@@ -201,11 +201,13 @@ unsigned Io_NtkWriteNodes( FILE * pFile, Abc_Ntk_t * pNtk ) ...@@ -201,11 +201,13 @@ unsigned Io_NtkWriteNodes( FILE * pFile, Abc_Ntk_t * pNtk )
Io_NtkWritePiPoNodes( pFile, pNtk ); Io_NtkWritePiPoNodes( pFile, pNtk );
// write the latches // write the latches
if ( !Abc_NtkIsComb(pNtk) ) if ( !Abc_NtkIsComb(pNtk) )
{
Abc_NtkForEachLatch( pNtk, pLatch, i ) Abc_NtkForEachLatch( pNtk, pLatch, i )
{ {
Io_NtkWriteLatchNode( pFile, pLatch, NODES ); Io_NtkWriteLatchNode( pFile, pLatch, NODES );
coreCellArea+=6*coreHeight; coreCellArea+=6*coreHeight;
} }
}
// write each internal node // write each internal node
pProgress = Extra_ProgressBarStart( stdout, Abc_NtkNodeNum(pNtk) ); pProgress = Extra_ProgressBarStart( stdout, Abc_NtkNodeNum(pNtk) );
Abc_NtkForEachNode( pNtk, pNode, i ) Abc_NtkForEachNode( pNtk, pNode, i )
...@@ -692,11 +694,13 @@ void Io_NtkWritePl( FILE * pFile, Abc_Ntk_t * pNtk, unsigned numTerms, double la ...@@ -692,11 +694,13 @@ void Io_NtkWritePl( FILE * pFile, Abc_Ntk_t * pNtk, unsigned numTerms, double la
} }
if( !Abc_NtkIsComb(pNtk) ) if( !Abc_NtkIsComb(pNtk) )
{
Abc_NtkForEachLatch( pNtk, pLatch, i ) Abc_NtkForEachLatch( pNtk, pLatch, i )
{ {
Io_NtkWriteLatchNode( pFile, pLatch, PL ); Io_NtkWriteLatchNode( pFile, pLatch, PL );
fprintf( pFile, "\t%d\t\t%d\t: %s\n", 0, 0, "N" ); fprintf( pFile, "\t%d\t\t%d\t: %s\n", 0, 0, "N" );
} }
}
Abc_NtkForEachNode( pNtk, pNode, i ) Abc_NtkForEachNode( pNtk, pNode, i )
{ {
...@@ -724,7 +728,7 @@ Vec_Ptr_t * Io_NtkOrderingPads( Abc_Ntk_t * pNtk, Vec_Ptr_t * vTerms ) ...@@ -724,7 +728,7 @@ Vec_Ptr_t * Io_NtkOrderingPads( Abc_Ntk_t * pNtk, Vec_Ptr_t * vTerms )
int * pOrdered = ABC_ALLOC(int, numTerms); int * pOrdered = ABC_ALLOC(int, numTerms);
int newNeighbor=1; int newNeighbor=1;
Vec_Ptr_t * vOrderedTerms = Vec_PtrAlloc ( numTerms ); Vec_Ptr_t * vOrderedTerms = Vec_PtrAlloc ( numTerms );
Abc_Obj_t * pNeighbor, * pNextTerm; Abc_Obj_t * pNeighbor = NULL, * pNextTerm;
unsigned i; unsigned i;
for( i=0 ; i<numTerms ; i++ ) for( i=0 ; i<numTerms ; i++ )
......
...@@ -55,3 +55,4 @@ ABC_NAMESPACE_HEADER_END ...@@ -55,3 +55,4 @@ ABC_NAMESPACE_HEADER_END
#endif #endif
\ No newline at end of file
...@@ -114,9 +114,11 @@ void Fxu_MatrixPrint( FILE * pFile, Fxu_Matrix * p ) ...@@ -114,9 +114,11 @@ void Fxu_MatrixPrint( FILE * pFile, Fxu_Matrix * p )
{ {
fprintf( pFile, "Cube #%3d: ", pCube->iCube ); fprintf( pFile, "Cube #%3d: ", pCube->iCube );
if ( pCube->pVar->ppPairs ) if ( pCube->pVar->ppPairs )
{
Fxu_CubeForEachPair( pCube, pPair, i ) Fxu_CubeForEachPair( pCube, pPair, i )
fprintf( pFile, " <%d %d> (d=%d) (b=%d)", fprintf( pFile, " <%d %d> (d=%d) (b=%d)",
pPair->iCube1, pPair->iCube2, pPair->pDiv->Num, pPair->nBase ); pPair->iCube1, pPair->iCube2, pPair->pDiv->Num, pPair->nBase );
}
fprintf( pFile, "\n" ); fprintf( pFile, "\n" );
} }
fprintf( pFile, "\n" ); fprintf( pFile, "\n" );
......
...@@ -46,7 +46,7 @@ DdNode * Llb_ManConstructOutBdd( Aig_Man_t * pAig, Aig_Obj_t * pNode, DdManager ...@@ -46,7 +46,7 @@ DdNode * Llb_ManConstructOutBdd( Aig_Man_t * pAig, Aig_Obj_t * pNode, DdManager
{ {
DdNode * bBdd0, * bBdd1, * bFunc; DdNode * bBdd0, * bBdd1, * bFunc;
Vec_Ptr_t * vNodes; Vec_Ptr_t * vNodes;
Aig_Obj_t * pObj; Aig_Obj_t * pObj = NULL;
int i; int i;
abctime TimeStop; abctime TimeStop;
if ( Aig_ObjFanin0(pNode) == Aig_ManConst1(pAig) ) if ( Aig_ObjFanin0(pNode) == Aig_ManConst1(pAig) )
......
...@@ -32,7 +32,7 @@ static inline Aig_Obj_t * Llb_ObjGetPath( Aig_Obj_t * pObj ) ...@@ -32,7 +32,7 @@ static inline Aig_Obj_t * Llb_ObjGetPath( Aig_Obj_t * pObj )
static inline Aig_Obj_t * Llb_ObjGetFanoutPath( Aig_Man_t * p, Aig_Obj_t * pObj ) static inline Aig_Obj_t * Llb_ObjGetFanoutPath( Aig_Man_t * p, Aig_Obj_t * pObj )
{ {
Aig_Obj_t * pFanout; Aig_Obj_t * pFanout;
int i, iFanout; int i, iFanout = -1;
assert( Llb_ObjGetPath(pObj) ); assert( Llb_ObjGetPath(pObj) );
Aig_ObjForEachFanout( p, pObj, pFanout, iFanout, i ) Aig_ObjForEachFanout( p, pObj, pFanout, iFanout, i )
if ( Llb_ObjGetPath(pFanout) == pObj ) if ( Llb_ObjGetPath(pFanout) == pObj )
...@@ -191,7 +191,8 @@ Vec_Ptr_t * Llb_ManCutMap( Aig_Man_t * p, Vec_Ptr_t * vResult, Vec_Ptr_t * vSupp ...@@ -191,7 +191,8 @@ Vec_Ptr_t * Llb_ManCutMap( Aig_Man_t * p, Vec_Ptr_t * vResult, Vec_Ptr_t * vSupp
} }
printf( "\n" ); printf( "\n" );
if ( fShowMatrix ) if ( !fShowMatrix )
return vMaps;
Aig_ManForEachObj( p, pObj, i ) Aig_ManForEachObj( p, pObj, i )
{ {
if ( !Aig_ObjIsCi(pObj) && !Aig_ObjIsNode(pObj) ) if ( !Aig_ObjIsCi(pObj) && !Aig_ObjIsNode(pObj) )
......
...@@ -81,7 +81,8 @@ Vec_Ptr_t * Llb_ImgSupports( Aig_Man_t * p, Vec_Ptr_t * vDdMans, Vec_Int_t * vSt ...@@ -81,7 +81,8 @@ Vec_Ptr_t * Llb_ImgSupports( Aig_Man_t * p, Vec_Ptr_t * vDdMans, Vec_Int_t * vSt
// print supports // print supports
assert( nSize == Aig_ManObjNumMax(p) ); assert( nSize == Aig_ManObjNumMax(p) );
if ( fVerbose ) if ( !fVerbose )
return vSupps;
Aig_ManForEachObj( p, pObj, i ) Aig_ManForEachObj( p, pObj, i )
{ {
int k, Counter = 0; int k, Counter = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment