Misc changes.

src/base/main/mainInit.c

@@ -23,7 +23,8 @@
 
 ABC_NAMESPACE_IMPL_START
 
-//#define USE_ABC2
+#define USE_ABC2
+#define USE_ABC85
  
 ////////////////////////////////////////////////////////////////////////
 ///                        DECLARATIONS                              ///
@@ -51,6 +52,8 @@ extern void Test_Init( Abc_Frame_t * pAbc );
 extern void Test_End( Abc_Frame_t * pAbc );
 extern void Abc2_Init( Abc_Frame_t * pAbc );
 extern void Abc2_End ( Abc_Frame_t * pAbc );
+extern void Abc85_Init( Abc_Frame_t * pAbc );
+extern void Abc85_End( Abc_Frame_t * pAbc );
 
 ////////////////////////////////////////////////////////////////////////
 ///                     FUNCTION DEFINITIONS                         ///
@@ -83,6 +86,9 @@ void Abc_FrameInit( Abc_Frame_t * pAbc )
 #ifdef USE_ABC2
     Abc2_Init( pAbc );
 #endif
+#ifdef USE_ABC85
+    Abc85_Init( pAbc );
+#endif
     EXT_ABC_INIT(pAbc) // plugin for external functionality
 }
 
@@ -113,6 +119,9 @@ void Abc_FrameEnd( Abc_Frame_t * 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

@@ -96,22 +96,19 @@ struct Abc_Frame_t_
     Abc_Cex_t *     pCex;          // a counter-example to fail the current network
     Vec_Ptr_t *     vCexVec;       // a vector of counter-examples if more than one PO fails
     Vec_Ptr_t *     vPoEquivs;     // equivalence classes of isomorphic primary outputs
-
+    int             Status;                // the status of verification problem (proved=1, disproved=0, undecided=-1)
+    int             nFrames;               // the number of time frames completed by BMC
+    Vec_Ptr_t *     vPlugInComBinPairs;    // pairs of command and its binary name
+    Vec_Ptr_t *     vLTLProperties_global; // related to LTL
     void *          pSave1; 
     void *          pSave2; 
     void *          pSave3; 
     void *          pSave4; 
-
-    // related to LTL
-    Vec_Ptr_t *     vLTLProperties_global;
-
-    // the addition to keep the best Ntl that can be used to restore
-    void *            pAbc8NtlBestDelay;    // the best delay, Ntl
-    void *            pAbc8NtlBestArea;    // the best area
-    int             Status;             // the status of verification problem (proved=1, disproved=0, undecided=-1)
-    int             nFrames;            // the number of time frames completed by BMC
-
-    Vec_Ptr_t *     vPlugInComBinPairs; // pairs of command and its binary name
+    void *          pAbc85Ntl;
+    void *          pAbc85Ntl2;
+    void *          pAbc85Best;
+    void *          pAbc85Delay;
+    If_Lib_t *      pAbc85Lib;
 
     EXT_ABC_FRAME   // plugin for external functionality
 };