Version abc80130

7 files changed, 42 insertions, 51 deletions

diff --git a/src/map/super/super.c b/src/map/super/super.c
index 97420c5c..ffb432d5 100644
--- a/src/map/super/super.c
+++ b/src/map/super/super.c
@@ -28,7 +28,7 @@ static int Super_CommandSupergates   ( Abc_Frame_t * pAbc, int argc, char **argv
 static int Super_CommandSupergatesAnd( Abc_Frame_t * pAbc, int argc, char **argv );
 
 ////////////////////////////////////////////////////////////////////////
-///                     FUNCTION DEFINITIONS                         ///
+///                     FUNCTION DEFITIONS                           ///
 ////////////////////////////////////////////////////////////////////////
 
 /**Function*************************************************************
@@ -90,20 +90,20 @@ int Super_CommandSupergatesAnd( Abc_Frame_t * pAbc, int argc, char **argv )
     nVarsMax = 4;
     nLevels  = 3;
     fVerbose = 0;
-    Extra_UtilGetoptReset();
-    while ( (c = Extra_UtilGetopt(argc, argv, "ilvh")) != EOF ) 
+    util_getopt_reset();
+    while ( (c = util_getopt(argc, argv, "ilvh")) != EOF ) 
     {
         switch (c) 
         {
             case 'i':
-                nVarsMax = atoi(argv[globalUtilOptind]);
-                globalUtilOptind++;
+                nVarsMax = atoi(argv[util_optind]);
+                util_optind++;
                 if ( nVarsMax < 0 ) 
                     goto usage;
                 break;
             case 'l':
-                nLevels = atoi(argv[globalUtilOptind]);
-                globalUtilOptind++;
+                nLevels = atoi(argv[util_optind]);
+                util_optind++;
                 if ( nLevels < 0 ) 
                     goto usage;
                 break;
@@ -172,44 +172,44 @@ int Super_CommandSupergates( Abc_Frame_t * pAbc, int argc, char **argv )
     fWriteOldFormat = 0;
     ExcludeFile = 0;
 
-    Extra_UtilGetoptReset();
-    while ( (c = Extra_UtilGetopt(argc, argv, "eiltdasovh")) != EOF ) 
+    util_getopt_reset();
+    while ( (c = util_getopt(argc, argv, "eiltdasovh")) != EOF ) 
     {
         switch (c) 
         {
             case 'e':
-                ExcludeFile = argv[globalUtilOptind];
+                ExcludeFile = argv[util_optind];
                 if ( ExcludeFile == 0 )
                     goto usage;
-                globalUtilOptind++;
+                util_optind++;
                 break;
             case 'i':
-                nVarsMax = atoi(argv[globalUtilOptind]);
-                globalUtilOptind++;
+                nVarsMax = atoi(argv[util_optind]);
+                util_optind++;
                 if ( nVarsMax < 0 ) 
                     goto usage;
                 break;
             case 'l':
-                nLevels = atoi(argv[globalUtilOptind]);
-                globalUtilOptind++;
+                nLevels = atoi(argv[util_optind]);
+                util_optind++;
                 if ( nLevels < 0 ) 
                     goto usage;
                 break;
             case 't':
-                TimeLimit = atoi(argv[globalUtilOptind]);
-                globalUtilOptind++;
+                TimeLimit = atoi(argv[util_optind]);
+                util_optind++;
                 if ( TimeLimit < 0 ) 
                     goto usage;
                 break;
             case 'd':
-                DelayLimit = (float)atof(argv[globalUtilOptind]);
-                globalUtilOptind++;
+                DelayLimit = (float)atof(argv[util_optind]);
+                util_optind++;
                 if ( DelayLimit <= 0.0 ) 
                     goto usage;
                 break;
             case 'a':
-                AreaLimit = (float)atof(argv[globalUtilOptind]);
-                globalUtilOptind++;
+                AreaLimit = (float)atof(argv[util_optind]);
+                util_optind++;
                 if ( AreaLimit <= 0.0 ) 
                     goto usage;
                 break;
@@ -231,7 +231,7 @@ int Super_CommandSupergates( Abc_Frame_t * pAbc, int argc, char **argv )
     }
 
 
-    if ( argc != globalUtilOptind + 1 )
+    if ( argc != util_optind + 1 )
     {
         fprintf( pErr, "The GENLIB library file should be given on the command line.\n" );
         goto usage;
@@ -244,9 +244,9 @@ int Super_CommandSupergates( Abc_Frame_t * pAbc, int argc, char **argv )
     }
 
     // get the input file name
-    FileName = argv[globalUtilOptind];
-    if ( (pFile = Io_FileOpen( FileName, "open_path", "r", 0 )) == NULL )
-//    if ( (pFile = fopen( FileName, "r" )) == NULL )
+    FileName = argv[util_optind];
+//    if ( (pFile = Io_FileOpen( FileName, "open_path", "r" )) == NULL )
+    if ( (pFile = fopen( FileName, "r" )) == NULL )
     {
         fprintf( pErr, "Cannot open input file \"%s\". ", FileName );
         if (( FileName = Extra_FileGetSimilarName( FileName, ".genlib", ".lib", ".gen", ".g", NULL ) ))
diff --git a/src/map/super/super.h b/src/map/super/super.h
index a7169924..ce2b7433 100644
--- a/src/map/super/super.h
+++ b/src/map/super/super.h
@@ -19,10 +19,6 @@
 #ifndef __SUPER_H__
 #define __SUPER_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 ////////////////////////////////////////////////////////////////////////
 ///                          INCLUDES                                ///
 ////////////////////////////////////////////////////////////////////////
@@ -40,21 +36,16 @@ extern "C" {
 ////////////////////////////////////////////////////////////////////////
 
 ////////////////////////////////////////////////////////////////////////
-///                       MACRO DEFINITIONS                          ///
+///                       MACRO DEFITIONS                            ///
 ////////////////////////////////////////////////////////////////////////
  
 ////////////////////////////////////////////////////////////////////////
-///                     FUNCTION DEFINITIONS                         ///
+///                     FUNCTION DEFITIONS                           ///
 ////////////////////////////////////////////////////////////////////////
 
 /*=== superCore.c =============================================================*/
-    
-#ifdef __cplusplus
-}
-#endif
-
-#endif
 
 ////////////////////////////////////////////////////////////////////////
 ///                       END OF FILE                                ///
 ////////////////////////////////////////////////////////////////////////
