Version abc90215

7 files changed, 16 insertions, 16 deletions

diff --git a/src/misc/mvc/mvc.h b/src/misc/mvc/mvc.h
index 70834e0a..4cc765b2 100644
--- a/src/misc/mvc/mvc.h
+++ b/src/misc/mvc/mvc.h
@@ -561,8 +561,8 @@ struct MvcManagerStruct
 // macros which work with memory
 // MEM_ALLOC: allocate the given number (Size) of items of type (Type)
 // MEM_FREE:  deallocate the pointer (Pointer) to the given number (Size) of items of type (Type)
-#define MEM_ALLOC( Manager, Type, Size )          ((Type *)malloc( (Size) * sizeof(Type) ))
-#define MEM_FREE( Manager, Type, Size, Pointer )  if ( Pointer ) { free(Pointer); Pointer = NULL; }
+#define MEM_ALLOC( Manager, Type, Size )          ((Type *)ABC_ALLOC( char, (Size) * sizeof(Type) ))
+#define MEM_FREE( Manager, Type, Size, Pointer )  if ( Pointer ) { ABC_FREE(Pointer); Pointer = NULL; }
 
 ////////////////////////////////////////////////////////////////////////
 ///                     FUNCTION DEFINITIONS                         ///
diff --git a/src/misc/mvc/mvcContain.c b/src/misc/mvc/mvcContain.c
index a9eae06e..950a80a2 100644
--- a/src/misc/mvc/mvcContain.c
+++ b/src/misc/mvc/mvcContain.c
@@ -4,7 +4,7 @@
 
   PackageName [MVSIS 2.0: Multi-valued logic synthesis system.]
 
-  Synopsis    [Making the cover single-cube containment free.]
+  Synopsis    [Making the cover single-cube containment ABC_FREE.]
 
   Author      [MVSIS Group]
   
diff --git a/src/misc/mvc/mvcCover.c b/src/misc/mvc/mvcCover.c
index d8584446..bad76170 100644
--- a/src/misc/mvc/mvcCover.c
+++ b/src/misc/mvc/mvcCover.c
@@ -44,7 +44,7 @@ Mvc_Cover_t * Mvc_CoverAlloc( Mvc_Manager_t * pMem, int nBits )
 
     nBitsInUnsigned  = 8 * sizeof(Mvc_CubeWord_t);
 #ifdef USE_SYSTEM_MEMORY_MANAGEMENT
-    p                = (Mvc_Cover_t *)malloc( sizeof(Mvc_Cover_t) );
+    p                = (Mvc_Cover_t *)ABC_ALLOC( char, sizeof(Mvc_Cover_t) );
 #else
     p                = (Mvc_Cover_t *)Extra_MmFixedEntryFetch( pMem->pManC );
 #endif
