Changes to VC6.0 makefile to accommodate new package 'opt/fret' and compiler warnings.

4 files changed, 38 insertions, 14 deletions

diff --git a/abclib.dsp b/abclib.dsp
index 93a71ea9..fd426e88 100644
--- a/abclib.dsp
+++ b/abclib.dsp
@@ -2550,6 +2550,30 @@ SOURCE=.\src\opt\sfm\sfmTime.c
 SOURCE=.\src\opt\sfm\sfmWin.c
 # End Source File
 # End Group
+# Begin Group "fret"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\opt\fret\fretFlow.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\opt\fret\fretime.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\opt\fret\fretInit.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\opt\fret\fretMain.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\opt\fret\fretTime.c
+# End Source File
+# End Group
 # End Group
 # Begin Group "map"
 
diff --git a/src/opt/fret/fretMain.c b/src/opt/fret/fretMain.c
index 847476aa..2dd2bc03 100644
--- a/src/opt/fret/fretMain.c
+++ b/src/opt/fret/fretMain.c
@@ -491,10 +491,10 @@ Abc_FlowRetime_PushFlows( Abc_Ntk_t * pNtk, int fVerbose ) {
     srcDist = MAX_DIST;
     Abc_NtkForEachLatch( pNtk, pObj, i )
       if (FDATA(pObj)->e_dist)    
-        srcDist = MIN(srcDist, FDATA(pObj)->e_dist);
+        srcDist = MIN(srcDist, (int)FDATA(pObj)->e_dist);
     
     Abc_NtkForEachLatch( pNtk, pObj, i ) {
-      if (srcDist == FDATA(pObj)->e_dist &&
+      if (srcDist == (int)FDATA(pObj)->e_dist &&
           dfsfast_e( pObj, NULL )) {
 #ifdef DEBUG_PRINT_FLOWS
         printf("\n\n");
diff --git a/src/opt/fret/fretTime.c b/src/opt/fret/fretTime.c
index b423ace8..0614ab6e 100644
--- a/src/opt/fret/fretTime.c
+++ b/src/opt/fret/fretTime.c
@@ -191,7 +191,7 @@ void Abc_FlowRetime_ConstrainConserv_forw( Abc_Ntk_t * pNtk ) {
     }
     pObj->Level += Abc_ObjIsNode(pObj) ? 1 : 0;
 
-    if (pObj->Level > pManMR->maxDelay) {
+    if ((int)pObj->Level > pManMR->maxDelay) {
       FSET(pObj, BLOCK);
     }
   }
@@ -242,7 +242,7 @@ void Abc_FlowRetime_ConstrainConserv_forw( Abc_Ntk_t * pNtk ) {
     pObj->Level += Abc_ObjIsNode(pObj) ? 1 : 0;
 
     // constrained?
-    if (pObj->Level > pManMR->maxDelay) {
+    if ((int)pObj->Level > pManMR->maxDelay) {
       FSET( pObj, CONSERVATIVE );
       pManMR->nConservConstraints++;
     } else
@@ -276,7 +276,7 @@ void Abc_FlowRetime_ConstrainConserv_back( Abc_Ntk_t * pNtk ) {
     {
       l = pNext->Level + (Abc_ObjIsNode(pObj) ? 1 : 0);
       if ( Abc_NodeIsTravIdCurrent(pNext) &&
-           pObj->Level < l )
+           (int)pObj->Level < l )
         pObj->Level = l;
     }
 
@@ -325,11 +325,11 @@ void Abc_FlowRetime_ConstrainConserv_back( Abc_Ntk_t * pNtk ) {
     {
       l = pNext->Level + (Abc_ObjIsNode(pObj) ? 1 : 0);
       if ( Abc_NodeIsTravIdCurrent(pNext) &&
-           pObj->Level < l )
+           (int)pObj->Level < l )
         pObj->Level = l;
     }
 
-    if (pObj->Level + (Abc_ObjIsNode(pObj)?1:0) > pManMR->maxDelay) {
+    if ((int)pObj->Level + (Abc_ObjIsNode(pObj)?1:0) > pManMR->maxDelay) {
       FSET(pObj, BLOCK);
     }
   }
@@ -347,7 +347,7 @@ void Abc_FlowRetime_ConstrainConserv_back( Abc_Ntk_t * pNtk ) {
     Abc_ObjForEachFanout( pObj, pNext, j ) {
       l = pNext->Level + (Abc_ObjIsNode(pObj) ? 1 : 0);
       if ( Abc_NodeIsTravIdCurrent(pNext) &&
-           pObj->Level < l )
+           (int)pObj->Level < l )
         pObj->Level = l;
     }
 
@@ -377,12 +377,12 @@ void Abc_FlowRetime_ConstrainConserv_back( Abc_Ntk_t * pNtk ) {
     Abc_ObjForEachFanout( pObj, pNext, j ) {
       l = pNext->Level + (Abc_ObjIsNode(pObj) ? 1 : 0);
       if ( Abc_NodeIsTravIdCurrent(pNext) &&
-           pObj->Level < l )
+           (int)pObj->Level < l )
         pObj->Level = l;
     }
 
     // constrained?
-    if (pObj->Level > pManMR->maxDelay) {
+    if ((int)pObj->Level > pManMR->maxDelay) {
       FSET( pObj, CONSERVATIVE );
       pManMR->nConservConstraints++;
     } else
@@ -482,7 +482,7 @@ void Abc_FlowRetime_ConstrainExact_forw( Abc_Obj_t * pObj ) {
         if (!Abc_ObjIsLatch(pNext))
           pNext->Level = MAX( pNext->Level, pReg->Level + (Abc_ObjIsNode(pReg)?1:0));
 
-      if (pReg->Level == pManMR->maxDelay) {
+      if ((int)pReg->Level == pManMR->maxDelay) {
         Vec_PtrPush( FTIMEEDGES(pObj), pReg);
         pManMR->nExactConstraints++;
       }
@@ -557,7 +557,7 @@ void Abc_FlowRetime_ConstrainExact_back( Abc_Obj_t * pObj ) {
         if (!Abc_ObjIsLatch(pNext))
           pNext->Level = MAX( pNext->Level, pReg->Level + (Abc_ObjIsNode(pReg)?1:0));
 
-      if (pReg->Level == pManMR->maxDelay) {
+      if ((int)pReg->Level == pManMR->maxDelay) {
         Vec_PtrPush( FTIMEEDGES(pObj), pReg);
         pManMR->nExactConstraints++;
       }
diff --git a/src/opt/sfm/sfmDec.c b/src/opt/sfm/sfmDec.c
index 2d388bb8..f24a7881 100644
--- a/src/opt/sfm/sfmDec.c
+++ b/src/opt/sfm/sfmDec.c
@@ -1201,7 +1201,7 @@ int Sfm_DecPeformDec2( Sfm_Dec_t * p, Abc_Obj_t * pObj )
     int nSupp[SFM_DEC_MAX], pAssump[SFM_WIN_MAX];
     int fVeryVerbose = p->pPars->fPrintDecs || p->pPars->fVeryVerbose;
     int nDecs = Abc_MaxInt(p->pPars->nDecMax, 1);
-    int fNeedInv, AreaGainInv = Sfm_DecComputeFlipInvGain(p, pObj, &fNeedInv);
+    //int fNeedInv, AreaGainInv = Sfm_DecComputeFlipInvGain(p, pObj, &fNeedInv);
     int i, RetValue, Prev = 0, iBest = -1, AreaThis, AreaNew;//, AreaNewInv;
     int GainThis, GainBest = -1, iLibObj, iLibObjBest = -1; 
     assert( p->pPars->fArea == 1 );
@@ -1895,7 +1895,7 @@ Abc_Obj_t * Abc_NtkAreaOptOne( Sfm_Dec_t * p, int i )
     Abc_Ntk_t * pNtk = p->pNtk;
     Sfm_Par_t * pPars = p->pPars;
     Abc_Obj_t * pObj = Abc_NtkObj( p->pNtk, i ); 
-    int Limit, RetValue, nStop = Abc_NtkObjNumMax(pNtk);
+    int Limit, RetValue;
     if ( pPars->nMffcMin > 1 && Abc_NodeMffcLabel(pObj) < pPars->nMffcMin )
         return NULL;
     if ( pPars->iNodeOne && i != pPars->iNodeOne )