diff options
-rw-r--r-- | src/aig/gia/giaSim4.c | 2 | ||||
-rw-r--r-- | src/base/acb/acbFunc.c | 4 | ||||
-rw-r--r-- | src/base/cmd/cmdApi.c | 2 | ||||
-rw-r--r-- | src/base/main/mainReal.c | 2 | ||||
-rw-r--r-- | src/base/wlc/wlcAbs.c | 2 | ||||
-rw-r--r-- | src/base/wlc/wlcNtk.c | 4 | ||||
-rw-r--r-- | src/base/wlc/wlcShow.c | 2 | ||||
-rw-r--r-- | src/bool/dec/dec.h | 2 | ||||
-rw-r--r-- | src/bool/deco/deco.h | 2 | ||||
-rw-r--r-- | src/bool/kit/kit.h | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/src/aig/gia/giaSim4.c b/src/aig/gia/giaSim4.c index 610bb098..6ce89cf0 100644 --- a/src/aig/gia/giaSim4.c +++ b/src/aig/gia/giaSim4.c @@ -41,7 +41,7 @@ ABC_NAMESPACE_IMPL_START SeeAlso [] ***********************************************************************/ -int Gia_Sim4Try( char * pFileName0, char * pFileName1, char * pFileName2, int nWords, int nBeam, int LevL, int LevU, int fOrder, int fFancy, int fVerbose ) +int Gia_Sim4Try( char * pFileName0, char * pFileName1, char * pFileName2, int nWords, int nBeam, int LevL, int LevU, int fOrder, int fFancy, int fUseBuf, int fVerbose ) { return 0; } diff --git a/src/base/acb/acbFunc.c b/src/base/acb/acbFunc.c index 3f5a27fb..8f72a00f 100644 --- a/src/base/acb/acbFunc.c +++ b/src/base/acb/acbFunc.c @@ -260,7 +260,7 @@ void * Acb_VerilogSimpleParse( Vec_Int_t * vBuffer, Abc_Nam_t * pNames ) Vec_IntPush( vTypes, -1 ); Vec_IntPush( vTypes, Vec_IntSize(vFanins) ); // create design - pDesign = Ndr_Create( Vec_IntEntry(vBuffer, 1) ); + pDesign = (Ndr_Data_t *)Ndr_Create( Vec_IntEntry(vBuffer, 1) ); ModuleID = Ndr_AddModule( pDesign, Vec_IntEntry(vBuffer, 1) ); // create inputs Ndr_DataResize( pDesign, Vec_IntSize(vInputs) ); @@ -2681,7 +2681,7 @@ int Acb_NtkEcoPerform( Acb_Ntk_t * pNtkF, Acb_Ntk_t * pNtkG, char * pFileName[4] // generate output files if ( pFileName[3] == NULL ) Acb_GenerateFilePatch( vPatch, "patch.v" ); - Acb_GenerateFileOut( vInst, pFileName[0], pFileName[3] ? pFileName[3] : "out.v", vPatch ); + Acb_GenerateFileOut( vInst, pFileName[0], pFileName[3] ? pFileName[3] : (char *)"out.v", vPatch ); printf( "Finished dumping resulting file \"%s\".\n\n", pFileName[3] ? pFileName[3] : "out.v" ); //Gia_AigerWrite( pGiaG, "test.aig", 0, 0, 0 ); cleanup: diff --git a/src/base/cmd/cmdApi.c b/src/base/cmd/cmdApi.c index 2ee10229..73ebcf89 100644 --- a/src/base/cmd/cmdApi.c +++ b/src/base/cmd/cmdApi.c @@ -125,7 +125,7 @@ int Cmd_CommandHandleSpecial( Abc_Frame_t * pAbc, const char * sCommand ) if ( strstr(sCommand, "#ASSERT") ) { int Status = 0; - char * pNumb = strrchr( sCommand, '=' ); + char * pNumb = strrchr( (char *)sCommand, '=' ); if ( strstr(sCommand, "_PI_") ) { piCount = pNumb ? atoi(pNumb+1) : 0; diff --git a/src/base/main/mainReal.c b/src/base/main/mainReal.c index 180ec447..2fb2d95b 100644 --- a/src/base/main/mainReal.c +++ b/src/base/main/mainReal.c @@ -145,7 +145,7 @@ int Abc_RealMain( int argc, char * argv[] ) } case 'l': { #ifndef WIN32 - int maxTime = atoi(globalUtilOptarg); + rlim_t maxTime = atoi(globalUtilOptarg); printf("Limiting time to %d seconds\n", maxTime); struct rlimit limit = { maxTime, /* soft limit */ diff --git a/src/base/wlc/wlcAbs.c b/src/base/wlc/wlcAbs.c index 2eb665bb..402ce21b 100644 --- a/src/base/wlc/wlcAbs.c +++ b/src/base/wlc/wlcAbs.c @@ -816,7 +816,7 @@ static Vec_Bit_t * Wlc_NtkMarkLimit( Wlc_Ntk_t * p, Wlc_Par_t * pPars ) Vec_Ptr_t * vMults = Vec_PtrAlloc( 1000 ); Vec_Ptr_t * vFlops = Vec_PtrAlloc( 1000 ); Wlc_Obj_t * pObj; int i; - Int_Pair_t * pPair; + Int_Pair_t * pPair = NULL; if ( pPars->nLimit == ABC_INFINITY ) return NULL; diff --git a/src/base/wlc/wlcNtk.c b/src/base/wlc/wlcNtk.c index 72ce86bf..47564d14 100644 --- a/src/base/wlc/wlcNtk.c +++ b/src/base/wlc/wlcNtk.c @@ -94,7 +94,7 @@ static char * Wlc_Names[WLC_OBJ_NUMBER+1] = { NULL // 58: unused }; -char * Wlc_ObjTypeName( Wlc_Obj_t * p ) { return p ? (p->Type < WLC_OBJ_NUMBER ? Wlc_Names[p->Type] : "out_of_bound") : "no_obj"; } +char * Wlc_ObjTypeName( Wlc_Obj_t * p ) { return p ? (p->Type < WLC_OBJ_NUMBER ? Wlc_Names[p->Type] : (char *)"out_of_bound") : (char *)"no_obj"; } //////////////////////////////////////////////////////////////////////// /// FUNCTION DEFINITIONS /// @@ -489,7 +489,7 @@ static inline void Wlc_NtkPrintDistribAddOne( Vec_Ptr_t * vTypes, Vec_Ptr_t * vO { Vec_Wrd_t * vType = (Vec_Wrd_t *)Vec_PtrEntry( vTypes, Type ); Vec_Wrd_t * vOccur = (Vec_Wrd_t *)Vec_PtrEntry( vOccurs, Type ); - word Entry; int i; + word Entry = 0; int i; Vec_WrdForEachEntry( vType, Entry, i ) if ( Entry == Sign ) { diff --git a/src/base/wlc/wlcShow.c b/src/base/wlc/wlcShow.c index f43f8baa..59f42db5 100644 --- a/src/base/wlc/wlcShow.c +++ b/src/base/wlc/wlcShow.c @@ -362,7 +362,7 @@ void Wlc_NtkShow( Wlc_Ntk_t * p, Vec_Int_t * vBold ) FILE * pFile; char FileNameDot[200]; char * pName = Extra_FileDesignName(p->pName); - char * pSpec = p->pSpec ? Extra_FileDesignName(p->pSpec) : "unknown"; + char * pSpec = p->pSpec ? Extra_FileDesignName(p->pSpec) : (char *)"unknown"; sprintf( FileNameDot, "%s_%s.dot", pName, pSpec ); ABC_FREE( pName ); if ( strcmp(pSpec, "unknown") ) diff --git a/src/bool/dec/dec.h b/src/bool/dec/dec.h index e02b96c4..50c287f4 100644 --- a/src/bool/dec/dec.h +++ b/src/bool/dec/dec.h @@ -133,7 +133,7 @@ extern unsigned Dec_GraphDeriveTruth( Dec_Graph_t * pGraph ); ***********************************************************************/ static inline Dec_Edge_t Dec_EdgeCreate( int Node, int fCompl ) { - Dec_Edge_t eEdge = { fCompl, Node }; + Dec_Edge_t eEdge = { (unsigned)fCompl, (unsigned)Node }; return eEdge; } diff --git a/src/bool/deco/deco.h b/src/bool/deco/deco.h index 33dbed87..2792e8d3 100644 --- a/src/bool/deco/deco.h +++ b/src/bool/deco/deco.h @@ -122,7 +122,7 @@ struct Dec_Man_t_ ***********************************************************************/ static inline Dec_Edge_t Dec_EdgeCreate( int Node, int fCompl ) { - Dec_Edge_t eEdge = { fCompl, Node }; + Dec_Edge_t eEdge = { (unsigned)fCompl, (unsigned)Node }; return eEdge; } diff --git a/src/bool/kit/kit.h b/src/bool/kit/kit.h index 9153a280..47f06403 100644 --- a/src/bool/kit/kit.h +++ b/src/bool/kit/kit.h @@ -194,7 +194,7 @@ static inline void Kit_SopShrink( Kit_Sop_t * cSop, int nCubesNew ) static inline void Kit_SopPushCube( Kit_Sop_t * cSop, unsigned uCube ) { cSop->pCubes[cSop->nCubes++] = uCube; } static inline void Kit_SopWriteCube( Kit_Sop_t * cSop, unsigned uCube, int i ) { cSop->pCubes[i] = uCube; } -static inline Kit_Edge_t Kit_EdgeCreate( int Node, int fCompl ) { Kit_Edge_t eEdge = { fCompl, Node }; return eEdge; } +static inline Kit_Edge_t Kit_EdgeCreate( int Node, int fCompl ) { Kit_Edge_t eEdge = { (unsigned)fCompl, (unsigned)Node }; return eEdge; } static inline unsigned Kit_EdgeToInt( Kit_Edge_t eEdge ) { return (eEdge.Node << 1) | eEdge.fCompl; } static inline Kit_Edge_t Kit_IntToEdge( unsigned Edge ) { return Kit_EdgeCreate( Edge >> 1, Edge & 1 ); } //static inline unsigned Kit_EdgeToInt_( Kit_Edge_t eEdge ) { return *(unsigned *)&eEdge; } |