From df83fb5e0470cb54eb75dee47d629ee7b276b88c Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Fri, 21 Nov 2014 12:01:26 -0800 Subject: Fix in reading flop classes. --- src/aig/gia/giaAiger.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/aig/gia/giaAiger.c') diff --git a/src/aig/gia/giaAiger.c b/src/aig/gia/giaAiger.c index 645f0585..1f6ba03b 100644 --- a/src/aig/gia/giaAiger.c +++ b/src/aig/gia/giaAiger.c @@ -655,11 +655,12 @@ Gia_Man_t * Gia_AigerReadFromMemory( char * pContents, int nFileSize, int fSkipS // read register classes else if ( *pCur == 'r' ) { - int nRegs; + int i, nRegs; pCur++; - nRegs = Gia_AigerReadInt(pCur); pCur += 4; - pNew->vRegClasses = Vec_IntStart( nRegs ); - memcpy(Vec_IntArray(pNew->vRegClasses), pCur, 4*nRegs); pCur += 4*nRegs; + nRegs = Gia_AigerReadInt(pCur)/4; pCur += 4; + pNew->vRegClasses = Vec_IntAlloc( nRegs ); + for ( i = 0; i < nRegs; i++ ) + Vec_IntPush( pNew->vRegClasses, Gia_AigerReadInt(pCur) ), pCur += 4; if ( fVerbose ) printf( "Finished reading extension \"r\".\n" ); } // read choices @@ -1252,9 +1253,11 @@ void Gia_AigerWrite( Gia_Man_t * pInit, char * pFileName, int fWriteSymbols, int // write register classes if ( p->vRegClasses ) { + int i; fprintf( pFile, "r" ); - Gia_FileWriteBufferSize( pFile, Vec_IntSize(p->vRegClasses) ); - fwrite( Vec_IntArray(p->vRegClasses), 1, 4*Vec_IntSize(p->vRegClasses), pFile ); + Gia_FileWriteBufferSize( pFile, 4*Vec_IntSize(p->vRegClasses) ); + for ( i = 0; i < Vec_IntSize(p->vRegClasses); i++ ) + Gia_FileWriteBufferSize( pFile, Vec_IntEntry(p->vRegClasses, i) ); } // write choices if ( Gia_ManHasChoices(p) ) -- cgit v1.2.3