diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2011-02-19 16:53:11 -0800 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2011-02-19 16:53:11 -0800 |
| commit | ab75993d28e766062dbcfe5c8009e80d74d74121 (patch) | |
| tree | 4ec88d14270877fca642bd50ad1da308a5e7d78c | |
| parent | e3f88c81c62cb771faba13cbe58a7488af0087bd (diff) | |
| download | abc-ab75993d28e766062dbcfe5c8009e80d74d74121.tar.gz abc-ab75993d28e766062dbcfe5c8009e80d74d74121.tar.bz2 abc-ab75993d28e766062dbcfe5c8009e80d74d74121.zip | |
Moved two new APIs for reading/writing CEX from/into ABC from abc.c to mainFrame.c.
| -rw-r--r-- | src/base/abci/abc.c | 36 | ||||
| -rw-r--r-- | src/base/main/main.h | 4 | ||||
| -rw-r--r-- | src/base/main/mainFrame.c | 5 |
3 files changed, 6 insertions, 39 deletions
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index 6778e6ee..eba34d62 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -397,42 +397,6 @@ extern int Abc_CommandAbcLivenessToSafetyWithLTL( Abc_Frame_t * pAbc, int argc, SeeAlso [] ***********************************************************************/ -Abc_Cex_t * Abc_FrameReadCex( Abc_Frame_t * pAbc ) -{ - Abc_Cex_t * pCex; - pCex = pAbc->pCex; - pAbc->pCex = NULL; - return pCex; -} - -/**Function************************************************************* - - Synopsis [] - - Description [] - - SideEffects [] - - SeeAlso [] - -***********************************************************************/ -void Abc_FrameSetCex( Abc_Frame_t * pAbc, Abc_Cex_t * pCex ) -{ - ABC_FREE( pAbc->pCex ); - pAbc->pCex = pCex; -} - -/**Function************************************************************* - - Synopsis [] - - Description [] - - SideEffects [] - - SeeAlso [] - -***********************************************************************/ void Abc_FrameReplaceCex( Abc_Frame_t * pAbc, Abc_Cex_t ** ppCex ) { ABC_FREE( pAbc->pCex ); diff --git a/src/base/main/main.h b/src/base/main/main.h index 41593498..f8d6c1ab 100644 --- a/src/base/main/main.h +++ b/src/base/main/main.h @@ -108,7 +108,7 @@ extern ABC_DLL int Abc_FrameIsFlagEnabled( char * pFlag ); extern ABC_DLL int Abc_FrameReadBmcFrames( Abc_Frame_t * p ); extern ABC_DLL int Abc_FrameReadProbStatus( Abc_Frame_t * p ); -extern ABC_DLL void * Abc_FrameReadCex( Abc_Frame_t * p ); +extern ABC_DLL Abc_Cex_t * Abc_FrameReadCex( Abc_Frame_t * p ); extern ABC_DLL int Abc_FrameReadCexPiNum( Abc_Frame_t * p ); extern ABC_DLL int Abc_FrameReadCexRegNum( Abc_Frame_t * p ); @@ -123,6 +123,8 @@ extern ABC_DLL void Abc_FrameSetLibGen2( void * pLib ); extern ABC_DLL void Abc_FrameSetLibSuper( void * pLib ); extern ABC_DLL void Abc_FrameSetLibVer( void * pLib ); extern ABC_DLL void Abc_FrameSetFlag( char * pFlag, char * pValue ); +extern ABC_DLL void Abc_FrameSetCex( Abc_Cex_t * pCex ); + diff --git a/src/base/main/mainFrame.c b/src/base/main/mainFrame.c index bd3cf4d2..cd743977 100644 --- a/src/base/main/mainFrame.c +++ b/src/base/main/mainFrame.c @@ -60,7 +60,7 @@ char * Abc_FrameReadFlag( char * pFlag ) { return Cmd_FlagRe int Abc_FrameReadBmcFrames( Abc_Frame_t * p ) { return s_GlobalFrame->nFrames; } int Abc_FrameReadProbStatus( Abc_Frame_t * p ) { return s_GlobalFrame->Status; } -void * Abc_FrameReadCex( Abc_Frame_t * p ) { return s_GlobalFrame->pCex; } +Abc_Cex_t * Abc_FrameReadCex( Abc_Frame_t * p ) { return s_GlobalFrame->pCex; } int Abc_FrameReadCexPiNum( Abc_Frame_t * p ) { return s_GlobalFrame->pCex->nPis; } int Abc_FrameReadCexRegNum( Abc_Frame_t * p ) { return s_GlobalFrame->pCex->nRegs; } @@ -72,7 +72,8 @@ void Abc_FrameSetLibGen( void * pLib ) { s_GlobalFrame->pL void Abc_FrameSetLibGen2( void * pLib ) { s_GlobalFrame->pLibGen2 = pLib; } void Abc_FrameSetLibSuper( void * pLib ) { s_GlobalFrame->pLibSuper = pLib; } void Abc_FrameSetLibVer( void * pLib ) { s_GlobalFrame->pLibVer = pLib; } -void Abc_FrameSetFlag( char * pFlag, char * pValue ) { Cmd_FlagUpdateValue( s_GlobalFrame, pFlag, pValue ); } +void Abc_FrameSetFlag( char * pFlag, char * pValue ) { Cmd_FlagUpdateValue( s_GlobalFrame, pFlag, pValue ); } +void Abc_FrameSetCex( Abc_Cex_t * pCex ) { ABC_FREE( s_GlobalFrame->pCex ); s_GlobalFrame->pCex = pCex; } /**Function************************************************************* |