Version abc90408

7 files changed, 14 insertions, 14 deletions

diff --git a/src/map/amap/amapGraph.c b/src/map/amap/amapGraph.c
index 83cadc2c..0e9fd85c 100644
--- a/src/map/amap/amapGraph.c
+++ b/src/map/amap/amapGraph.c
@@ -139,7 +139,7 @@ Amap_Obj_t * Amap_ManCreateAnd( Amap_Man_t * p, Amap_Obj_t * pFan0, Amap_Obj_t *
     pObj->Fan[1] = Amap_ObjToLit(pFan1);  Amap_Regular(pFan1)->nRefs++;
     assert( Amap_Lit2Var(pObj->Fan[0]) != Amap_Lit2Var(pObj->Fan[1]) );
     pObj->fPhase = Amap_ObjPhaseReal(pFan0) & Amap_ObjPhaseReal(pFan1);
-    pObj->Level  = 1 + AIG_MAX( Amap_Regular(pFan0)->Level, Amap_Regular(pFan1)->Level );
+    pObj->Level  = 1 + ABC_MAX( Amap_Regular(pFan0)->Level, Amap_Regular(pFan1)->Level );
     if ( p->nLevelMax < (int)pObj->Level )
         p->nLevelMax = (int)pObj->Level;
     p->nObjs[AMAP_OBJ_AND]++;
@@ -165,7 +165,7 @@ Amap_Obj_t * Amap_ManCreateXor( Amap_Man_t * p, Amap_Obj_t * pFan0, Amap_Obj_t *
     pObj->Fan[0] = Amap_ObjToLit(pFan0);  Amap_Regular(pFan0)->nRefs++;
     pObj->Fan[1] = Amap_ObjToLit(pFan1);  Amap_Regular(pFan1)->nRefs++;
     pObj->fPhase = Amap_ObjPhaseReal(pFan0) ^ Amap_ObjPhaseReal(pFan1);
-    pObj->Level  = 2 + AIG_MAX( Amap_Regular(pFan0)->Level, Amap_Regular(pFan1)->Level );
+    pObj->Level  = 2 + ABC_MAX( Amap_Regular(pFan0)->Level, Amap_Regular(pFan1)->Level );
     if ( p->nLevelMax < (int)pObj->Level )
         p->nLevelMax = (int)pObj->Level;
     p->nObjs[AMAP_OBJ_XOR]++;
@@ -193,8 +193,8 @@ Amap_Obj_t * Amap_ManCreateMux( Amap_Man_t * p, Amap_Obj_t * pFan0, Amap_Obj_t *
     pObj->Fan[2] = Amap_ObjToLit(pFanC);  Amap_Regular(pFanC)->nRefs++;
     pObj->fPhase = (Amap_ObjPhaseReal(pFan1) &  Amap_ObjPhaseReal(pFanC)) | 
                    (Amap_ObjPhaseReal(pFan0) & ~Amap_ObjPhaseReal(pFanC));
-    pObj->Level  = AIG_MAX( Amap_Regular(pFan0)->Level, Amap_Regular(pFan1)->Level );
-    pObj->Level  = 2 + AIG_MAX( pObj->Level, Amap_Regular(pFanC)->Level );
+    pObj->Level  = ABC_MAX( Amap_Regular(pFan0)->Level, Amap_Regular(pFan1)->Level );
+    pObj->Level  = 2 + ABC_MAX( pObj->Level, Amap_Regular(pFanC)->Level );
     if ( p->nLevelMax < (int)pObj->Level )
         p->nLevelMax = (int)pObj->Level;
     p->nObjs[AMAP_OBJ_MUX]++;
@@ -221,7 +221,7 @@ void Amap_ManCreateChoice( Amap_Man_t * p, Amap_Obj_t * pObj )
     // update the level of this node (needed for correct required time computation)
     for ( pTemp = pObj; pTemp; pTemp = Amap_ObjChoice(p, pTemp) )
     {
-        pObj->Level = AIG_MAX( pObj->Level, pTemp->Level );
+        pObj->Level = ABC_MAX( pObj->Level, pTemp->Level );
 //        pTemp->nVisits++; pTemp->nVisitsCopy++;
     }
     // mark the largest level
diff --git a/src/map/amap/amapMatch.c b/src/map/amap/amapMatch.c
index 0ea65219..a997ad48 100644
--- a/src/map/amap/amapMatch.c
+++ b/src/map/amap/amapMatch.c
@@ -102,7 +102,7 @@ float Amap_ManMaxDelay( Amap_Man_t * p )
     float Delay = 0.0;
     int i;
     Amap_ManForEachPo( p, pObj, i )
-        Delay = AIG_MAX( Delay, Amap_ObjFanin0(p,pObj)->Best.Delay );
+        Delay = ABC_MAX( Delay, Amap_ObjFanin0(p,pObj)->Best.Delay );
     return Delay;
 }
 
@@ -373,7 +373,7 @@ static inline void Amap_ManMatchGetFlows( Amap_Man_t * p, Amap_Mat_t * pM )
     Amap_MatchForEachFanin( p, pM, pFanin, i )
     {
         pMFanin = &pFanin->Best;
-        pM->Delay = AIG_MAX( pM->Delay, pMFanin->Delay );
+        pM->Delay = ABC_MAX( pM->Delay, pMFanin->Delay );
         pM->AveFan += Amap_ObjRefsTotal(pFanin);
         if ( Amap_ObjRefsTotal(pFanin) == 0 )
             pM->Area += pMFanin->Area;
@@ -409,7 +409,7 @@ static inline void Amap_ManMatchGetExacts( Amap_Man_t * p, Amap_Obj_t * pNode, A
     Amap_MatchForEachFanin( p, pM, pFanin, i )
     {
         pMFanin = &pFanin->Best;
-        pM->Delay = AIG_MAX( pM->Delay, pMFanin->Delay );
+        pM->Delay = ABC_MAX( pM->Delay, pMFanin->Delay );
         pM->AveFan += Amap_ObjRefsTotal(pFanin);
     }
     pM->AveFan /= pGate->nPins;
diff --git a/src/map/fpga/fpgaCut.c b/src/map/fpga/fpgaCut.c
index a9108871..aca4a8ef 100644
--- a/src/map/fpga/fpgaCut.c
+++ b/src/map/fpga/fpgaCut.c
@@ -1115,7 +1115,7 @@ Fpga_Cut_t * Fpga_CutSortCuts( Fpga_Man_t * pMan, Fpga_CutTable_t * p, Fpga_Cut_
     if ( nCuts > FPGA_CUTS_MAX_USE - 1 )
     {
 //        printf( "*" );
-        // ABC_FREE the remaining cuts
+        // free the remaining cuts
         for ( i = FPGA_CUTS_MAX_USE - 1; i < nCuts; i++ )
             Extra_MmFixedEntryRecycle( pMan->mmCuts, (char *)p->pCuts1[i] );
         // update the number of cuts
diff --git a/src/map/if/ifMan.c b/src/map/if/ifMan.c
index 97f2a06a..6294e3d2 100644
--- a/src/map/if/ifMan.c
+++ b/src/map/if/ifMan.c
@@ -138,7 +138,7 @@ void If_ManStop( If_Man_t * p )
     ABC_FREE( p->pMemCi );
     ABC_FREE( p->pMemAnd );
     ABC_FREE( p->puTemp[0] );
-    // ABC_FREE pars memory
+    // free pars memory
     if ( p->pPars->pTimesArr )
         ABC_FREE( p->pPars->pTimesArr );
     if ( p->pPars->pTimesReq )
diff --git a/src/map/mapper/mapperCut.c b/src/map/mapper/mapperCut.c
index 00ec9fe5..19878d5b 100644
--- a/src/map/mapper/mapperCut.c
+++ b/src/map/mapper/mapperCut.c
@@ -1005,7 +1005,7 @@ Map_Cut_t * Map_CutSortCuts( Map_Man_t * pMan, Map_CutTable_t * p, Map_Cut_t * p
     // move them back into the list
     if ( nCuts > MAP_CUTS_MAX_USE - 1 )
     {
-        // ABC_FREE the remaining cuts
+        // free the remaining cuts
         for ( i = MAP_CUTS_MAX_USE - 1; i < nCuts; i++ )
             Extra_MmFixedEntryRecycle( pMan->mmCuts, (char *)p->pCuts1[i] );
         // update the number of cuts
diff --git a/src/map/mio/mioFunc.c b/src/map/mio/mioFunc.c
index a06151f0..05fe245d 100644
--- a/src/map/mio/mioFunc.c
+++ b/src/map/mio/mioFunc.c
@@ -173,7 +173,7 @@ int Mio_GateParseFormula( Mio_Gate_t * pGate )
             {
                 if ( pPinNames[i] && strcmp( pPinNames[i], pPin->pName ) == 0 )
                 {
-                    // ABC_FREE pPinNames[i] because it is already available as pPin->pName
+                    // free pPinNames[i] because it is already available as pPin->pName
                     // setting pPinNames[i] to NULL is useful to make sure that
                     // this name is not assigned to two pins in the list
                     ABC_FREE( pPinNames[i] );
diff --git a/src/map/mio/mioUtils.c b/src/map/mio/mioUtils.c
index 3f42d2bb..376a0bed 100644
--- a/src/map/mio/mioUtils.c
+++ b/src/map/mio/mioUtils.c
@@ -47,9 +47,9 @@ void Mio_LibraryDelete( Mio_Library_t * pLib )
     Mio_Gate_t * pGate, * pGate2;
     if ( pLib == NULL )
         return;
-    // ABC_FREE the bindings of nodes to gates from this library for all networks
+    // free the bindings of nodes to gates from this library for all networks
     Abc_FrameUnmapAllNetworks( Abc_FrameGetGlobalFrame() );
-    // ABC_FREE the library
+    // free the library
     ABC_FREE( pLib->pName );
     Mio_LibraryForEachGateSafe( pLib, pGate, pGate2 )
         Mio_GateDelete( pGate );