diff options
Diffstat (limited to 'src/aig/gia')
-rw-r--r-- | src/aig/gia/giaAbsVta.c | 11 | ||||
-rw-r--r-- | src/aig/gia/giaAig.c | 2 | ||||
-rw-r--r-- | src/aig/gia/giaAiger.c | 6 | ||||
-rw-r--r-- | src/aig/gia/giaBidec.c | 2 | ||||
-rw-r--r-- | src/aig/gia/giaCCof.c | 2 | ||||
-rw-r--r-- | src/aig/gia/giaCTas.c | 4 | ||||
-rw-r--r-- | src/aig/gia/giaDup.c | 4 | ||||
-rw-r--r-- | src/aig/gia/giaEquiv.c | 2 | ||||
-rw-r--r-- | src/aig/gia/giaForce.c | 4 | ||||
-rw-r--r-- | src/aig/gia/giaFront.c | 2 | ||||
-rw-r--r-- | src/aig/gia/giaGlitch.c | 2 | ||||
-rw-r--r-- | src/aig/gia/giaIf.c | 2 | ||||
-rw-r--r-- | src/aig/gia/giaIso.c | 2 | ||||
-rw-r--r-- | src/aig/gia/giaMan.c | 2 | ||||
-rw-r--r-- | src/aig/gia/giaShrink.c | 2 |
15 files changed, 22 insertions, 27 deletions
diff --git a/src/aig/gia/giaAbsVta.c b/src/aig/gia/giaAbsVta.c index 287fd208..87eb5e6c 100644 --- a/src/aig/gia/giaAbsVta.c +++ b/src/aig/gia/giaAbsVta.c @@ -175,7 +175,7 @@ Vec_Ptr_t * Gia_VtaAbsToFrames( Vec_Int_t * vAbs ) { Vec_Ptr_t * vFrames; Vec_Int_t * vFrame; - int i, k, Entry, iStart, iStop; + int i, k, Entry, iStart, iStop = -1; int nFrames = Vec_IntEntry( vAbs, 0 ); assert( Vec_IntEntry(vAbs, nFrames+1) == Vec_IntSize(vAbs) ); vFrames = Vec_PtrAlloc( nFrames ); @@ -614,9 +614,6 @@ void Vta_ManSatVerify( Vta_Man_t * p ) Vta_ObjPreds( p, pThis, pObj, &pThis0, &pThis1 ); if ( Gia_ObjIsAnd(pObj) ) { - int iVar = Vta_ObjId(p, pThis); - int iVar0 = Vta_ObjId(p, pThis0); - int iVar1 = Vta_ObjId(p, pThis1); if ( pThis->Value == VTA_VAR1 ) assert( Vta_ValIs1(pThis0, Gia_ObjFaninC0(pObj)) && Vta_ValIs1(pThis1, Gia_ObjFaninC1(pObj)) ); else if ( pThis->Value == VTA_VAR0 ) @@ -625,8 +622,6 @@ void Vta_ManSatVerify( Vta_Man_t * p ) } else if ( Gia_ObjIsRo(p->pGia, pObj) ) { - int VarA = Vta_ObjId(p,pThis); - int VarB = !pThis0 ? 0 : Vta_ObjId(p,pThis0); pObj = Gia_ObjRoToRi( p->pGia, pObj ); if ( pThis->iFrame == 0 ) assert( pThis->Value == VTA_VAR0 ); @@ -966,7 +961,7 @@ Abc_Cex_t * Vta_ManRefineAbstraction( Vta_Man_t * p, int f ) pCex = Vga_ManDeriveCex( p ); else { - int nObjOld = p->nObjs; +// int nObjOld = p->nObjs; Vta_ManForEachObjObjVec( vTermsToAdd, p, pThis, pObj, i ) if ( !Gia_ObjIsPi(p->pGia, pObj) ) Vga_ManAddClausesOne( p, pThis->iObj, pThis->iFrame ); @@ -1153,7 +1148,7 @@ Vec_Int_t * Vta_ManUnsatCore( int iLit, Vec_Int_t * vCla2Var, sat_solver2 * pSat void Vta_ManAbsPrintFrame( Vta_Man_t * p, Vec_Int_t * vCore, int nFrames, int nConfls, int nCexes, int Time ) { unsigned * pInfo; - int * pCountAll, * pCountUni; + int * pCountAll = NULL, * pCountUni = NULL; int i, k, iFrame, iObj, Entry; // print info about frames if ( vCore ) diff --git a/src/aig/gia/giaAig.c b/src/aig/gia/giaAig.c index 6da633e0..3c415707 100644 --- a/src/aig/gia/giaAig.c +++ b/src/aig/gia/giaAig.c @@ -570,7 +570,7 @@ int Gia_ManSolveSat( Gia_Man_t * p ) { // extern int Fra_FraigSat( Aig_Man_t * pMan, ABC_INT64_T nConfLimit, ABC_INT64_T nInsLimit, int fFlipBits, int fAndOuts, int fNewSolver, int fVerbose ); Aig_Man_t * pNew; - int RetValue, clk = clock(); + int RetValue;//, clk = clock(); pNew = Gia_ManToAig( p, 0 ); RetValue = Fra_FraigSat( pNew, 10000000, 0, 1, 1, 0, 0 ); if ( RetValue == 0 ) diff --git a/src/aig/gia/giaAiger.c b/src/aig/gia/giaAiger.c index abf378cb..5f1bb25d 100644 --- a/src/aig/gia/giaAiger.c +++ b/src/aig/gia/giaAiger.c @@ -1450,13 +1450,13 @@ void Gia_WriteAiger( Gia_Man_t * pInit, char * pFileName, int fWriteSymbols, int assert( Vec_PtrSize(p->vNamesOut) == Gia_ManCoNum(p) ); // write PIs Gia_ManForEachPi( p, pObj, i ) - fprintf( pFile, "i%d %s\n", i, Vec_PtrEntry(p->vNamesIn, i) ); + fprintf( pFile, "i%d %s\n", i, (char *)Vec_PtrEntry(p->vNamesIn, i) ); // write latches Gia_ManForEachRo( p, pObj, i ) - fprintf( pFile, "l%d %s\n", i, Vec_PtrEntry(p->vNamesIn, Gia_ManPiNum(p) + i) ); + fprintf( pFile, "l%d %s\n", i, (char *)Vec_PtrEntry(p->vNamesIn, Gia_ManPiNum(p) + i) ); // write POs Gia_ManForEachPo( p, pObj, i ) - fprintf( pFile, "o%d %s\n", i, Vec_PtrEntry(p->vNamesOut, i) ); + fprintf( pFile, "o%d %s\n", i, (char *)Vec_PtrEntry(p->vNamesOut, i) ); } // write the comment diff --git a/src/aig/gia/giaBidec.c b/src/aig/gia/giaBidec.c index 54f98afd..ae938798 100644 --- a/src/aig/gia/giaBidec.c +++ b/src/aig/gia/giaBidec.c @@ -241,7 +241,7 @@ Gia_Man_t * Gia_ManPerformBidec( Gia_Man_t * p, int fVerbose ) Vec_Int_t * vLeaves, * vTruth, * vVisited; Gia_Man_t * pNew, * pTemp; Gia_Obj_t * pObj; - int i, clk = clock(); + int i;//, clk = clock(); pPars->nVarsMax = Gia_ManLutSizeMax( p ); pPars->fVerbose = fVerbose; if ( pPars->nVarsMax < 2 ) diff --git a/src/aig/gia/giaCCof.c b/src/aig/gia/giaCCof.c index b04d5953..6fbd1095 100644 --- a/src/aig/gia/giaCCof.c +++ b/src/aig/gia/giaCCof.c @@ -267,7 +267,7 @@ Gia_Man_t * Gia_ManCofTest( Gia_Man_t * pGia, int nFrameMax, int nConfMax, int n Gia_Man_t * pNew; Ccf_Man_t * p; Gia_Obj_t * pObj; - int f, i, Lit, RetValue, fFailed = 0; + int f, i, Lit, RetValue = -1, fFailed = 0; int nTimeToStop = time(NULL) + nTimeMax; int clk = clock(); assert( Gia_ManPoNum(pGia) == 1 ); diff --git a/src/aig/gia/giaCTas.c b/src/aig/gia/giaCTas.c index 7cfdac74..8cfa9efc 100644 --- a/src/aig/gia/giaCTas.c +++ b/src/aig/gia/giaCTas.c @@ -1245,7 +1245,7 @@ int Tas_ManPropagate( Tas_Man_t * p, int Level ) { int hClause; Gia_Obj_t * pVar; - int i, k, nIter = 0; + int i, k;//, nIter = 0; while ( 1 ) { // nIter++; @@ -1285,7 +1285,7 @@ int Tas_ManPropagate( Tas_Man_t * p, int Level ) int Tas_ManSolve_rec( Tas_Man_t * p, int Level ) { Tas_Que_t * pQue = &(p->pClauses); - Gia_Obj_t * pVar, * pDecVar; + Gia_Obj_t * pVar, * pDecVar = NULL; int hClause, hLearn0, hLearn1; int iPropHead, iJustHead, iJustTail; // propagate assignments diff --git a/src/aig/gia/giaDup.c b/src/aig/gia/giaDup.c index 69ae161f..342332cd 100644 --- a/src/aig/gia/giaDup.c +++ b/src/aig/gia/giaDup.c @@ -983,7 +983,7 @@ void Gia_ManPrintRepr( Gia_Man_t * p ) int i; Gia_ManForEachObj( p, pObj, i ) if ( ~p->pReprsOld[i] ) - printf( "%d->%d ", i, p->pReprs[i] ); + printf( "%d->%d ", i, p->pReprs[i].iRepr ); printf( "\n" ); } @@ -1620,7 +1620,7 @@ Gia_Man_t * Gia_ManDupAbsGates( Gia_Man_t * p, Vec_Int_t * vGateClasses ) Vec_Int_t * vAssigned, * vPis, * vPPis, * vFlops, * vNodes; Gia_Man_t * pNew, * pTemp; Gia_Obj_t * pObj, * pCopy; - int i, nFlops = 0; + int i;//, nFlops = 0; assert( Gia_ManPoNum(p) == 1 ); assert( Vec_IntSize(vGateClasses) == Gia_ManObjNum(p) ); diff --git a/src/aig/gia/giaEquiv.c b/src/aig/gia/giaEquiv.c index 43724871..e244ef46 100644 --- a/src/aig/gia/giaEquiv.c +++ b/src/aig/gia/giaEquiv.c @@ -1913,7 +1913,7 @@ int Gia_ManFilterEquivsUsingParts( Gia_Man_t * pGia, char * pName1, char * pName { Vec_Int_t * vNodes; Gia_Man_t * pGia1, * pGia2, * pMiter; - Gia_Obj_t * pObj1, * pObj2, * pObjM, * pObj; + Gia_Obj_t * pObj1, * pObj2, * pObjM, * pObj = NULL; int i, k, iObj, iNext, iPrev, iRepr; int iLitsOld, iLitsNew; if ( pGia->pReprs == NULL || pGia->pNexts == NULL ) diff --git a/src/aig/gia/giaForce.c b/src/aig/gia/giaForce.c index e7abb555..94ad069b 100644 --- a/src/aig/gia/giaForce.c +++ b/src/aig/gia/giaForce.c @@ -714,7 +714,7 @@ Vec_Int_t * Frc_ManCollectCos( Frc_Man_t * p ) void Frc_ManCrossCutTest( Frc_Man_t * p, Vec_Int_t * vOrderInit ) { Vec_Int_t * vOrder; - int clk = clock(); +// int clk = clock(); vOrder = vOrderInit? vOrderInit : Frc_ManCollectCos( p ); printf( "CrossCut = %6d\n", Frc_ManCrossCut( p, vOrder, 0 ) ); printf( "CrossCut = %6d\n", Frc_ManCrossCut( p, vOrder, 1 ) ); @@ -1072,7 +1072,7 @@ void For_ManFileExperiment() int RetValue; Size = (1 << Exp); - printf( "2^%d machine words (%d bytes).\n", Exp, sizeof(int) * Size ); + printf( "2^%d machine words (%d bytes).\n", Exp, (int)sizeof(int) * Size ); pBuffer = ABC_ALLOC( int, Size ); for ( i = 0; i < Size; i++ ) diff --git a/src/aig/gia/giaFront.c b/src/aig/gia/giaFront.c index 903a66e7..1d543a81 100644 --- a/src/aig/gia/giaFront.c +++ b/src/aig/gia/giaFront.c @@ -110,7 +110,7 @@ Gia_Man_t * Gia_ManFront( Gia_Man_t * p ) char * pFront; // places used for the frontier int i, iLit, nCrossCut = 0, nCrossCutMax = 0; int nCrossCutMaxInit = Gia_ManCrossCut( p ); - int iFront = 0, clk = clock(); + int iFront = 0;//, clk = clock(); // set references for all objects Gia_ManSetRefs( p ); // start the new manager diff --git a/src/aig/gia/giaGlitch.c b/src/aig/gia/giaGlitch.c index 35d076e5..0dfee293 100644 --- a/src/aig/gia/giaGlitch.c +++ b/src/aig/gia/giaGlitch.c @@ -506,7 +506,7 @@ void Gli_ManSwitching( Gli_Man_t * p ) ***********************************************************************/ void Gli_ManGlitching( Gli_Man_t * p ) { - Gli_Obj_t * pThis, * pFanout, * pOther = Gli_ManObj(p, 41); + Gli_Obj_t * pThis, * pFanout;//, * pOther = Gli_ManObj(p, 41); int i, k, Handle; // Gli_ManForEachObj( p, pThis, i ) // assert( pThis->fMark == 0 ); diff --git a/src/aig/gia/giaIf.c b/src/aig/gia/giaIf.c index e03439d0..2d8799da 100644 --- a/src/aig/gia/giaIf.c +++ b/src/aig/gia/giaIf.c @@ -98,7 +98,7 @@ If_Man_t * Gia_ManToIf( Gia_Man_t * p, If_Par_t * pPars, Vec_Ptr_t * vAigToIf ) If_Man_t * pIfMan; If_Obj_t * pIfObj; Gia_Obj_t * pNode; - int i, clk = clock(); + int i;//, clk = clock(); Gia_ManLevelNum( p ); // assert( p->pReprs == NULL ); /* diff --git a/src/aig/gia/giaIso.c b/src/aig/gia/giaIso.c index c0feb735..8359146c 100644 --- a/src/aig/gia/giaIso.c +++ b/src/aig/gia/giaIso.c @@ -986,7 +986,7 @@ void Gia_IsoTest( Gia_Man_t * pGia ) ***********************************************************************/ Gia_Man_t * Gia_IsoFilterPos( Gia_Man_t * pGia, int fVerbose ) { - int fVeryVerbose = 0; +// int fVeryVerbose = 0; Gia_IsoMan_t * p; Gia_Man_t * pTemp; Vec_Ptr_t * vBuffers, * vClasses; diff --git a/src/aig/gia/giaMan.c b/src/aig/gia/giaMan.c index c5ded61b..80fcf896 100644 --- a/src/aig/gia/giaMan.c +++ b/src/aig/gia/giaMan.c @@ -260,7 +260,7 @@ void Gia_ManPrintObjClasses( Gia_Man_t * p ) { Vec_Int_t * vSeens; // objects seen so far Vec_Int_t * vAbs = p->vObjClasses; - int i, k, Entry, iStart, iStop, nFrames; + int i, k, Entry, iStart, iStop = -1, nFrames; int nObjBits, nObjMask, iObj, iFrame, nWords; unsigned * pInfo; int * pCountAll, * pCountUni; diff --git a/src/aig/gia/giaShrink.c b/src/aig/gia/giaShrink.c index 07119daf..ad03f1e4 100644 --- a/src/aig/gia/giaShrink.c +++ b/src/aig/gia/giaShrink.c @@ -53,7 +53,7 @@ Gia_Man_t * Gia_ManPerformMapShrink( Gia_Man_t * p, int fKeepLevel, int fVerbose Gia_Obj_t * pObj, * pFanin; unsigned * pTruth; int i, k, iFan, clk = clock(); - int ClassCounts[222] = {0}; +// int ClassCounts[222] = {0}; int * pLutClass, Counter = 0; assert( p->pMapping != NULL ); if ( Gia_ManLutSizeMax( p ) > 4 ) |