diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2014-10-21 21:48:53 -0700 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2014-10-21 21:48:53 -0700 |
commit | 51bf12107397b25a79b0c7b593bd3bf74e68e021 (patch) | |
tree | 49116b35a4f1b27b8e0bb02f99860918a8a7b4a0 /src | |
parent | d2e42ec081c1783b0e7901749f5496eb2c726f4d (diff) | |
download | abc-51bf12107397b25a79b0c7b593bd3bf74e68e021.tar.gz abc-51bf12107397b25a79b0c7b593bd3bf74e68e021.tar.bz2 abc-51bf12107397b25a79b0c7b593bd3bf74e68e021.zip |
Bug fix in seq synthesis due to resent code restructuring.
Diffstat (limited to 'src')
-rw-r--r-- | src/aig/gia/giaEnable.c | 4 | ||||
-rw-r--r-- | src/aig/gia/giaEquiv.c | 4 | ||||
-rw-r--r-- | src/proof/cec/cecCorr.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/aig/gia/giaEnable.c b/src/aig/gia/giaEnable.c index 03d1a390..b7d0616d 100644 --- a/src/aig/gia/giaEnable.c +++ b/src/aig/gia/giaEnable.c @@ -362,7 +362,7 @@ Gia_Man_t * Gia_ManUnrollInit( Gia_Man_t * p, int nFrames ) Gia_Man_t * pNew; Gia_Obj_t * pObj, * pObjRi, * pObjRo; int f, i; - Vec_IntFill( &p->vCopies, -1, nFrames * Gia_ManObjNum(p) ); + Vec_IntFill( &p->vCopies, nFrames * Gia_ManObjNum(p), -1 ); pNew = Gia_ManStart( nFrames * Gia_ManObjNum(p) ); pNew->pName = Abc_UtilStrsav( p->pName ); pNew->pSpec = Abc_UtilStrsav( p->pSpec ); @@ -412,7 +412,7 @@ Gia_Man_t * Gia_ManUnrollAndCofactor( Gia_Man_t * p, int nFrames, int nFanMax, i vCofSigs = Gia_ManTransferFrames( p, pFrames, nFrames, pAig, vTemp = vCofSigs ); Vec_IntFree( vTemp ); Gia_ManStop( pFrames ); - ABC_FREE( p->vCopies.pArray ); + Vec_IntErase( &p->vCopies ); // cofactor all these variables pNew = Gia_ManDupCofAllInt( pAig, vCofSigs, fVerbose ); Vec_IntFree( vCofSigs ); diff --git a/src/aig/gia/giaEquiv.c b/src/aig/gia/giaEquiv.c index 61290da2..72626857 100644 --- a/src/aig/gia/giaEquiv.c +++ b/src/aig/gia/giaEquiv.c @@ -1017,7 +1017,7 @@ Gia_Man_t * Gia_ManSpecReduceInit( Gia_Man_t * p, Abc_Cex_t * pInit, int nFrames } */ assert( pInit->nRegs == Gia_ManRegNum(p) && pInit->nPis == 0 ); - Vec_IntFill( &p->vCopies, -1, nFrames * Gia_ManObjNum(p) ); + Vec_IntFill( &p->vCopies, nFrames * Gia_ManObjNum(p), -1 ); vXorLits = Vec_IntAlloc( 1000 ); Gia_ManSetPhase( p ); if ( fDualOut ) @@ -1052,7 +1052,7 @@ Gia_Man_t * Gia_ManSpecReduceInit( Gia_Man_t * p, Abc_Cex_t * pInit, int nFrames // Abc_Print( 1, "Speculatively reduced model has no primary outputs.\n" ); Gia_ManAppendCo( pNew, 0 ); } - ABC_FREE( p->vCopies.pArray ); + Vec_IntErase( &p->vCopies ); Vec_IntFree( vXorLits ); Gia_ManHashStop( pNew ); pNew = Gia_ManCleanup( pTemp = pNew ); diff --git a/src/proof/cec/cecCorr.c b/src/proof/cec/cecCorr.c index fd6c6006..3bff4d38 100644 --- a/src/proof/cec/cecCorr.c +++ b/src/proof/cec/cecCorr.c @@ -112,7 +112,7 @@ Gia_Man_t * Gia_ManCorrSpecReduce( Gia_Man_t * p, int nFrames, int fScorr, Vec_I assert( nFrames > 0 ); assert( Gia_ManRegNum(p) > 0 ); assert( p->pReprs != NULL ); - Vec_IntFill( &p->vCopies, -1, (nFrames+fScorr)*Gia_ManObjNum(p) ); + Vec_IntFill( &p->vCopies, (nFrames+fScorr)*Gia_ManObjNum(p), -1 ); Gia_ManSetPhase( p ); pNew = Gia_ManStart( nFrames * Gia_ManObjNum(p) ); pNew->pName = Abc_UtilStrsav( p->pName ); @@ -200,7 +200,7 @@ Gia_Man_t * Gia_ManCorrSpecReduce( Gia_Man_t * p, int nFrames, int fScorr, Vec_I Gia_ManAppendCo( pNew, iObjNew ); Vec_IntFree( vXorLits ); Gia_ManHashStop( pNew ); - ABC_FREE( p->vCopies.pArray ); + Vec_IntErase( &p->vCopies ); //Abc_Print( 1, "Before sweeping = %d\n", Gia_ManAndNum(pNew) ); pNew = Gia_ManCleanup( pTemp = pNew ); //Abc_Print( 1, "After sweeping = %d\n", Gia_ManAndNum(pNew) ); @@ -229,7 +229,7 @@ Gia_Man_t * Gia_ManCorrSpecReduceInit( Gia_Man_t * p, int nFrames, int nPrefix, assert( (!fScorr && nFrames > 1) || (fScorr && nFrames > 0) || nPrefix ); assert( Gia_ManRegNum(p) > 0 ); assert( p->pReprs != NULL ); - Vec_IntFill( &p->vCopies, -1, (nFrames+nPrefix+fScorr)*Gia_ManObjNum(p) ); + Vec_IntFill( &p->vCopies, (nFrames+nPrefix+fScorr)*Gia_ManObjNum(p), -1 ); Gia_ManSetPhase( p ); pNew = Gia_ManStart( (nFrames+nPrefix) * Gia_ManObjNum(p) ); pNew->pName = Abc_UtilStrsav( p->pName ); @@ -270,7 +270,7 @@ Gia_Man_t * Gia_ManCorrSpecReduceInit( Gia_Man_t * p, int nFrames, int nPrefix, Gia_ManAppendCo( pNew, iObjNew ); Vec_IntFree( vXorLits ); Gia_ManHashStop( pNew ); - ABC_FREE( p->vCopies.pArray ); + Vec_IntErase( &p->vCopies ); //Abc_Print( 1, "Before sweeping = %d\n", Gia_ManAndNum(pNew) ); pNew = Gia_ManCleanup( pTemp = pNew ); //Abc_Print( 1, "After sweeping = %d\n", Gia_ManAndNum(pNew) ); |