+#endif
diff --git a/src/map/super/superAnd.c b/src/map/super/superAnd.c
index 52473fba..e90fc76d 100644
--- a/src/map/super/superAnd.c
+++ b/src/map/super/superAnd.c
@@ -61,10 +61,10 @@ struct Super2_GateStruct_t_
 
 
 // manipulation of complemented attributes
-#define Super2_IsComplement(p)    (((int)((unsigned long) (p) & 01)))
-#define Super2_Regular(p)         ((Super2_Gate_t *)((unsigned long)(p) & ~01)) 
-#define Super2_Not(p)             ((Super2_Gate_t *)((unsigned long)(p) ^ 01)) 
-#define Super2_NotCond(p,c)       ((Super2_Gate_t *)((unsigned long)(p) ^ (c)))
+#define Super2_IsComplement(p)    (((int)((long) (p) & 01)))
+#define Super2_Regular(p)         ((Super2_Gate_t *)((unsigned)(p) & ~01)) 
+#define Super2_Not(p)             ((Super2_Gate_t *)((long)(p) ^ 01)) 
+#define Super2_NotCond(p,c)       ((Super2_Gate_t *)((long)(p) ^ (c)))
 
 // iterating through the gates in the library
 #define Super2_LibForEachGate( Lib, Gate )                        \
@@ -93,7 +93,7 @@ static int            Super2_LibWriteCompare( char * pStr1, char * pStr2 );
 static int            Super2_LibCompareGates( Super2_Gate_t ** ppG1, Super2_Gate_t ** ppG2 );
 
 ////////////////////////////////////////////////////////////////////////
