diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-07-13 18:47:04 -0700 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-07-13 18:47:04 -0700 |
commit | bbf4b9a58ddb8cada254e0a54ae96564e4e8c06c (patch) | |
tree | 49a4bed04d90167631f3bd8b0fcde41970f182c0 /src/misc/vec/vecSet.h | |
parent | 4ebda996d7102a43fbd08cdf1c1ab0c1e36f302e (diff) | |
download | abc-bbf4b9a58ddb8cada254e0a54ae96564e4e8c06c.tar.gz abc-bbf4b9a58ddb8cada254e0a54ae96564e4e8c06c.tar.bz2 abc-bbf4b9a58ddb8cada254e0a54ae96564e4e8c06c.zip |
Debugging a proof error.
Diffstat (limited to 'src/misc/vec/vecSet.h')
-rw-r--r-- | src/misc/vec/vecSet.h | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/src/misc/vec/vecSet.h b/src/misc/vec/vecSet.h index 0045e3df..c96636f8 100644 --- a/src/misc/vec/vecSet.h +++ b/src/misc/vec/vecSet.h @@ -156,7 +156,7 @@ static inline void Vec_SetRestart( Vec_Set_t * p ) /**Function************************************************************* - Synopsis [Returns memory in bytes occupied by the vector.] + Synopsis [Freeing vector.] Description [] @@ -165,17 +165,22 @@ static inline void Vec_SetRestart( Vec_Set_t * p ) SeeAlso [] ***********************************************************************/ -static inline double Vec_ReportMemory( Vec_Set_t * p ) +static inline void Vec_SetFree_( Vec_Set_t * p ) { - double Mem = sizeof(Vec_Set_t); - Mem += p->nPagesAlloc * sizeof(void *); - Mem += sizeof(word) * (1 << p->nPageSize) * (1 + p->iPage); - return Mem; + int i; + for ( i = 0; i < p->nPagesAlloc; i++ ) + ABC_FREE( p->pPages[i] ); + ABC_FREE( p->pPages ); +} +static inline void Vec_SetFree( Vec_Set_t * p ) +{ + Vec_SetFree_( p ); + ABC_FREE( p ); } /**Function************************************************************* - Synopsis [Freeing vector.] + Synopsis [Returns memory in bytes occupied by the vector.] Description [] @@ -184,17 +189,12 @@ static inline double Vec_ReportMemory( Vec_Set_t * p ) SeeAlso [] ***********************************************************************/ -static inline void Vec_SetFree_( Vec_Set_t * p ) -{ - int i; - for ( i = 0; i < p->nPagesAlloc; i++ ) - ABC_FREE( p->pPages[i] ); - ABC_FREE( p->pPages ); -} -static inline void Vec_SetFree( Vec_Set_t * p ) +static inline double Vec_ReportMemory( Vec_Set_t * p ) { - Vec_SetFree_( p ); - ABC_FREE( p ); + double Mem = sizeof(Vec_Set_t); + Mem += p->nPagesAlloc * sizeof(void *); + Mem += sizeof(word) * (1 << p->nPageSize) * (1 + p->iPage); + return Mem; } /**Function************************************************************* @@ -233,19 +233,11 @@ static inline int Vec_SetAppend( Vec_Set_t * p, int * pArray, int nSize ) } static inline int Vec_SetAppendS( Vec_Set_t * p, int nSize ) { - int Before1, Before2, After; int nWords = Vec_SetWordNum( nSize ); assert( nWords < (1 << p->nPageSize) ); - Before1 = Vec_SetLimitS( p->pPages[p->iPageS] ); - if ( Vec_SetLimitS( p->pPages[p->iPageS] ) + nWords >= (1 << p->nPageSize) ) Vec_SetWriteLimitS( p->pPages[++p->iPageS], 2 ); - Before2 = Vec_SetLimitS( p->pPages[p->iPageS] ); - Vec_SetIncLimitS( p->pPages[p->iPageS], nWords ); - After = Vec_SetLimitS( p->pPages[p->iPageS] ); - - assert( Vec_SetHandCurrentS(p) - nWords < (1 << p->nPageSize) ); return Vec_SetHandCurrentS(p) - nWords; } |