diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2017-03-02 20:50:56 -0800 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2017-03-02 20:50:56 -0800 |
commit | 2f69fa134e387698c05ea5c1c47f19684e99961f (patch) | |
tree | 6ad10a758001fdf2a06ce9df95fe64ebe4755737 /src | |
parent | 64035e52ab2c245f3ef871983b1e9369b1fda2e4 (diff) | |
download | abc-2f69fa134e387698c05ea5c1c47f19684e99961f.tar.gz abc-2f69fa134e387698c05ea5c1c47f19684e99961f.tar.bz2 abc-2f69fa134e387698c05ea5c1c47f19684e99961f.zip |
Moving global declarations into 'abcapi.h' and moving it into 'main' package.
Diffstat (limited to 'src')
-rw-r--r-- | src/base/abci/abcMap.c | 16 | ||||
-rw-r--r-- | src/base/main/abcapis.h | 102 | ||||
-rw-r--r-- | src/base/main/abcapis_old.h (renamed from src/aig/miniaig/abcapis.h) | 4 | ||||
-rw-r--r-- | src/base/main/main.h | 8 | ||||
-rw-r--r-- | src/base/main/mainFrame.c | 2 | ||||
-rw-r--r-- | src/base/wlc/wlcStdin.c | 2 |
6 files changed, 117 insertions, 17 deletions
diff --git a/src/base/abci/abcMap.c b/src/base/abci/abcMap.c index 4e588e2d..f758d0f0 100644 --- a/src/base/abci/abcMap.c +++ b/src/base/abci/abcMap.c @@ -923,9 +923,9 @@ void Abc_NtkPrintMiniMapping( int * pArray ) SeeAlso [] ***********************************************************************/ -int * Abc_NtkOutputMiniMapping( void * pAbc0 ) +int * Abc_NtkOutputMiniMapping( Abc_Frame_t * pAbc ) { - Abc_Frame_t * pAbc = (Abc_Frame_t *)pAbc0; + //Abc_Frame_t * pAbc = (Abc_Frame_t *)pAbc0; Abc_Ntk_t * pNtk; Vec_Int_t * vMapping; int * pArray; @@ -977,9 +977,9 @@ void Abc_NtkTestMiniMapping( Abc_Ntk_t * p ) SeeAlso [] ***********************************************************************/ -void Abc_NtkSetCiArrivalTime( void * pAbc0, int iCi, float Rise, float Fall ) +void Abc_NtkSetCiArrivalTime( Abc_Frame_t * pAbc, int iCi, float Rise, float Fall ) { - Abc_Frame_t * pAbc = (Abc_Frame_t *)pAbc0; + //Abc_Frame_t * pAbc = (Abc_Frame_t *)pAbc0; Abc_Ntk_t * pNtk; Abc_Obj_t * pNode; if ( pAbc == NULL ) @@ -1001,9 +1001,9 @@ void Abc_NtkSetCiArrivalTime( void * pAbc0, int iCi, float Rise, float Fall ) pNode = Abc_NtkCi( pNtk, iCi ); Abc_NtkTimeSetArrival( pNtk, Abc_ObjId(pNode), Rise, Fall ); } -void Abc_NtkSetCoRequiredTime( void * pAbc0, int iCo, float Rise, float Fall ) +void Abc_NtkSetCoRequiredTime( Abc_Frame_t * pAbc, int iCo, float Rise, float Fall ) { - Abc_Frame_t * pAbc = (Abc_Frame_t *)pAbc0; + //Abc_Frame_t * pAbc = (Abc_Frame_t *)pAbc0; Abc_Ntk_t * pNtk; Abc_Obj_t * pNode; if ( pAbc == NULL )\ @@ -1037,9 +1037,9 @@ void Abc_NtkSetCoRequiredTime( void * pAbc0, int iCo, float Rise, float Fall ) SeeAlso [] ***********************************************************************/ -void Abc_NtkSetAndGateDelay( void * pAbc0, float Delay ) +void Abc_NtkSetAndGateDelay( Abc_Frame_t * pAbc, float Delay ) { - Abc_Frame_t * pAbc = (Abc_Frame_t *)pAbc0; + //Abc_Frame_t * pAbc = (Abc_Frame_t *)pAbc0; Abc_Ntk_t * pNtk; if ( pAbc == NULL ) { diff --git a/src/base/main/abcapis.h b/src/base/main/abcapis.h new file mode 100644 index 00000000..3445a00f --- /dev/null +++ b/src/base/main/abcapis.h @@ -0,0 +1,102 @@ +/**CFile**************************************************************** + + FileName [abcapis.h] + + SystemName [ABC: Logic synthesis and verification system.] + + PackageName [Include this file in the external code calling ABC.] + + Synopsis [External declarations.] + + Author [Alan Mishchenko] + + Affiliation [UC Berkeley] + + Date [Ver. 1.0. Started - September 29, 2012.] + + Revision [$Id: abcapis.h,v 1.00 2012/09/29 00:00:00 alanmi Exp $] + +***********************************************************************/ + +#ifndef MINI_AIG__abc_apis_h +#define MINI_AIG__abc_apis_h + +//////////////////////////////////////////////////////////////////////// +/// INCLUDES /// +//////////////////////////////////////////////////////////////////////// + +//////////////////////////////////////////////////////////////////////// +/// PARAMETERS /// +//////////////////////////////////////////////////////////////////////// + +//////////////////////////////////////////////////////////////////////// +/// BASIC TYPES /// +//////////////////////////////////////////////////////////////////////// + +typedef struct Abc_Frame_t_ Abc_Frame_t; + +//////////////////////////////////////////////////////////////////////// +/// MACRO DEFINITIONS /// +//////////////////////////////////////////////////////////////////////// + +#ifdef WIN32 + #ifdef WIN32_NO_DLL + #define ABC_DLLEXPORT + #define ABC_DLLIMPORT + #else + #define ABC_DLLEXPORT __declspec(dllexport) + #define ABC_DLLIMPORT __declspec(dllimport) + #endif +#else /* defined(WIN32) */ +#define ABC_DLLIMPORT +#endif /* defined(WIN32) */ + +#ifndef ABC_DLL +#define ABC_DLL ABC_DLLIMPORT +#endif + +//////////////////////////////////////////////////////////////////////// +/// FUNCTION DECLARATIONS /// +//////////////////////////////////////////////////////////////////////// + +// procedures to start and stop the ABC framework +extern ABC_DLL void Abc_Start(); +extern ABC_DLL void Abc_Stop(); + +// procedures to get the ABC framework (pAbc) and execute commands in it +extern ABC_DLL Abc_Frame_t * Abc_FrameGetGlobalFrame(); +extern ABC_DLL int Cmd_CommandExecute( Abc_Frame_t * pAbc, const char * pCommandLine ); + +// procedures to input/output 'mini AIG' +extern ABC_DLL void Abc_NtkInputMiniAig( Abc_Frame_t * pAbc, void * pMiniAig ); +extern ABC_DLL void * Abc_NtkOutputMiniAig( Abc_Frame_t * pAbc ); +extern ABC_DLL void Abc_FrameGiaInputMiniAig( Abc_Frame_t * pAbc, void * p ); +extern ABC_DLL void * Abc_FrameGiaOutputMiniAig( Abc_Frame_t * pAbc ); +extern ABC_DLL void Abc_NtkSetFlopNum( Abc_Frame_t * pAbc, int nFlops ); + +// procedures to input/output 'mini LUT' +extern ABC_DLL void Abc_FrameGiaInputMiniLut( Abc_Frame_t * pAbc, void * pMiniLut ); +extern ABC_DLL void * Abc_FrameGiaOutputMiniLut( Abc_Frame_t * pAbc ); + +// procedures to set CI/CO arrival/required times +extern ABC_DLL void Abc_NtkSetCiArrivalTime( Abc_Frame_t * pAbc, int iCi, float Rise, float Fall ); +extern ABC_DLL void Abc_NtkSetCoRequiredTime( Abc_Frame_t * pAbc, int iCo, float Rise, float Fall ); + +// procedure to set AND-gate delay to tech-independent synthesis and mapping +extern ABC_DLL void Abc_NtkSetAndGateDelay( Abc_Frame_t * pAbc, float Delay ); + +// procedures to return the mapped network +extern ABC_DLL int * Abc_NtkOutputMiniMapping( Abc_Frame_t * pAbc ); +extern ABC_DLL void Abc_NtkPrintMiniMapping( int * pArray ); + +// procedures to access verifization status and a counter-example +extern ABC_DLL int Abc_FrameReadProbStatus( Abc_Frame_t * pAbc ); +extern ABC_DLL void * Abc_FrameReadCex( Abc_Frame_t * pAbc ); + + +#endif + +//////////////////////////////////////////////////////////////////////// +/// END OF FILE /// +//////////////////////////////////////////////////////////////////////// + diff --git a/src/aig/miniaig/abcapis.h b/src/base/main/abcapis_old.h index eb8586fe..b2703bea 100644 --- a/src/aig/miniaig/abcapis.h +++ b/src/base/main/abcapis_old.h @@ -18,8 +18,8 @@ ***********************************************************************/ -#ifndef MINI_AIG__abc_apis_h -#define MINI_AIG__abc_apis_h +#ifndef MINI_AIG__abc_apis_old_h +#define MINI_AIG__abc_apis_old_h //////////////////////////////////////////////////////////////////////// /// INCLUDES /// diff --git a/src/base/main/main.h b/src/base/main/main.h index 89353fa6..a59a9a40 100644 --- a/src/base/main/main.h +++ b/src/base/main/main.h @@ -34,10 +34,8 @@ #include "misc/vec/vec.h" #include "misc/st/st.h" -ABC_NAMESPACE_HEADER_START -// the framework containing all data -typedef struct Abc_Frame_t_ Abc_Frame_t; -ABC_NAMESPACE_HEADER_END +// the framework containing all data is defined here +#include "abcapis.h" #include "base/cmd/cmd.h" #include "base/io/ioAbc.h" @@ -116,7 +114,7 @@ extern ABC_DLL void Abc_FrameSetBridgeMode(); extern ABC_DLL int Abc_FrameReadBmcFrames( Abc_Frame_t * p ); extern ABC_DLL int Abc_FrameReadProbStatus( Abc_Frame_t * p ); -extern ABC_DLL Abc_Cex_t * Abc_FrameReadCex( Abc_Frame_t * p ); +extern ABC_DLL void * Abc_FrameReadCex( Abc_Frame_t * p ); extern ABC_DLL Vec_Ptr_t * Abc_FrameReadCexVec( Abc_Frame_t * p ); extern ABC_DLL Vec_Int_t * Abc_FrameReadStatusVec( Abc_Frame_t * p ); extern ABC_DLL Vec_Ptr_t * Abc_FrameReadPoEquivs( Abc_Frame_t * p ); diff --git a/src/base/main/mainFrame.c b/src/base/main/mainFrame.c index 9647d020..cd4ff2c7 100644 --- a/src/base/main/mainFrame.c +++ b/src/base/main/mainFrame.c @@ -69,7 +69,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; } -Abc_Cex_t * Abc_FrameReadCex( Abc_Frame_t * p ) { return s_GlobalFrame->pCex; } +void * Abc_FrameReadCex( Abc_Frame_t * p ) { return s_GlobalFrame->pCex; } Vec_Ptr_t * Abc_FrameReadCexVec( Abc_Frame_t * p ) { return s_GlobalFrame->vCexVec; } Vec_Int_t * Abc_FrameReadStatusVec( Abc_Frame_t * p ) { return s_GlobalFrame->vStatuses; } Vec_Ptr_t * Abc_FrameReadPoEquivs( Abc_Frame_t * p ) { return s_GlobalFrame->vPoEquivs; } diff --git a/src/base/wlc/wlcStdin.c b/src/base/wlc/wlcStdin.c index 49c25ad0..3b747cc5 100644 --- a/src/base/wlc/wlcStdin.c +++ b/src/base/wlc/wlcStdin.c @@ -239,7 +239,7 @@ int Wlc_StdinProcessSmt( Abc_Frame_t * pAbc, char * pCmd ) return 0; } // report value of this variable - Wlc_NtkReport( (Wlc_Ntk_t *)pAbc->pAbcWlc, Abc_FrameReadCex(pAbc), pName, 16 ); + Wlc_NtkReport( (Wlc_Ntk_t *)pAbc->pAbcWlc, (Abc_Cex_t *)Abc_FrameReadCex(pAbc), pName, 16 ); Vec_StrFree( vInput ); fflush( stdout ); } |