-///                     FUNCTION DEFINITIONS                         ///
+///                     FUNCTION DEFITIONS                           ///
 ////////////////////////////////////////////////////////////////////////
 
 /**Function*************************************************************
@@ -183,7 +183,7 @@ Super2_Man_t * Super2_ManStart()
 ***********************************************************************/
 void Super2_ManStop( Super2_Man_t * pMan )
 {
-    Extra_MmFixedStop( pMan->pMem );
+    Extra_MmFixedStop( pMan->pMem, 0 );
     stmm_free_table( pMan->tTable );
     free( pMan );
 }
diff --git a/src/map/super/superGENERIC.c b/src/map/super/superGENERIC.c
index 1f2b7651..4c7b67ca 100644
--- a/src/map/super/superGENERIC.c
+++ b/src/map/super/superGENERIC.c
@@ -23,7 +23,7 @@
 ////////////////////////////////////////////////////////////////////////
 
 ////////////////////////////////////////////////////////////////////////
-///                     FUNCTION DEFINITIONS                         ///
+///                     FUNCTION DEFITIONS                           ///
 ////////////////////////////////////////////////////////////////////////
 
 /**Function*************************************************************
diff --git a/src/map/super/superGate.c b/src/map/super/superGate.c
index 91a1e513..d0cd0ad7 100644
--- a/src/map/super/superGate.c
+++ b/src/map/super/superGate.c
@@ -120,7 +120,7 @@ static void           Super_WriteLibraryTree( Super_Man_t * pMan );
 static void           Super_WriteLibraryTree_rec( FILE * pFile, Super_Man_t * pMan, Super_Gate_t * pSuper, int * pCounter );
 
 ////////////////////////////////////////////////////////////////////////
-///                     FUNCTION DEFINITIONS                         ///
+///                     FUNCTION DEFITIONS                           ///
 ////////////////////////////////////////////////////////////////////////
 
 /**Function*************************************************************
@@ -886,7 +886,7 @@ Super_Man_t * Super_ManStart()
 ***********************************************************************/
 void Super_ManStop( Super_Man_t * pMan )
 {
-    Extra_MmFixedStop( pMan->pMem );
+    Extra_MmFixedStop( pMan->pMem, 0 );
     if ( pMan->tTable ) stmm_free_table( pMan->tTable );
     FREE( pMan->pGates );
     free( pMan );
diff --git a/src/map/super/superInt.h b/src/map/super/superInt.h
index ec6d0a38..686c8739 100644
--- a/src/map/super/superInt.h
+++ b/src/map/super/superInt.h
@@ -43,11 +43,11 @@
 ////////////////////////////////////////////////////////////////////////
 
 ////////////////////////////////////////////////////////////////////////
-///                       MACRO DEFINITIONS                          ///
+///                       MACRO DEFITIONS                            ///
 ////////////////////////////////////////////////////////////////////////
 
 ////////////////////////////////////////////////////////////////////////
-///                     FUNCTION DEFINITIONS                         ///
+///                     FUNCTION DEFITIONS                           ///
 ////////////////////////////////////////////////////////////////////////
 
 /*=== superAnd.c =============================================================*/
@@ -55,8 +55,8 @@ extern void       Super2_Precompute( int nInputs, int nLevels, int fVerbose );
 /*=== superGate.c =============================================================*/
 extern void       Super_Precompute( Mio_Library_t * pLibGen, int nInputs, int nLevels, float tDelayMax, float tAreaMax, int TimeLimit, bool fSkipInv, bool fWriteOldFormat, int fVerbose );
 
-#endif
-
 ////////////////////////////////////////////////////////////////////////
 ///                       END OF FILE                                ///
 ////////////////////////////////////////////////////////////////////////
+
+#endif
diff --git a/src/map/super/superWrite.c b/src/map/super/superWrite.c
index 395ef145..a0e85604 100644
--- a/src/map/super/superWrite.c
+++ b/src/map/super/superWrite.c
@@ -53,7 +53,7 @@
 ////////////////////////////////////////////////////////////////////////
 
 ////////////////////////////////////////////////////////////////////////
-///                     FUNCTION DEFINITIONS                         ///
+///                     FUNCTION DEFITIONS                           ///
 ////////////////////////////////////////////////////////////////////////
 
 /**Function*************************************************************