diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2015-10-21 23:53:42 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2015-10-21 23:53:42 -0700 |
| commit | 2c37498bfb297c00e9b5eee8472acc134d9aba73 (patch) | |
| tree | 06d386b7965bae00ee474003841e35d5d7424072 /src | |
| parent | a07c08551db0f6d5bea8e8a442c1d2ac7dc62afd (diff) | |
| download | abc-2c37498bfb297c00e9b5eee8472acc134d9aba73.tar.gz abc-2c37498bfb297c00e9b5eee8472acc134d9aba73.tar.bz2 abc-2c37498bfb297c00e9b5eee8472acc134d9aba73.zip | |
Compiler warnings.
Diffstat (limited to 'src')
| -rw-r--r-- | src/base/cba/cba.h | 2 | ||||
| -rw-r--r-- | src/map/if/if.h | 4 | ||||
| -rw-r--r-- | src/misc/mvc/mvc.h | 2 | ||||
| -rw-r--r-- | src/proof/ssc/sscClass.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/base/cba/cba.h b/src/base/cba/cba.h index 8ae9a81c..a71830d6 100644 --- a/src/base/cba/cba.h +++ b/src/base/cba/cba.h @@ -369,7 +369,7 @@ static inline void Cba_ObjPatchFinFon( Cba_Ntk_t * p, int i, int k, in static inline int Cba_ObjNtkId( Cba_Ntk_t * p, int i ) { assert(i>0); return (Cba_ObjIsBoxUser(p, i) && Cba_NtkHasObjFuncs(p)) ? Cba_ObjFunc(p, i) : 0;} static inline Cba_Ntk_t * Cba_ObjNtk( Cba_Ntk_t * p, int i ) { assert(i>0); return Cba_NtkNtk(p, Cba_ObjNtkId(p, i)); } -static inline int Cba_ObjSetNtkId( Cba_Ntk_t * p, int i, int x ) { assert(i>0); assert(Cba_ObjIsBoxUser(p, i)); Cba_ObjSetFunc( p, i, x ); } +static inline void Cba_ObjSetNtkId( Cba_Ntk_t * p, int i, int x ) { assert(i>0); assert(Cba_ObjIsBoxUser(p, i)); Cba_ObjSetFunc( p, i, x ); } static inline int Cba_ObjIsSeq( Cba_Ntk_t * p, int i ) { assert(i>0); return Cba_ObjIsBoxUser(p, i) ? Cba_ObjNtk(p, i)->fSeq : Cba_TypeIsSeq(Cba_ObjType(p, i)); } static inline int Cba_FonIsReal( int f ) { return f > 0; } diff --git a/src/map/if/if.h b/src/map/if/if.h index 55f28fab..8a4e7395 100644 --- a/src/map/if/if.h +++ b/src/map/if/if.h @@ -421,9 +421,9 @@ static inline void If_CutSetDataInt( If_Cut_t * pCut, int Data ) { * static inline int If_CutTruthLit( If_Cut_t * pCut ) { assert( pCut->iCutFunc >= 0 ); return pCut->iCutFunc; } static inline int If_CutTruthIsCompl( If_Cut_t * pCut ) { assert( pCut->iCutFunc >= 0 ); return Abc_LitIsCompl(pCut->iCutFunc); } -static inline word * If_CutTruthWR( If_Man_t * p, If_Cut_t * pCut ) { return p->vTtMem ? Vec_MemReadEntry(p->vTtMem[pCut->nLeaves], Abc_Lit2Var(pCut->iCutFunc)) : NULL; } +static inline word * If_CutTruthWR( If_Man_t * p, If_Cut_t * pCut ) { return p->vTtMem[pCut->nLeaves] ? Vec_MemReadEntry(p->vTtMem[pCut->nLeaves], Abc_Lit2Var(pCut->iCutFunc)) : NULL; } static inline unsigned * If_CutTruthUR( If_Man_t * p, If_Cut_t * pCut) { return (unsigned *)If_CutTruthWR(p, pCut); } -static inline word * If_CutTruthW( If_Man_t * p, If_Cut_t * pCut ) { if ( p->vTtMem == NULL ) return NULL; assert( pCut->iCutFunc >= 0 ); Abc_TtCopy( p->puTempW, If_CutTruthWR(p, pCut), p->nTruth6Words[pCut->nLeaves], If_CutTruthIsCompl(pCut) ); return p->puTempW; } +static inline word * If_CutTruthW( If_Man_t * p, If_Cut_t * pCut ) { assert( pCut->iCutFunc >= 0 ); Abc_TtCopy( p->puTempW, If_CutTruthWR(p, pCut), p->nTruth6Words[pCut->nLeaves], If_CutTruthIsCompl(pCut) ); return p->puTempW; } static inline unsigned * If_CutTruth( If_Man_t * p, If_Cut_t * pCut ) { return (unsigned *)If_CutTruthW(p, pCut); } static inline int If_CutDsdLit( If_Man_t * p, If_Cut_t * pCut ) { return Abc_Lit2LitL( Vec_IntArray(p->vTtDsds[pCut->nLeaves]), If_CutTruthLit(pCut) ); } diff --git a/src/misc/mvc/mvc.h b/src/misc/mvc/mvc.h index 5b9a574f..c321259c 100644 --- a/src/misc/mvc/mvc.h +++ b/src/misc/mvc/mvc.h @@ -552,7 +552,7 @@ struct MvcManagerStruct // iterator through literals of the cube #define Mvc_CubeForEachBit( Cover, Cube, iBit, Value )\ for ( iBit = 0;\ - iBit < Cover->nBits && ((Value = Mvc_CubeBitValue(Cube,iBit))>=0);\ + iBit < Cover->nBits && ((Value = Mvc_CubeBitValue(Cube,iBit)), 1);\ iBit++ ) // iterator through values of binary variables #define Mvc_CubeForEachVarValue( Cover, Cube, iVar, Value )\ diff --git a/src/proof/ssc/sscClass.c b/src/proof/ssc/sscClass.c index c6b96a90..59540cc2 100644 --- a/src/proof/ssc/sscClass.c +++ b/src/proof/ssc/sscClass.c @@ -281,7 +281,7 @@ int Ssc_GiaClassesRefine( Gia_Man_t * p ) Vec_Int_t * vRefinedC; Gia_Obj_t * pObj; int i, Counter = 0; - if ( p->pReprs != NULL ); + assert( p->pReprs != NULL ); vRefinedC = Vec_IntAlloc( 100 ); Gia_ManForEachCand( p, pObj, i ) if ( Gia_ObjIsTail(p, i) ) |