Commit 3f2899d6 by Alan Mishchenko

Compiler warnings.

parent 8eb5d189
...@@ -196,7 +196,7 @@ int Abc_RealMain( int argc, char * argv[] ) ...@@ -196,7 +196,7 @@ int Abc_RealMain( int argc, char * argv[] )
case 't': case 't':
if ( TypeCheck( pAbc, globalUtilOptarg ) ) if ( TypeCheck( pAbc, globalUtilOptarg ) )
{ {
if ( !strcmp(globalUtilOptarg, "none") == 0 ) if ( (!strcmp(globalUtilOptarg, "none")) == 0 )
{ {
fInitRead = 1; fInitRead = 1;
sprintf( sReadCmd, "read_%s", globalUtilOptarg ); sprintf( sReadCmd, "read_%s", globalUtilOptarg );
...@@ -211,7 +211,7 @@ int Abc_RealMain( int argc, char * argv[] ) ...@@ -211,7 +211,7 @@ int Abc_RealMain( int argc, char * argv[] )
case 'T': case 'T':
if ( TypeCheck( pAbc, globalUtilOptarg ) ) if ( TypeCheck( pAbc, globalUtilOptarg ) )
{ {
if (!strcmp(globalUtilOptarg, "none") == 0) if ( (!strcmp(globalUtilOptarg, "none")) == 0)
{ {
fFinalWrite = 1; fFinalWrite = 1;
sprintf( sWriteCmd, "write_%s", globalUtilOptarg); sprintf( sWriteCmd, "write_%s", globalUtilOptarg);
......
...@@ -509,7 +509,7 @@ char * Scl_LibertyFileContents( char * pFileName, int nContents ) ...@@ -509,7 +509,7 @@ char * Scl_LibertyFileContents( char * pFileName, int nContents )
{ {
FILE * pFile = fopen( pFileName, "rb" ); FILE * pFile = fopen( pFileName, "rb" );
char * pContents = ABC_ALLOC( char, nContents+1 ); char * pContents = ABC_ALLOC( char, nContents+1 );
int RetValue; int RetValue = 0;
RetValue = fread( pContents, nContents, 1, pFile ); RetValue = fread( pContents, nContents, 1, pFile );
fclose( pFile ); fclose( pFile );
pContents[nContents] = 0; pContents[nContents] = 0;
...@@ -518,7 +518,7 @@ char * Scl_LibertyFileContents( char * pFileName, int nContents ) ...@@ -518,7 +518,7 @@ char * Scl_LibertyFileContents( char * pFileName, int nContents )
void Scl_LibertyStringDump( char * pFileName, Vec_Str_t * vStr ) void Scl_LibertyStringDump( char * pFileName, Vec_Str_t * vStr )
{ {
FILE * pFile = fopen( pFileName, "wb" ); FILE * pFile = fopen( pFileName, "wb" );
int RetValue; int RetValue = 0;
if ( pFile == NULL ) if ( pFile == NULL )
{ {
printf( "Scl_LibertyStringDump(): The output file is unavailable.\n" ); printf( "Scl_LibertyStringDump(): The output file is unavailable.\n" );
...@@ -583,7 +583,7 @@ Scl_Tree_t * Scl_LibertyParse( char * pFileName, int fVerbose ) ...@@ -583,7 +583,7 @@ Scl_Tree_t * Scl_LibertyParse( char * pFileName, int fVerbose )
return NULL; return NULL;
pPos = p->pContents; pPos = p->pContents;
Scl_LibertyWipeOutComments( p->pContents, p->pContents+p->nContents ); Scl_LibertyWipeOutComments( p->pContents, p->pContents+p->nContents );
if ( !Scl_LibertyBuildItem( p, &pPos, p->pContents + p->nContents ) == 0 ) if ( (!Scl_LibertyBuildItem( p, &pPos, p->pContents + p->nContents )) == 0 )
{ {
if ( p->pError ) printf( "%s", p->pError ); if ( p->pError ) printf( "%s", p->pError );
printf( "Parsing failed. " ); printf( "Parsing failed. " );
......
...@@ -2612,7 +2612,7 @@ static inline int Abc_TtProcessBiDec( word * pTruth, int nVars, int nSuppLim ) ...@@ -2612,7 +2612,7 @@ static inline int Abc_TtProcessBiDec( word * pTruth, int nVars, int nSuppLim )
static inline void Abc_TtProcessBiDecTest( word * pTruth, int nVars, int nSuppLim ) static inline void Abc_TtProcessBiDecTest( word * pTruth, int nVars, int nSuppLim )
{ {
word This, That, pTemp[64]; word This, That, pTemp[64];
int Res, resThis, resThat, nThis, nThat; int Res, resThis, resThat;//, nThis, nThat;
int nWords = Abc_TtWordNum(nVars); int nWords = Abc_TtWordNum(nVars);
Abc_TtCopy( pTemp, pTruth, nWords, 0 ); Abc_TtCopy( pTemp, pTruth, nWords, 0 );
Res = Abc_TtProcessBiDec( pTemp, nVars, nSuppLim ); Res = Abc_TtProcessBiDec( pTemp, nVars, nSuppLim );
...@@ -2634,8 +2634,8 @@ static inline void Abc_TtProcessBiDecTest( word * pTruth, int nVars, int nSuppLi ...@@ -2634,8 +2634,8 @@ static inline void Abc_TtProcessBiDecTest( word * pTruth, int nVars, int nSuppLi
// Dau_DsdPrintFromTruth( pTemp, nVars ); // Dau_DsdPrintFromTruth( pTemp, nVars );
nThis = Abc_TtBitCount16(resThis); //nThis = Abc_TtBitCount16(resThis);
nThat = Abc_TtBitCount16(resThat); //nThat = Abc_TtBitCount16(resThat);
printf( "Variable sets: " ); printf( "Variable sets: " );
Abc_TtPrintVarSet( resThis, nVars ); Abc_TtPrintVarSet( resThis, nVars );
......
...@@ -65,7 +65,7 @@ struct Vec_Ptr_t_ ...@@ -65,7 +65,7 @@ struct Vec_Ptr_t_
#define Vec_PtrForEachEntryTwo( Type1, vVec1, Type2, vVec2, pEntry1, pEntry2, i ) \ #define Vec_PtrForEachEntryTwo( Type1, vVec1, Type2, vVec2, pEntry1, pEntry2, i ) \
for ( i = 0; (i < Vec_PtrSize(vVec1)) && (((pEntry1) = (Type1)Vec_PtrEntry(vVec1, i)), 1) && (((pEntry2) = (Type2)Vec_PtrEntry(vVec2, i)), 1); i++ ) for ( i = 0; (i < Vec_PtrSize(vVec1)) && (((pEntry1) = (Type1)Vec_PtrEntry(vVec1, i)), 1) && (((pEntry2) = (Type2)Vec_PtrEntry(vVec2, i)), 1); i++ )
#define Vec_PtrForEachEntryDouble( Type1, Type2, vVec, Entry1, Entry2, i ) \ #define Vec_PtrForEachEntryDouble( Type1, Type2, vVec, Entry1, Entry2, i ) \
for ( i = 0; (i+1 < Vec_IntSize(vVec)) && (((Entry1) = (Type1)Vec_PtrEntry(vVec, i)), 1) && (((Entry2) = (Type2)Vec_PtrEntry(vVec, i+1)), 1); i += 2 ) for ( i = 0; (i+1 < Vec_PtrSize(vVec)) && (((Entry1) = (Type1)Vec_PtrEntry(vVec, i)), 1) && (((Entry2) = (Type2)Vec_PtrEntry(vVec, i+1)), 1); i += 2 )
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
/// FUNCTION DEFINITIONS /// /// FUNCTION DEFINITIONS ///
......
...@@ -96,12 +96,12 @@ void Lpk_IfManStart( Lpk_Man_t * p ) ...@@ -96,12 +96,12 @@ void Lpk_IfManStart( Lpk_Man_t * p )
int Lpk_NodeHasChanged( Lpk_Man_t * p, int iNode ) int Lpk_NodeHasChanged( Lpk_Man_t * p, int iNode )
{ {
Vec_Ptr_t * vNodes; Vec_Ptr_t * vNodes;
Abc_Obj_t * pTemp; Abc_Obj_t * pTemp, * pTemp2;
int i; int i;
vNodes = Vec_VecEntry( p->vVisited, iNode ); vNodes = Vec_VecEntry( p->vVisited, iNode );
if ( Vec_PtrSize(vNodes) == 0 ) if ( Vec_PtrSize(vNodes) == 0 )
return 1; return 1;
Vec_PtrForEachEntry( Abc_Obj_t *, vNodes, pTemp, i ) Vec_PtrForEachEntryDouble( Abc_Obj_t *, Abc_Obj_t *, vNodes, pTemp, pTemp2, i )
{ {
// check if the node has changed // check if the node has changed
pTemp = Abc_NtkObj( p->pNtk, (int)(ABC_PTRUINT_T)pTemp ); pTemp = Abc_NtkObj( p->pNtk, (int)(ABC_PTRUINT_T)pTemp );
...@@ -110,7 +110,7 @@ int Lpk_NodeHasChanged( Lpk_Man_t * p, int iNode ) ...@@ -110,7 +110,7 @@ int Lpk_NodeHasChanged( Lpk_Man_t * p, int iNode )
// check if the number of fanouts has changed // check if the number of fanouts has changed
// if ( Abc_ObjFanoutNum(pTemp) != (int)Vec_PtrEntry(vNodes, i+1) ) // if ( Abc_ObjFanoutNum(pTemp) != (int)Vec_PtrEntry(vNodes, i+1) )
// return 1; // return 1;
i++; // i++;
} }
return 0; return 0;
} }
......
...@@ -234,7 +234,7 @@ void Lpk_NodeRecordImpact( Lpk_Man_t * p ) ...@@ -234,7 +234,7 @@ void Lpk_NodeRecordImpact( Lpk_Man_t * p )
{ {
Lpk_Cut_t * pCut; Lpk_Cut_t * pCut;
Vec_Ptr_t * vNodes = Vec_VecEntry( p->vVisited, p->pObj->Id ); Vec_Ptr_t * vNodes = Vec_VecEntry( p->vVisited, p->pObj->Id );
Abc_Obj_t * pNode; Abc_Obj_t * pNode, * pNode2;
int i, k; int i, k;
// collect the nodes that impact the given node // collect the nodes that impact the given node
Vec_PtrClear( vNodes ); Vec_PtrClear( vNodes );
...@@ -252,11 +252,11 @@ void Lpk_NodeRecordImpact( Lpk_Man_t * p ) ...@@ -252,11 +252,11 @@ void Lpk_NodeRecordImpact( Lpk_Man_t * p )
} }
} }
// clear the marks // clear the marks
Vec_PtrForEachEntry( Abc_Obj_t *, vNodes, pNode, i ) Vec_PtrForEachEntryDouble( Abc_Obj_t *, Abc_Obj_t *, vNodes, pNode, pNode2, i )
{ {
pNode = Abc_NtkObj( p->pNtk, (int)(ABC_PTRUINT_T)pNode ); pNode = Abc_NtkObj( p->pNtk, (int)(ABC_PTRUINT_T)pNode );
pNode->fMarkC = 0; pNode->fMarkC = 0;
i++; // i++;
} }
//printf( "%d ", Vec_PtrSize(vNodes) ); //printf( "%d ", Vec_PtrSize(vNodes) );
} }
......
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