From 63c95405439b464f6d801e68c15f767bc6336637 Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Wed, 3 Oct 2012 20:38:03 -0700 Subject: Minor bug fixes. --- src/aig/gia/giaAiger.c | 11 ++++++++--- src/misc/vec/vecWrd.h | 6 +++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/aig/gia/giaAiger.c b/src/aig/gia/giaAiger.c index 7940c790..086ab0a8 100644 --- a/src/aig/gia/giaAiger.c +++ b/src/aig/gia/giaAiger.c @@ -1397,11 +1397,11 @@ void Gia_WriteAiger( Gia_Man_t * pInit, char * pFileName, int fWriteSymbols, int // create normalized AIG if ( !Gia_ManIsNormalized(pInit) ) { - Tim_Man_t * pManTime; - pManTime = pInit->pManTime; pInit->pManTime = NULL; // printf( "Gia_WriteAiger(): Normalizing AIG for writing.\n" ); p = Gia_ManDupNormalize( pInit ); - p->pManTime = pManTime; + p->pManTime = pInit->pManTime; pInit->pManTime = NULL; + p->vNamesIn = pInit->vNamesIn; pInit->vNamesIn = NULL; + p->vNamesOut = pInit->vNamesOut; pInit->vNamesOut = NULL; } else p = pInit; @@ -1581,7 +1581,12 @@ void Gia_WriteAiger( Gia_Man_t * pInit, char * pFileName, int fWriteSymbols, int fprintf( pFile, "For information about AIGER format, refer to %s\n", "http://fmv.jku.at/aiger" ); fclose( pFile ); if ( p != pInit ) + { + pInit->pManTime = p->pManTime; p->pManTime = NULL; + pInit->vNamesIn = p->vNamesIn; p->vNamesIn = NULL; + pInit->vNamesOut = p->vNamesOut; p->vNamesOut = NULL; Gia_ManStop( p ); + } } /**Function************************************************************* diff --git a/src/misc/vec/vecWrd.h b/src/misc/vec/vecWrd.h index 60b4e0b2..99aa1acb 100644 --- a/src/misc/vec/vecWrd.h +++ b/src/misc/vec/vecWrd.h @@ -428,7 +428,7 @@ static inline void Vec_WrdWriteEntry( Vec_Wrd_t * p, int i, word Entry ) SeeAlso [] ***********************************************************************/ -static inline word Vec_WrdAddToEntry( Vec_Wrd_t * p, int i, int Addition ) +static inline word Vec_WrdAddToEntry( Vec_Wrd_t * p, int i, word Addition ) { assert( i >= 0 && i < p->nSize ); return p->pArray[i] += Addition; @@ -482,7 +482,7 @@ static inline void Vec_WrdGrow( Vec_Wrd_t * p, int nCapMin ) SeeAlso [] ***********************************************************************/ -static inline void Vec_WrdFill( Vec_Wrd_t * p, int nSize, int Fill ) +static inline void Vec_WrdFill( Vec_Wrd_t * p, int nSize, word Fill ) { int i; Vec_WrdGrow( p, nSize ); @@ -502,7 +502,7 @@ static inline void Vec_WrdFill( Vec_Wrd_t * p, int nSize, int Fill ) SeeAlso [] ***********************************************************************/ -static inline void Vec_WrdFillExtra( Vec_Wrd_t * p, int nSize, int Fill ) +static inline void Vec_WrdFillExtra( Vec_Wrd_t * p, int nSize, word Fill ) { int i; if ( nSize <= p->nSize ) -- cgit v1.2.3