Version abc90215

6 files changed, 23 insertions, 23 deletions

diff --git a/src/aig/cgt/cgt.h b/src/aig/cgt/cgt.h
index f8c1cc2e..8d18ea80 100644
--- a/src/aig/cgt/cgt.h
+++ b/src/aig/cgt/cgt.h
@@ -21,10 +21,6 @@
 #ifndef __CGT_H__
 #define __CGT_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* 
     The algorithm implemented in this package is based on the paper:
     A. Hurst. "Automatic synthesis of clock gating logic with controlled 
@@ -39,6 +35,10 @@ extern "C" {
 ///                         PARAMETERS                               ///
 ////////////////////////////////////////////////////////////////////////
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 ////////////////////////////////////////////////////////////////////////
 ///                         BASIC TYPES                              ///
 ////////////////////////////////////////////////////////////////////////
diff --git a/src/aig/cgt/cgtCore.c b/src/aig/cgt/cgtCore.c
index f49cd46f..b213297e 100644
--- a/src/aig/cgt/cgtCore.c
+++ b/src/aig/cgt/cgtCore.c
@@ -220,7 +220,7 @@ p->timePrepare += clock() - clk;
             p->nCallsSat  -nCallsSat, 
             p->nCallsUndec-nCallsUndec,
             p->nCallsFiltered-nCallsFiltered );
-        PRT( "Time", clock() - clkTotal );
+        ABC_PRT( "Time", clock() - clkTotal );
     }
     Cgt_ManClean( p );
     p->nRecycles++;