@@ -77,7 +77,7 @@ Mvc_Cover_t * Mvc_CoverClone( Mvc_Cover_t * p )
 {
     Mvc_Cover_t * pCover;
 #ifdef USE_SYSTEM_MEMORY_MANAGEMENT
-    pCover                = (Mvc_Cover_t *)malloc( sizeof(Mvc_Cover_t) );
+    pCover                = (Mvc_Cover_t *)ABC_ALLOC( char, sizeof(Mvc_Cover_t) );
 #else
     pCover                = (Mvc_Cover_t *)Extra_MmFixedEntryFetch( p->pMem->pManC );
 #endif
@@ -144,7 +144,7 @@ void Mvc_CoverFree( Mvc_Cover_t * p )
     MEM_FREE( p->pMem, int,          p->nBits,       p->pLits  );
 
 #ifdef USE_SYSTEM_MEMORY_MANAGEMENT
-    free( p );
+    ABC_FREE( p );
 #else
     Extra_MmFixedEntryRecycle( p->pMem->pManC, (char *)p );
 #endif
diff --git a/src/misc/mvc/mvcCube.c b/src/misc/mvc/mvcCube.c
index e157879f..9ccdb427 100644
--- a/src/misc/mvc/mvcCube.c
+++ b/src/misc/mvc/mvcCube.c
@@ -45,9 +45,9 @@ Mvc_Cube_t * Mvc_CubeAlloc( Mvc_Cover_t * pCover )
     // allocate the cube
 #ifdef USE_SYSTEM_MEMORY_MANAGEMENT
     if ( pCover->nWords == 0 )
-        pCube = (Mvc_Cube_t *)malloc( sizeof(Mvc_Cube_t) );
+        pCube = (Mvc_Cube_t *)ABC_ALLOC( char, sizeof(Mvc_Cube_t) );
     else
-        pCube = (Mvc_Cube_t *)malloc( sizeof(Mvc_Cube_t) + sizeof(Mvc_CubeWord_t) * (pCover->nWords - 1) );
+        pCube = (Mvc_Cube_t *)ABC_ALLOC( char,  sizeof(Mvc_Cube_t) + sizeof(Mvc_CubeWord_t) * (pCover->nWords - 1) );
 #else
     switch( pCover->nWords )
     {
@@ -63,7 +63,7 @@ Mvc_Cube_t * Mvc_CubeAlloc( Mvc_Cover_t * pCover )
         pCube = (Mvc_Cube_t *)Extra_MmFixedEntryFetch( pCover->pMem->pMan4 );
         break;
     default:
-        pCube = (Mvc_Cube_t *)malloc( sizeof(Mvc_Cube_t) + sizeof(Mvc_CubeWord_t) * (pCover->nWords - 1) );
+        pCube = (Mvc_Cube_t *)ABC_ALLOC( char, sizeof(Mvc_Cube_t) + sizeof(Mvc_CubeWord_t) * (pCover->nWords - 1) );
         break;
     }
 #endif
@@ -119,7 +119,7 @@ void Mvc_CubeFree( Mvc_Cover_t * pCover, Mvc_Cube_t * pCube )
 
     // deallocate the cube
 #ifdef USE_SYSTEM_MEMORY_MANAGEMENT
-    free( pCube );
+    ABC_FREE( pCube );
 #else
     switch( pCover->nWords )
     {
@@ -135,7 +135,7 @@ void Mvc_CubeFree( Mvc_Cover_t * pCover, Mvc_Cube_t * pCube )
         Extra_MmFixedEntryRecycle( pCover->pMem->pMan4, (char *)pCube );
         break;
     default:
-        free( pCube );
+        ABC_FREE( pCube );
         break;
     }
 #endif
diff --git a/src/misc/mvc/mvcDivisor.c b/src/misc/mvc/mvcDivisor.c
index ecdea75b..1ce556a5 100644
--- a/src/misc/mvc/mvcDivisor.c
+++ b/src/misc/mvc/mvcDivisor.c
@@ -76,7 +76,7 @@ void Mvc_CoverDivisorZeroKernel( Mvc_Cover_t * pCover )
 //    iLit = Mvc_CoverBestLiteral( pCover, NULL );
     if ( iLit == -1 )
         return;
-    // derive the cube-free quotient
+    // derive the cube-ABC_FREE quotient
     Mvc_CoverDivideByLiteralQuo( pCover, iLit ); // the same cover
     Mvc_CoverMakeCubeFree( pCover );             // the same cover
     // call recursively
diff --git a/src/misc/mvc/mvcMan.c b/src/misc/mvc/mvcMan.c
index 7b4ef2af..168410a4 100644
--- a/src/misc/mvc/mvcMan.c
+++ b/src/misc/mvc/mvcMan.c
@@ -41,7 +41,7 @@
 Mvc_Manager_t * Mvc_ManagerStart()
 {
     Mvc_Manager_t * p;
-    p = ALLOC( Mvc_Manager_t, 1 );
+    p = ABC_ALLOC( Mvc_Manager_t, 1 );
     memset( p, 0, sizeof(Mvc_Manager_t) );
     p->pMan1 = Extra_MmFixedStart( sizeof(Mvc_Cube_t)                              );
     p->pMan2 = Extra_MmFixedStart( sizeof(Mvc_Cube_t) +     sizeof(Mvc_CubeWord_t) );
@@ -67,7 +67,7 @@ void Mvc_ManagerFree( Mvc_Manager_t * p )
     Extra_MmFixedStop( p->pMan2 );
     Extra_MmFixedStop( p->pMan4 );
     Extra_MmFixedStop( p->pManC );
-    free( p );
+    ABC_FREE( p );
 }
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/src/misc/mvc/mvcUtils.c b/src/misc/mvc/mvcUtils.c
index 4b13b23d..bb4b1191 100644
--- a/src/misc/mvc/mvcUtils.c
+++ b/src/misc/mvc/mvcUtils.c
@@ -329,7 +329,7 @@ int Mvc_CoverGetCubeSize( Mvc_Cube_t * pCube )
   entries as there are different pairs of cubes in the cover: n(n-1)/2.
   Fills out the array pDiffs with the following info: For each cube
   pair, included in the array is the number of literals in both cubes
-  after they are made cube free.]
+  after they are made cube ABC_FREE.]
                
   SideEffects []
 
@@ -671,7 +671,7 @@ Mvc_Cover_t ** Mvc_CoverCofactors( Mvc_Data_t * pData, Mvc_Cover_t * pCover, int
     // start the covers for cofactors
     iValueFirst = Vm_VarMapReadValuesFirst(pData->pVm, iVar);
     nValues = Vm_VarMapReadValues(pData->pVm, iVar);
-    ppCofs = ALLOC( Mvc_Cover_t *, nValues + 1 );
+    ppCofs = ABC_ALLOC( Mvc_Cover_t *, nValues + 1 );
     for ( i = 0; i <= nValues; i++ )
         ppCofs[i] = Mvc_CoverClone( pCover );