Version abc90408

6 files changed, 11 insertions, 11 deletions

diff --git a/src/aig/ssw/sswClass.c b/src/aig/ssw/sswClass.c
index 967d29e9..8fce7904 100644
--- a/src/aig/ssw/sswClass.c
+++ b/src/aig/ssw/sswClass.c
@@ -597,7 +597,7 @@ Ssw_Cla_t * Ssw_ClassesPrepare( Aig_Man_t * pAig, int nFramesK, int fLatchCorr,
 //    int nWords  =  4;
 //    int nIters  =  0;
 
-    int nFrames =  AIG_MAX( nFramesK, 4 );
+    int nFrames =  ABC_MAX( nFramesK, 4 );
     int nWords  =  2;
     int nIters  = 16;
     Ssw_Cla_t * p;
diff --git a/src/aig/ssw/sswCore.c b/src/aig/ssw/sswCore.c
index 9a31a056..56b37fbe 100644
--- a/src/aig/ssw/sswCore.c
+++ b/src/aig/ssw/sswCore.c
@@ -204,8 +204,8 @@ clk = clock();
         nSatFailsReal = p->nSatFailsReal;
         nUniques      = p->nUniques;
 
-        p->nVarsMax  = AIG_MAX( p->nVarsMax,  p->pMSat->nSatVars );
-        p->nCallsMax = AIG_MAX( p->nCallsMax, p->pMSat->nSolverCalls );
+        p->nVarsMax  = ABC_MAX( p->nVarsMax,  p->pMSat->nSatVars );
+        p->nCallsMax = ABC_MAX( p->nCallsMax, p->pMSat->nSolverCalls );
         Ssw_SatStop( p->pMSat );
         p->pMSat = NULL;
         Ssw_ManCleanup( p );
diff --git a/src/aig/ssw/sswDyn.c b/src/aig/ssw/sswDyn.c
index d9ac07a9..04e66f09 100644
--- a/src/aig/ssw/sswDyn.c
+++ b/src/aig/ssw/sswDyn.c
@@ -438,8 +438,8 @@ p->timeReduce += clock() - clk;
             // replace the solver
             if ( p->pMSat )
             {
-                p->nVarsMax  = AIG_MAX( p->nVarsMax,  p->pMSat->nSatVars );
-                p->nCallsMax = AIG_MAX( p->nCallsMax, p->pMSat->nSolverCalls );
+                p->nVarsMax  = ABC_MAX( p->nVarsMax,  p->pMSat->nSatVars );
+                p->nCallsMax = ABC_MAX( p->nCallsMax, p->pMSat->nSolverCalls );
                 Ssw_SatStop( p->pMSat );
                 p->nRecycles++;
                 p->nRecyclesTotal++;
diff --git a/src/aig/ssw/sswLcorr.c b/src/aig/ssw/sswLcorr.c
index 80bc5853..fb36c31d 100644
--- a/src/aig/ssw/sswLcorr.c
+++ b/src/aig/ssw/sswLcorr.c
@@ -300,8 +300,8 @@ int Ssw_ManSweepLatch( Ssw_Man_t * p )
              p->pMSat->nSatVars > p->pPars->nSatVarMax &&
              p->nRecycleCalls > p->pPars->nRecycleCalls )
         {
-            p->nVarsMax  = AIG_MAX( p->nVarsMax,  p->pMSat->nSatVars );
-            p->nCallsMax = AIG_MAX( p->nCallsMax, p->pMSat->nSolverCalls );
+            p->nVarsMax  = ABC_MAX( p->nVarsMax,  p->pMSat->nSatVars );
+            p->nCallsMax = ABC_MAX( p->nCallsMax, p->pMSat->nSolverCalls );
             Ssw_SatStop( p->pMSat );
             p->pMSat = Ssw_SatStart( 0 );
             p->nRecycles++;
diff --git a/src/aig/ssw/sswSemi.c b/src/aig/ssw/sswSemi.c
index 5f426093..1d578291 100644
--- a/src/aig/ssw/sswSemi.c
+++ b/src/aig/ssw/sswSemi.c
@@ -68,7 +68,7 @@ Ssw_Sem_t * Ssw_SemManStart( Ssw_Man_t * pMan, int nConfMax, int fVerbose )
     memset( p, 0, sizeof(Ssw_Sem_t) );
     p->nConfMaxStart  = nConfMax;
     p->nConfMax       = nConfMax;
-    p->nFramesSweep   = AIG_MAX( (1<<21)/Aig_ManNodeNum(pMan->pAig), pMan->nFrames );
+    p->nFramesSweep   = ABC_MAX( (1<<21)/Aig_ManNodeNum(pMan->pAig), pMan->nFrames );
     p->fVerbose       = fVerbose;
     // equivalences considered
     p->pMan           = pMan;
diff --git a/src/aig/ssw/sswSim.c b/src/aig/ssw/sswSim.c
index 7a2f4664..deb8d5d4 100644
--- a/src/aig/ssw/sswSim.c
+++ b/src/aig/ssw/sswSim.c
@@ -590,7 +590,7 @@ void Ssw_SmlAssignDist1( Ssw_Sml_t * p, unsigned * pPat )
         Aig_ManForEachPi( p->pAig, pObj, i )
             Ssw_SmlObjAssignConst( p, pObj, Aig_InfoHasBit(pPat, i), 0 );
         // flip one bit
-        Limit = AIG_MIN( Aig_ManPiNum(p->pAig), p->nWordsTotal * 32 - 1 );
+        Limit = ABC_MIN( Aig_ManPiNum(p->pAig), p->nWordsTotal * 32 - 1 );
         for ( i = 0; i < Limit; i++ )
             Aig_InfoXorBit( Ssw_ObjSim( p, Aig_ManPi(p->pAig,i)->Id ), i+1 );
     }
@@ -612,7 +612,7 @@ void Ssw_SmlAssignDist1( Ssw_Sml_t * p, unsigned * pPat )
         // flip one bit of the last frame
         if ( fUseDist1 ) //&& p->nFrames == 2 )
         {
-            Limit = AIG_MIN( nTruePis, p->nWordsFrame * 32 - 1 );
+            Limit = ABC_MIN( nTruePis, p->nWordsFrame * 32 - 1 );
             for ( i = 0; i < Limit; i++ )
                 Aig_InfoXorBit( Ssw_ObjSim( p, Aig_ManPi(p->pAig, i)->Id ) + p->nWordsFrame*(p->nFrames-1), i+1 );
         }
@@ -641,7 +641,7 @@ void Ssw_SmlAssignDist1Plus( Ssw_Sml_t * p, unsigned * pPat )
         Ssw_SmlObjAssignConst( p, pObj, Aig_InfoHasBit(pPat, i), 0 );
 
     // set distance one PIs for the first frame
-    Limit = AIG_MIN( Saig_ManPiNum(p->pAig), p->nWordsFrame * 32 - 1 );
+    Limit = ABC_MIN( Saig_ManPiNum(p->pAig), p->nWordsFrame * 32 - 1 );
     for ( i = 0; i < Limit; i++ )
         Aig_InfoXorBit( Ssw_ObjSim( p, Aig_ManPi(p->pAig, i)->Id ), i+1 );