diff --git a/src/aig/cgt/cgtDecide.c b/src/aig/cgt/cgtDecide.c
index 0fb2a681..3e79ff73 100644
--- a/src/aig/cgt/cgtDecide.c
+++ b/src/aig/cgt/cgtDecide.c
@@ -227,7 +227,7 @@ Vec_Vec_t * Cgt_ManDecideSimple( Aig_Man_t * pAig, Vec_Vec_t * vGatesAll, int nO
 //        printf( "Gated transitions = %5.2f %%. (%5.2f %%.) ", 
 //            100.0*nTransSaved/nTransTotal, Cgt_ManComputeCoverage(pAig, vGates) );
         printf( "Gated transitions = %5.2f %%. ", Cgt_ManComputeCoverage(pAig, vGates) );
-        PRT( "Time", clock() - clk );
+        ABC_PRT( "Time", clock() - clk );
     }
 /*
     {
@@ -283,7 +283,7 @@ Vec_Vec_t * Cgt_ManDecideArea( Aig_Man_t * pAig, Vec_Vec_t * vGatesAll, int nOdc
             Vec_VecSizeSize(vGatesAll), Counter, Saig_ManRegNum(pAig) );
         printf( "Complete gates = %6d. Gated transitions = %5.2f %%. ", 
             Vec_PtrSize(vCompletes), Cgt_ManComputeCoverage(pAig, vGates) );
-        PRT( "Time", clock() - clk );
+        ABC_PRT( "Time", clock() - clk );
     }
     Vec_PtrFree( vCompletes );
     return vGates;
diff --git a/src/aig/cgt/cgtInt.h b/src/aig/cgt/cgtInt.h
index 23d851f3..3d9823c3 100644
--- a/src/aig/cgt/cgtInt.h
+++ b/src/aig/cgt/cgtInt.h
@@ -21,10 +21,6 @@
 #ifndef __CGT_INT_H__
 #define __CGT_INT_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 ////////////////////////////////////////////////////////////////////////
 ///                          INCLUDES                                ///
 ////////////////////////////////////////////////////////////////////////
@@ -38,6 +34,10 @@ extern "C" {
 ///                         PARAMETERS                               ///
 ////////////////////////////////////////////////////////////////////////
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 ////////////////////////////////////////////////////////////////////////
 ///                         BASIC TYPES                              ///
 ////////////////////////////////////////////////////////////////////////
diff --git a/src/aig/cgt/cgtMan.c b/src/aig/cgt/cgtMan.c
index a3385228..ddc1c5e0 100644
--- a/src/aig/cgt/cgtMan.c
+++ b/src/aig/cgt/cgtMan.c
@@ -47,7 +47,7 @@ Cgt_Man_t * Cgt_ManCreate( Aig_Man_t * pAig, Aig_Man_t * pCare, Cgt_Par_t * pPar
     Aig_ManFanoutStart( pAig );
     Aig_ManSetPioNumbers( pAig );
     // create interpolation manager
-    p = ALLOC( Cgt_Man_t, 1 ); 
+    p = ABC_ALLOC( Cgt_Man_t, 1 ); 
     memset( p, 0, sizeof(Cgt_Man_t) );
     p->pPars      = pPars;
     p->pAig       = pAig;
@@ -123,17 +123,17 @@ void Cgt_ManPrintStats( Cgt_Man_t * p )
         p->pPars->nConfMax, p->pPars->nVarsMin, p->pPars->nFlopsMin );
     printf( "SAT   : Calls = %d. Unsat = %d. Sat = %d. Fails = %d.  Recycles = %d.  ", 
         p->nCalls, p->nCallsUnsat, p->nCallsSat, p->nCallsUndec, p->nRecycles );
-    PRT( "Time", p->timeTotal );
+    ABC_PRT( "Time", p->timeTotal );
 /*
     p->timeOther = p->timeTotal-p->timeAig-p->timePrepare-p->timeSat-p->timeDecision;
-    PRTP( "AIG        ", p->timeAig,       p->timeTotal );
-    PRTP( "Prepare    ", p->timePrepare,   p->timeTotal );
-    PRTP( "SAT solving", p->timeSat,       p->timeTotal );
-    PRTP( "  unsat    ", p->timeSatUnsat,  p->timeTotal );
-    PRTP( "  sat      ", p->timeSatSat,    p->timeTotal );
-    PRTP( "  undecided", p->timeSatUndec,  p->timeTotal );
-    PRTP( "Other      ", p->timeOther,     p->timeTotal );
-    PRTP( "TOTAL      ", p->timeTotal,     p->timeTotal );
+    ABC_PRTP( "AIG        ", p->timeAig,       p->timeTotal );
+    ABC_PRTP( "Prepare    ", p->timePrepare,   p->timeTotal );
+    ABC_PRTP( "SAT solving", p->timeSat,       p->timeTotal );
+    ABC_PRTP( "  unsat    ", p->timeSatUnsat,  p->timeTotal );
+    ABC_PRTP( "  sat      ", p->timeSatSat,    p->timeTotal );
+    ABC_PRTP( "  undecided", p->timeSatUndec,  p->timeTotal );
+    ABC_PRTP( "Other      ", p->timeOther,     p->timeTotal );
+    ABC_PRTP( "TOTAL      ", p->timeTotal,     p->timeTotal );
 */
 }
 
@@ -163,7 +163,7 @@ void Cgt_ManStop( Cgt_Man_t * p )
         Vec_VecFree( p->vGatesAll );
     if ( p->vSuppsInv )
         Vec_VecFree( p->vSuppsInv );
-    free( p );
+    ABC_FREE( p );
 }
 
 
diff --git a/src/aig/cgt/cgtSat.c b/src/aig/cgt/cgtSat.c
index 094fb47d..94168978 100644
--- a/src/aig/cgt/cgtSat.c
+++ b/src/aig/cgt/cgtSat.c
@@ -57,7 +57,7 @@ int Cgt_CheckImplication( Cgt_Man_t * p, Aig_Obj_t * pGate, Aig_Obj_t * pMiter )
     pLits[1] = toLitCond( p->pCnf->pVarNums[pMiter->Id], 0 );
 
 clk = clock();
-    RetValue = sat_solver_solve( p->pSat, pLits, pLits + 2, (sint64)nBTLimit, (sint64)0, (sint64)0, (sint64)0 );
+    RetValue = sat_solver_solve( p->pSat, pLits, pLits + 2, (ABC_INT64_T)nBTLimit, (ABC_INT64_T)0, (ABC_INT64_T)0, (ABC_INT64_T)0 );
 p->timeSat += clock() - clk;
     if ( RetValue == l_False )
     {