Misc changes.

This commit is contained in:
Alan Mishchenko 2012-04-27 16:26:41 +07:00
parent 590202e327
commit a4baba2c83
2 changed files with 44 additions and 38 deletions

View File

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

View File

@ -96,22 +96,19 @@ struct Abc_Frame_t_
Abc_Cex_t * pCex; // a counter-example to fail the current network 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 * vCexVec; // a vector of counter-examples if more than one PO fails
Vec_Ptr_t * vPoEquivs; // equivalence classes of isomorphic primary outputs 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 * pSave1;
void * pSave2; void * pSave2;
void * pSave3; void * pSave3;
void * pSave4; void * pSave4;
void * pAbc85Ntl;
// related to LTL void * pAbc85Ntl2;
Vec_Ptr_t * vLTLProperties_global; void * pAbc85Best;
void * pAbc85Delay;
// the addition to keep the best Ntl that can be used to restore If_Lib_t * pAbc85Lib;
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
EXT_ABC_FRAME // plugin for external functionality EXT_ABC_FRAME // plugin for external functionality
}; };