Adding box library.

5 files changed, 16 insertions, 9 deletions

diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c
index 69621f37..3dc788e0 100644
--- a/src/base/abci/abc.c
+++ b/src/base/abci/abc.c
@@ -233,8 +233,8 @@ static int Abc_CommandAttach                 ( Abc_Frame_t * pAbc, int argc, cha
 static int Abc_CommandSuperChoice            ( Abc_Frame_t * pAbc, int argc, char ** argv );
 static int Abc_CommandSuperChoiceLut         ( Abc_Frame_t * pAbc, int argc, char ** argv );
 
-static int Abc_CommandFpga                   ( Abc_Frame_t * pAbc, int argc, char ** argv );
-static int Abc_CommandFpgaFast               ( Abc_Frame_t * pAbc, int argc, char ** argv );
+//static int Abc_CommandFpga                   ( Abc_Frame_t * pAbc, int argc, char ** argv );
+//static int Abc_CommandFpgaFast               ( Abc_Frame_t * pAbc, int argc, char ** argv );
 static int Abc_CommandIf                     ( Abc_Frame_t * pAbc, int argc, char ** argv );
 static int Abc_CommandIfif                   ( Abc_Frame_t * pAbc, int argc, char ** argv );
 
@@ -694,8 +694,8 @@ void Abc_Init( Abc_Frame_t * pAbc )
     Cmd_CommandAdd( pAbc, "SC mapping",   "superc",        Abc_CommandSuperChoice,      1 );
     Cmd_CommandAdd( pAbc, "SC mapping",   "supercl",       Abc_CommandSuperChoiceLut,   1 );
 
-    Cmd_CommandAdd( pAbc, "FPGA mapping", "fpga",          Abc_CommandFpga,             1 );
-    Cmd_CommandAdd( pAbc, "FPGA mapping", "ffpga",         Abc_CommandFpgaFast,         1 );
+//    Cmd_CommandAdd( pAbc, "FPGA mapping", "fpga",          Abc_CommandFpga,             1 );
+//    Cmd_CommandAdd( pAbc, "FPGA mapping", "ffpga",         Abc_CommandFpgaFast,         1 );
     Cmd_CommandAdd( pAbc, "FPGA mapping", "if",            Abc_CommandIf,               1 );
     Cmd_CommandAdd( pAbc, "FPGA mapping", "ifif",          Abc_CommandIfif,             1 );
 
@@ -14241,6 +14241,7 @@ usage:
   SeeAlso     []
 
 ***********************************************************************/
+#if 0 
 int Abc_CommandFpga( Abc_Frame_t * pAbc, int argc, char ** argv )
 {
     char Buffer[100];
@@ -14518,6 +14519,7 @@ usage:
     Abc_Print( -2, "\t-h       : prints the command usage\n");
     return 1;
 }
+#endif
 
 /**Function*************************************************************
 
@@ -27335,7 +27337,7 @@ int Abc_CommandAbc9If( Abc_Frame_t * pAbc, int argc, char ** argv )
     if ( pAbc->pLibLut == NULL )
     {
         Abc_Print( -1, "LUT library is not given. Using default LUT library.\n" );
-        pAbc->pLibLut = If_SetSimpleLutLib( 6 );
+        pAbc->pLibLut = If_LutLibSetSimple( 6 );
     }
     Extra_UtilGetoptReset();
     while ( ( c = Extra_UtilGetopt( argc, argv, "KCFAGDEWSqaflepmrsdbgyojikcvh" ) ) != EOF )
diff --git a/src/base/main/main.h b/src/base/main/main.h
index 849e1956..6fc2c356 100644
--- a/src/base/main/main.h
+++ b/src/base/main/main.h
@@ -96,6 +96,7 @@ extern ABC_DLL Abc_Frame_t *   Abc_FrameReadGlobalFrame();
 extern ABC_DLL Vec_Ptr_t *     Abc_FrameReadStore();                  
 extern ABC_DLL int             Abc_FrameReadStoreSize();              
 extern ABC_DLL void *          Abc_FrameReadLibLut();                    
+extern ABC_DLL void *          Abc_FrameReadLibBox();                    
 extern ABC_DLL void *          Abc_FrameReadLibGen();                    
 extern ABC_DLL void *          Abc_FrameReadLibGen2();                    
 extern ABC_DLL void *          Abc_FrameReadLibSuper();                  
@@ -122,6 +123,7 @@ extern ABC_DLL int             Abc_FrameReadCexFrame( Abc_Frame_t * p );
 extern ABC_DLL void            Abc_FrameSetNtkStore( Abc_Ntk_t * pNtk ); 
 extern ABC_DLL void            Abc_FrameSetNtkStoreSize( int nStored );  
 extern ABC_DLL void            Abc_FrameSetLibLut( void * pLib );        
+extern ABC_DLL void            Abc_FrameSetLibBox( void * pLib );        
 extern ABC_DLL void            Abc_FrameSetLibGen( void * pLib );        
 extern ABC_DLL void            Abc_FrameSetLibGen2( void * pLib );        
 extern ABC_DLL void            Abc_FrameSetLibSuper( void * pLib );      
diff --git a/src/base/main/mainFrame.c b/src/base/main/mainFrame.c
index deb0ddca..df1b385e 100644
--- a/src/base/main/mainFrame.c
+++ b/src/base/main/mainFrame.c
@@ -51,6 +51,7 @@ static Abc_Frame_t * s_GlobalFrame = NULL;
 Vec_Ptr_t * Abc_FrameReadStore()                             { return s_GlobalFrame->vStore;       } 
 int         Abc_FrameReadStoreSize()                         { return Vec_PtrSize(s_GlobalFrame->vStore); }
 void *      Abc_FrameReadLibLut()                            { return s_GlobalFrame->pLibLut;      } 
+void *      Abc_FrameReadLibBox()                            { return s_GlobalFrame->pLibBox;      } 
 void *      Abc_FrameReadLibGen()                            { return s_GlobalFrame->pLibGen;      } 
 void *      Abc_FrameReadLibGen2()                           { return s_GlobalFrame->pLibGen2;     } 
 void *      Abc_FrameReadLibSuper()                          { return s_GlobalFrame->pLibSuper;    } 
@@ -71,6 +72,7 @@ int         Abc_FrameReadCexPo( Abc_Frame_t * p )            { return s_GlobalFr
 int         Abc_FrameReadCexFrame( Abc_Frame_t * p )         { return s_GlobalFrame->pCex->iFrame; }               
 
 void        Abc_FrameSetLibLut( void * pLib )                { s_GlobalFrame->pLibLut   = pLib;    } 
+void        Abc_FrameSetLibBox( void * pLib )                { s_GlobalFrame->pLibBox   = pLib;    } 
 void        Abc_FrameSetLibGen( void * pLib )                { s_GlobalFrame->pLibGen   = pLib;    } 
 void        Abc_FrameSetLibGen2( void * pLib )               { s_GlobalFrame->pLibGen2  = pLib;    } 
 void        Abc_FrameSetLibSuper( void * pLib )              { s_GlobalFrame->pLibSuper = pLib;    } 
diff --git a/src/base/main/mainInit.c b/src/base/main/mainInit.c
index a3caba05..bbe0bbd1 100644
--- a/src/base/main/mainInit.c
+++ b/src/base/main/mainInit.c
@@ -36,8 +36,8 @@ extern void Io_Init( Abc_Frame_t * pAbc );
 extern void Io_End ( Abc_Frame_t * pAbc );
 extern void Cmd_Init( Abc_Frame_t * pAbc );
 extern void Cmd_End ( Abc_Frame_t * pAbc );
-extern void Fpga_Init( Abc_Frame_t * pAbc );
-extern void Fpga_End ( Abc_Frame_t * pAbc );
+extern void If_Init( Abc_Frame_t * pAbc );
+extern void If_End ( Abc_Frame_t * pAbc );
 extern void Map_Init( Abc_Frame_t * pAbc );
 extern void Map_End ( Abc_Frame_t * pAbc );
 extern void Mio_Init( Abc_Frame_t * pAbc );
@@ -78,7 +78,7 @@ void Abc_FrameInit( Abc_Frame_t * pAbc )
     Cmd_CommandExecute( pAbc, "set checkread" ); 
     Io_Init( pAbc );
     Abc_Init( pAbc );
-    Fpga_Init( pAbc );
+    If_Init( pAbc );
     Map_Init( pAbc );
     Mio_Init( pAbc );
     Super_Init( pAbc );
@@ -112,7 +112,7 @@ void Abc_FrameEnd( Abc_Frame_t * pAbc )
     Abc_End( pAbc );
     Io_End( pAbc );
     Cmd_End( pAbc );
-    Fpga_End( pAbc );
+    If_End( pAbc );
     Map_End( pAbc );
     Mio_End( pAbc );
     Super_End( pAbc );
diff --git a/src/base/main/mainInt.h b/src/base/main/mainInt.h
index 9450462d..9b2640c5 100644
--- a/src/base/main/mainInt.h
+++ b/src/base/main/mainInt.h
@@ -87,6 +87,7 @@ struct Abc_Frame_t_
     DdManager *     dd;            // temporary BDD package
     // libraries for mapping
     void *          pLibLut;       // the current LUT library
+    void *          pLibBox;       // the current box library
     void *          pLibGen;       // the current genlib
     void *          pLibGen2;      // the current genlib
     void *          pLibSuper;     // the current supergate library