Changes to enable building external code.

Makefile

@@ -12,7 +12,7 @@ $(info $(MSG_PREFIX)Using LD=$(LD))
 PROG := abc
 
 MODULES := \
-	$(wildcard src/ext*) src/misc/ext \
+	$(wildcard src/ext*) \
 	src/base/abc src/base/abci src/base/cmd src/base/io \
 	src/base/main src/base/ver src/base/wlc src/base/test \
 	src/bdd/cudd src/bdd/dsd src/bdd/epd src/bdd/mtr src/bdd/parse \

abclib.dsp

@@ -730,22 +730,6 @@ SOURCE=.\src\base\ver\verStream.c
 SOURCE=.\src\base\test\test.c
 # End Source File
 # End Group
-# Begin Group "abc2"
-
-# PROP Default_Filter ""
-# End Group
-# Begin Group "abc2d"
-
-# PROP Default_Filter ""
-# End Group
-# Begin Group "pcm"
-
-# PROP Default_Filter ""
-# End Group
-# Begin Group "ply"
-
-# PROP Default_Filter ""
-# End Group
 # Begin Group "wlc"
 
 # PROP Default_Filter ""
@@ -778,10 +762,6 @@ SOURCE=.\src\base\wlc\wlcReadVer.c
 SOURCE=.\src\base\wlc\wlcWriteVer.c
 # End Source File
 # End Group
-# Begin Group "abc3"
-
-# PROP Default_Filter ""
-# End Group
 # End Group
 # Begin Group "bdd"
 

src/base/main/main.c

-#include "base/main/mainInt.h"
-
-int Abc_RealMain(int argc, char *argv[]);
-
-//static Abc_FrameInitializer_t abc2_initializer = { Abc2_Init, Abc2_End };
+extern int Abc_RealMain(int argc, char *argv[]);
 
 int main(int argc, char *argv[])
 {
-//    Abc_FrameAddInitializer(&abc2_initializer);
-
-    return Abc_RealMain(argc, argv);
+   return Abc_RealMain(argc, argv);
 }

src/base/main/mainInit.c

@@ -22,9 +22,6 @@
 #include "mainInt.h"
 
 ABC_NAMESPACE_IMPL_START
-
-//#define USE_ABC2
-//#define USE_ABC85
  
 ////////////////////////////////////////////////////////////////////////
 ///                        DECLARATIONS                              ///
@@ -95,7 +92,6 @@ void Abc_FrameAddInitializer( Abc_FrameInitializer_t* p )
 void Abc_FrameInit( Abc_Frame_t * pAbc )
 {
     Abc_FrameInitializer_t* p;
-
     Cmd_Init( pAbc );
     Cmd_CommandExecute( pAbc, "set checkread" ); 
     Io_Init( pAbc );
@@ -109,14 +105,6 @@ void Abc_FrameInit( Abc_Frame_t * pAbc )
     Scl_Init( pAbc );
     Wlc_Init( pAbc );
     Test_Init( pAbc );
-#ifdef USE_ABC2
-    Abc2_Init( pAbc );
-#endif
-#ifdef USE_ABC85
-    Abc85_Init( pAbc );
-#endif
-    EXT_ABC_INIT(pAbc) // plugin for external functionality
-
     for( p = s_InitializerStart ; p ; p = p->next )
         if(p->init)
             p->init(pAbc);
@@ -137,11 +125,9 @@ void Abc_FrameInit( Abc_Frame_t * pAbc )
 void Abc_FrameEnd( Abc_Frame_t * pAbc )
 {
     Abc_FrameInitializer_t* p;
-
     for( p = s_InitializerEnd ; p ; p = p->prev )
         if ( p->destroy )
             p->destroy(pAbc);
-
     Abc_End( pAbc );
     Io_End( pAbc );
     Cmd_End( pAbc );
@@ -154,13 +140,6 @@ void Abc_FrameEnd( Abc_Frame_t * pAbc )
     Scl_End( pAbc );
     Wlc_End( pAbc );
     Test_End( pAbc );
-#ifdef USE_ABC2
-    Abc2_End( pAbc );
-#endif
-#ifdef USE_ABC85
-    Abc85_End( pAbc );
-#endif
-    EXT_ABC_END(pAbc) // plugin for external functionality
 }
 
 

src/base/main/mainInt.h

@@ -35,7 +35,6 @@
 #include "proof/fra/fra.h"
 //#include "aig/nwk/nwkMerge.h"
 //#include "aig/ntl/ntlnwk.h"
-#include "misc/ext/ext.h"
 #include "misc/extra/extraBdd.h"
 
 ABC_NAMESPACE_HEADER_START
@@ -128,8 +127,6 @@ struct Abc_Frame_t_
     void *          pAbc85Best;
     void *          pAbc85Delay;
     void *          pAbcWlc;
-
-    EXT_ABC_FRAME   // plugin for external functionality
 };
 
 typedef void (*Abc_Frame_Initialization_Func)( Abc_Frame_t * pAbc );

src/misc/ext/ext.h

-/**CFile****************************************************************
-
-  FileName    [ext.h]
-
-  SystemName  [ABC: Logic synthesis and verification system.]
-
-  PackageName []
-
-  Synopsis    [plugin for external functionality]
-
-  Author      [Alan Mishchenko]
-  
-  Affiliation [UC Berkeley]
-
-  Date        [Ver. 1.0. Started - June 20, 2005.]
-
-  Revision    [$Id: ext.h,v 1.00 2005/06/20 00:00:00 alanmi Exp $]
-
-***********************************************************************/
-
-#ifndef ABC__misc__ext__ext_h
-#define ABC__misc__ext__ext_h
-
-#define EXT_ABC_FRAME
-#define EXT_ABC_INIT(pAbc)
-#define EXT_ABC_END(pAbc)
-    
-////////////////////////////////////////////////////////////////////////
-///                          INCLUDES                                ///
-////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////
-///                         PARAMETERS                               ///
-////////////////////////////////////////////////////////////////////////
-
-ABC_NAMESPACE_HEADER_START
-
-////////////////////////////////////////////////////////////////////////
-///                         BASIC TYPES                              ///
-////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////
-///                      MACRO DEFINITIONS                           ///
-////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////
-///                    FUNCTION DECLARATIONS                         ///
-////////////////////////////////////////////////////////////////////////
-
-ABC_NAMESPACE_HEADER_END
-
-#endif
-
-////////////////////////////////////////////////////////////////////////
-///                       END OF FILE                                ///
-////////////////////////////////////////////////////////////////////////
-