diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2007-09-01 08:01:00 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2007-09-01 08:01:00 -0700 |
| commit | b2470dd3da962026fd874e13c2cf78c10099fe68 (patch) | |
| tree | 1f05e75c3017afc746283ecdcef83808fec75d2a /src/base/main | |
| parent | 9f5ef0d6184ef9c73591250ef00b18edfd99885b (diff) | |
| download | abc-b2470dd3da962026fd874e13c2cf78c10099fe68.tar.gz abc-b2470dd3da962026fd874e13c2cf78c10099fe68.tar.bz2 abc-b2470dd3da962026fd874e13c2cf78c10099fe68.zip | |
Version abc70901
Diffstat (limited to 'src/base/main')
| -rw-r--r-- | src/base/main/main.h | 4 | ||||
| -rw-r--r-- | src/base/main/mainFrame.c | 9 | ||||
| -rw-r--r-- | src/base/main/mainInt.h | 3 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/base/main/main.h b/src/base/main/main.h index 80238a05..4433a8b4 100644 --- a/src/base/main/main.h +++ b/src/base/main/main.h @@ -92,8 +92,8 @@ extern void Abc_FrameDeleteAllNetworks( Abc_Frame_t * p ); extern void Abc_FrameSetGlobalFrame( Abc_Frame_t * p ); extern Abc_Frame_t * Abc_FrameGetGlobalFrame(); -extern Abc_Ntk_t * Abc_FrameReadNtkStore(); -extern int Abc_FrameReadNtkStoreSize(); +extern Vec_Ptr_t * Abc_FrameReadStore(); +extern int Abc_FrameReadStoreSize(); extern void * Abc_FrameReadLibLut(); extern void * Abc_FrameReadLibGen(); extern void * Abc_FrameReadLibSuper(); diff --git a/src/base/main/mainFrame.c b/src/base/main/mainFrame.c index 1a9a4617..eae8b7a6 100644 --- a/src/base/main/mainFrame.c +++ b/src/base/main/mainFrame.c @@ -43,8 +43,8 @@ static Abc_Frame_t * s_GlobalFrame = NULL; SeeAlso [] ***********************************************************************/ -Abc_Ntk_t * Abc_FrameReadNtkStore() { return s_GlobalFrame->pStored; } -int Abc_FrameReadNtkStoreSize() { return s_GlobalFrame->nStored; } +Vec_Ptr_t * Abc_FrameReadStore() { return s_GlobalFrame->vStore; } +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_FrameReadLibSuper() { return s_GlobalFrame->pLibSuper; } @@ -53,8 +53,6 @@ void * Abc_FrameReadManDd() { if ( s_GlobalFrame->dd == void * Abc_FrameReadManDec() { if ( s_GlobalFrame->pManDec == NULL ) s_GlobalFrame->pManDec = Dec_ManStart(); return s_GlobalFrame->pManDec; } char * Abc_FrameReadFlag( char * pFlag ) { return Cmd_FlagReadByName( s_GlobalFrame, pFlag ); } -void Abc_FrameSetNtkStore( Abc_Ntk_t * pNtk ) { s_GlobalFrame->pStored = pNtk; } -void Abc_FrameSetNtkStoreSize( int nStored ) { s_GlobalFrame->nStored = nStored; } void Abc_FrameSetLibLut( void * pLib ) { s_GlobalFrame->pLibLut = pLib; } void Abc_FrameSetLibGen( void * pLib ) { s_GlobalFrame->pLibGen = pLib; } void Abc_FrameSetLibSuper( void * pLib ) { s_GlobalFrame->pLibSuper = pLib; } @@ -113,6 +111,8 @@ Abc_Frame_t * Abc_FrameAllocate() // set the starting step p->nSteps = 1; p->fBatchMode = 0; + // networks to be used by choice + p->vStore = Vec_PtrAlloc( 16 ); // initialize decomposition manager define_cube_size(20); set_espresso_flags(); @@ -145,6 +145,7 @@ void Abc_FrameDeallocate( Abc_Frame_t * p ) if ( p->pLibVer ) Abc_LibFree( p->pLibVer, NULL ); if ( p->pManDec ) Dec_ManStop( p->pManDec ); if ( p->dd ) Extra_StopManager( p->dd ); + if ( p->vStore ) Vec_PtrFree( p->vStore ); Abc_FrameDeleteAllNetworks( p ); free( p ); s_GlobalFrame = NULL; diff --git a/src/base/main/mainInt.h b/src/base/main/mainInt.h index 8c316970..09ad96f3 100644 --- a/src/base/main/mainInt.h +++ b/src/base/main/mainInt.h @@ -63,8 +63,7 @@ struct Abc_Frame_t_ int TimeCommand; // the runtime of the last command int TimeTotal; // the total runtime of all commands // temporary storage for structural choices - Abc_Ntk_t * pStored; // the stored networks - int nStored; // the number of stored networks + Vec_Ptr_t * vStore; // networks to be used by choice // decomposition package void * pManDec; // decomposition manager DdManager * dd; // temporary BDD package |