diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2020-03-09 13:16:22 +0200 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2020-03-09 13:16:22 +0200 |
| commit | c9bebe157b00fb2f84163914d4063a9b43ecb5cf (patch) | |
| tree | 362c3527788ba71f0fdfc78e9322a56cf6cd965f /src/aig | |
| parent | a484c65b0b32e7b220c54d5c1e7b36ba6c7c262d (diff) | |
| download | abc-c9bebe157b00fb2f84163914d4063a9b43ecb5cf.tar.gz abc-c9bebe157b00fb2f84163914d4063a9b43ecb5cf.tar.bz2 abc-c9bebe157b00fb2f84163914d4063a9b43ecb5cf.zip | |
Ongoing changes to the simulator.
Diffstat (limited to 'src/aig')
| -rw-r--r-- | src/aig/gia/gia.h | 10 | ||||
| -rw-r--r-- | src/aig/gia/giaMan.c | 9 | ||||
| -rw-r--r-- | src/aig/gia/giaSim5.c | 1 |
3 files changed, 5 insertions, 15 deletions
diff --git a/src/aig/gia/gia.h b/src/aig/gia/gia.h index f75d873c..c3842fe1 100644 --- a/src/aig/gia/gia.h +++ b/src/aig/gia/gia.h @@ -52,6 +52,7 @@ ABC_NAMESPACE_HEADER_START typedef struct Gia_MmFixed_t_ Gia_MmFixed_t; typedef struct Gia_MmFlex_t_ Gia_MmFlex_t; typedef struct Gia_MmStep_t_ Gia_MmStep_t; +typedef struct Gia_Dat_t_ Gia_Dat_t; typedef struct Gia_Rpr_t_ Gia_Rpr_t; struct Gia_Rpr_t_ @@ -232,14 +233,7 @@ struct Gia_Man_t_ Vec_Wrd_t * vSuppWords; // support information Vec_Int_t vCopiesTwo; // intermediate copies Vec_Int_t vSuppVars; // used variables - // additional info - char * pUserFile; - Gia_Man_t * pUserSpec; - Gia_Man_t * pUserAig; - Vec_Ptr_t * vUserNames; - Vec_Wec_t * vUserNodes; - Vec_Wec_t * vUserSupps; - Vec_Int_t * vUserArray; + Gia_Dat_t * pUserData; }; diff --git a/src/aig/gia/giaMan.c b/src/aig/gia/giaMan.c index bb8851ec..0958cdfa 100644 --- a/src/aig/gia/giaMan.c +++ b/src/aig/gia/giaMan.c @@ -81,6 +81,8 @@ Gia_Man_t * Gia_ManStart( int nObjsMax ) ***********************************************************************/ void Gia_ManStop( Gia_Man_t * p ) { + extern void Gia_DatFree( Gia_Dat_t * p ); + Gia_DatFree( p->pUserData ); if ( p->vSeqModelVec ) Vec_PtrFreeFree( p->vSeqModelVec ); Gia_ManStaticFanoutStop( p ); @@ -88,13 +90,6 @@ void Gia_ManStop( Gia_Man_t * p ) assert( p->pManTime == NULL ); Vec_PtrFreeFree( p->vNamesIn ); Vec_PtrFreeFree( p->vNamesOut ); - ABC_FREE( p->pUserFile ); - Gia_ManStopP( &p->pUserSpec ); - Gia_ManStopP( &p->pUserAig ); - Vec_PtrFreeFree( p->vUserNames ); - Vec_WecFreeP( &p->vUserNodes ); - Vec_WecFreeP( &p->vUserSupps ); - Vec_IntFreeP( &p->vUserArray ); Vec_IntFreeP( &p->vSwitching ); Vec_IntFreeP( &p->vSuper ); Vec_IntFreeP( &p->vStore ); diff --git a/src/aig/gia/giaSim5.c b/src/aig/gia/giaSim5.c index bdfd78b4..ab33c218 100644 --- a/src/aig/gia/giaSim5.c +++ b/src/aig/gia/giaSim5.c @@ -29,6 +29,7 @@ ABC_NAMESPACE_IMPL_START void Sim_Init( Abc_Frame_t * pAbc ) {} void Sim_End( Abc_Frame_t * pAbc ) {} +void Gia_DatFree( Gia_Dat_t * p ) {} //////////////////////////////////////////////////////////////////////// /// FUNCTION DEFINITIONS /// |