luke
/
abc
mirror of https://github.com/YosysHQ/abc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug fix in &frames.

This commit is contained in:
Alan Mishchenko 2013-05-19 21:27:23 -07:00
parent 6682d6b0e7
commit 232fe09ee4
1 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/aig/gia/giaFrames.c
View File

@ -713,29 +713,6 @@ void Gia_ManFraSupports( Gia_ManFra_t * p )
} }
} }
/**Function*************************************************************
Synopsis [Moves the first nRegs entries to the end.]
Description []
SideEffects []
SeeAlso []
***********************************************************************/
void Gia_ManFraTransformCis( Gia_Man_t * pAig, Vec_Int_t * vCis )
{
int i, k = 0, Entry;
Vec_IntForEachEntryStop( vCis, Entry, i, Gia_ManRegNum(pAig) )
assert( Entry == i+1 );
Vec_IntForEachEntryStart( vCis, Entry, i, Gia_ManRegNum(pAig) )
Vec_IntWriteEntry( vCis, k++, Entry );
for ( i = 0; i < Gia_ManRegNum(pAig); i++ )
Vec_IntWriteEntry( vCis, k++, i+1 );
assert( k == Vec_IntSize(vCis) );
}
/**Function************************************************************* /**Function*************************************************************
Synopsis [] Synopsis []
@ -878,6 +855,11 @@ Gia_Man_t * Gia_ManFrames( Gia_Man_t * pAig, Gia_ParFra_t * pPars )
if ( !pPars->fDisableSt ) if ( !pPars->fDisableSt )
Gia_ManHashAlloc( pFrames ); Gia_ManHashAlloc( pFrames );
Gia_ManConst0(pAig)->Value = 0; Gia_ManConst0(pAig)->Value = 0;
// create primary inputs
for ( f = 0; f < pPars->nFrames; f++ )
Gia_ManForEachPi( pAig, pObj, i )
pObj->Value = Gia_ManAppendCi( pFrames );
// add internal nodes for each timeframe
for ( f = 0; f < pPars->nFrames; f++ ) for ( f = 0; f < pPars->nFrames; f++ )
{ {
if ( f == 0 ) if ( f == 0 )
@ -891,7 +873,7 @@ Gia_Man_t * Gia_ManFrames( Gia_Man_t * pAig, Gia_ParFra_t * pPars )
pObj->Value = Gia_ObjRoToRi( pAig, pObj )->Value; pObj->Value = Gia_ObjRoToRi( pAig, pObj )->Value;
} }
Gia_ManForEachPi( pAig, pObj, i ) Gia_ManForEachPi( pAig, pObj, i )
pObj->Value = Gia_ManAppendCi( pFrames ); pObj->Value = Gia_Obj2Lit( pFrames, Gia_ManPi(pFrames, f * Gia_ManPiNum(pAig) + i) );
if ( !pPars->fDisableSt ) if ( !pPars->fDisableSt )
Gia_ManForEachAnd( pAig, pObj, i ) Gia_ManForEachAnd( pAig, pObj, i )
pObj->Value = Gia_ManHashAnd( pFrames, Gia_ObjFanin0Copy(pObj), Gia_ObjFanin1Copy(pObj) ); pObj->Value = Gia_ManHashAnd( pFrames, Gia_ObjFanin0Copy(pObj), Gia_ObjFanin1Copy(pObj) );
@ -929,7 +911,6 @@ Gia_Man_t * Gia_ManFrames( Gia_Man_t * pAig, Gia_ParFra_t * pPars )
Vec_IntFreeP( &vPoLits ); Vec_IntFreeP( &vPoLits );
if ( !pPars->fDisableSt ) if ( !pPars->fDisableSt )
Gia_ManHashStop( pFrames ); Gia_ManHashStop( pFrames );
Gia_ManFraTransformCis( pAig, pFrames->vCis );
Gia_ManSetRegNum( pFrames, Gia_ManRegNum(pAig) ); Gia_ManSetRegNum( pFrames, Gia_ManRegNum(pAig) );
if ( Gia_ManCombMarkUsed(pFrames) < Gia_ManAndNum(pFrames) ) if ( Gia_ManCombMarkUsed(pFrames) < Gia_ManAndNum(pFrames) )
{ {