diff options
Diffstat (limited to 'src/base/main')
| -rw-r--r-- | src/base/main/main.c | 6 | ||||
| -rw-r--r-- | src/base/main/main.h | 11 | ||||
| -rw-r--r-- | src/base/main/mainFrame.c | 2 | ||||
| -rw-r--r-- | src/base/main/mainInt.h | 10 |
4 files changed, 18 insertions, 11 deletions
diff --git a/src/base/main/main.c b/src/base/main/main.c index bfa91ddc..a9d610fd 100644 --- a/src/base/main/main.c +++ b/src/base/main/main.c @@ -216,14 +216,14 @@ int main( int argc, char * argv[] ) if ( fStatus == -1 || fStatus == -2 ) break; } - } + } // if the memory should be freed, quit packages if ( fStatus < 0 ) { Abc_Stop(); - } - return 0; + } + return 0; usage: Abc_UtilsPrintHello( pAbc ); diff --git a/src/base/main/main.h b/src/base/main/main.h index af0ed24d..159122d2 100644 --- a/src/base/main/main.h +++ b/src/base/main/main.h @@ -65,15 +65,16 @@ typedef struct Abc_Frame_t_ Abc_Frame_t; //////////////////////////////////////////////////////////////////////// /// FUNCTION DEFINITIONS /// //////////////////////////////////////////////////////////////////////// + #ifdef WIN32 -#define DLLEXPORT __declspec(dllexport) -#define DLLIMPORT __declspec(dllimport) +#define ABC_DLLEXPORT __declspec(dllexport) +#define ABC_DLLIMPORT __declspec(dllimport) #else /* defined(WIN32) */ -#define DLLIMPORT +#define ABC_DLLIMPORT #endif /* defined(WIN32) */ #ifndef ABC_DLL -#define ABC_DLL DLLIMPORT +#define ABC_DLL ABC_DLLIMPORT #endif /*=== main.c ===========================================================*/ @@ -103,6 +104,7 @@ extern ABC_DLL Vec_Ptr_t * Abc_FrameReadStore(); extern ABC_DLL int Abc_FrameReadStoreSize(); extern ABC_DLL void * Abc_FrameReadLibLut(); extern ABC_DLL void * Abc_FrameReadLibGen(); +extern ABC_DLL void * Abc_FrameReadLibGen2(); extern ABC_DLL void * Abc_FrameReadLibSuper(); extern ABC_DLL void * Abc_FrameReadLibVer(); extern ABC_DLL void * Abc_FrameReadManDd(); @@ -114,6 +116,7 @@ extern ABC_DLL void Abc_FrameSetNtkStore( Abc_Ntk_t * pNtk ); extern ABC_DLL void Abc_FrameSetNtkStoreSize( int nStored ); extern ABC_DLL void Abc_FrameSetLibLut( void * pLib ); extern ABC_DLL void Abc_FrameSetLibGen( void * pLib ); +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 ); diff --git a/src/base/main/mainFrame.c b/src/base/main/mainFrame.c index f02ade1c..23e9184e 100644 --- a/src/base/main/mainFrame.c +++ b/src/base/main/mainFrame.c @@ -47,6 +47,7 @@ Vec_Ptr_t * Abc_FrameReadStore() { return s_GlobalFrame->vSt int Abc_FrameReadStoreSize() { return Vec_PtrSize(s_GlobalFrame->vStore); } void * Abc_FrameReadLibLut() { return s_GlobalFrame->pLibLut; } void * Abc_FrameReadLibGen() { return s_GlobalFrame->pLibGen; } +void * Abc_FrameReadLibGen2() { return s_GlobalFrame->pLibGen2; } void * Abc_FrameReadLibSuper() { return s_GlobalFrame->pLibSuper; } void * Abc_FrameReadLibVer() { return s_GlobalFrame->pLibVer; } void * Abc_FrameReadManDd() { if ( s_GlobalFrame->dd == NULL ) s_GlobalFrame->dd = Cudd_Init( 0, 0, CUDD_UNIQUE_SLOTS, CUDD_CACHE_SLOTS, 0 ); return s_GlobalFrame->dd; } @@ -55,6 +56,7 @@ char * Abc_FrameReadFlag( char * pFlag ) { return Cmd_FlagReadByName void Abc_FrameSetLibLut( void * pLib ) { s_GlobalFrame->pLibLut = pLib; } void Abc_FrameSetLibGen( void * pLib ) { s_GlobalFrame->pLibGen = pLib; } +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 ); } diff --git a/src/base/main/mainInt.h b/src/base/main/mainInt.h index becbfd6b..cfd945b7 100644 --- a/src/base/main/mainInt.h +++ b/src/base/main/mainInt.h @@ -71,6 +71,7 @@ struct Abc_Frame_t_ // libraries for mapping void * pLibLut; // the current LUT library void * pLibGen; // the current genlib + void * pLibGen2; // the current genlib void * pLibSuper; // the current supergate library void * pLibVer; // the current Verilog library @@ -97,15 +98,16 @@ struct Abc_Frame_t_ //////////////////////////////////////////////////////////////////////// /// FUNCTION DEFINITIONS /// //////////////////////////////////////////////////////////////////////// + #ifdef WIN32 -#define DLLEXPORT __declspec(dllexport) -#define DLLIMPORT __declspec(dllimport) +#define ABC_DLLEXPORT __declspec(dllexport) +#define ABC_DLLIMPORT __declspec(dllimport) #else /* defined(WIN32) */ -#define DLLIMPORT +#define ABC_DLLIMPORT #endif /* defined(WIN32) */ #ifndef ABC_DLL -#define ABC_DLL DLLIMPORT +#define ABC_DLL ABC_DLLIMPORT #endif /*=== mvMain.c ===========================================================*/ |