From 735bca1658f92881e12a616f9bdc6a58d0a4c60b Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Thu, 24 Aug 2006 08:01:00 -0700 Subject: Version abc60824 --- src/base/seq/seqCreate.c | 14 +++++++------- src/base/seq/seqFpgaCore.c | 4 ++-- src/base/seq/seqMapCore.c | 2 +- src/base/seq/seqRetCore.c | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/base/seq') diff --git a/src/base/seq/seqCreate.c b/src/base/seq/seqCreate.c index 8dc29855..a4bcaefc 100644 --- a/src/base/seq/seqCreate.c +++ b/src/base/seq/seqCreate.c @@ -116,19 +116,19 @@ Abc_Ntk_t * Abc_NtkAigToSeq( Abc_Ntk_t * pNtk ) { Vec_PtrPush( pNtkNew->vPis, pObj->pCopy ); Vec_PtrPush( pNtkNew->vCis, pObj->pCopy ); - Abc_NtkLogicStoreName( pObj->pCopy, Abc_ObjName(pObj) ); + Abc_ObjAssignName( pObj->pCopy, Abc_ObjName(pObj), NULL ); } Abc_NtkForEachPo( pNtk, pObj, i ) { Vec_PtrPush( pNtkNew->vPos, pObj->pCopy ); Vec_PtrPush( pNtkNew->vCos, pObj->pCopy ); - Abc_NtkLogicStoreName( pObj->pCopy, Abc_ObjName(pObj) ); + Abc_ObjAssignName( pObj->pCopy, Abc_ObjName(pObj), NULL ); } Abc_NtkForEachAssert( pNtk, pObj, i ) { Vec_PtrPush( pNtkNew->vAsserts, pObj->pCopy ); Vec_PtrPush( pNtkNew->vCos, pObj->pCopy ); - Abc_NtkLogicStoreName( pObj->pCopy, Abc_ObjName(pObj) ); + Abc_ObjAssignName( pObj->pCopy, Abc_ObjName(pObj), NULL ); } // relink the choice nodes @@ -268,7 +268,7 @@ Abc_Ntk_t * Abc_NtkSeqToLogicSop( Abc_Ntk_t * pNtk ) // duplicate the nodes Abc_AigForEachAnd( pNtk, pObj, i ) { - Abc_NtkDupObj(pNtkNew, pObj); + Abc_NtkDupObj(pNtkNew, pObj, 0); pObj->pCopy->pData = Abc_SopCreateAnd2( pNtkNew->pManFunc, Abc_ObjFaninC0(pObj), Abc_ObjFaninC1(pObj) ); } // share and create the latches @@ -302,7 +302,7 @@ Abc_Ntk_t * Abc_NtkSeqToLogicSop( Abc_Ntk_t * pNtk ) Seq_NtkShareLatchesClean( pNtk ); // add the latches and their names - Abc_NtkAddDummyLatchNames( pNtkNew ); + Abc_NtkAddDummyBoxNames( pNtkNew ); Abc_NtkOrderCisCos( pNtkNew ); // fix the problem with complemented and duplicated CO edges Abc_NtkLogicMakeSimpleCos( pNtkNew, 0 ); @@ -340,7 +340,7 @@ Abc_Ntk_t * Abc_NtkSeqToLogicSop_old( Abc_Ntk_t * pNtk ) if ( Abc_ObjFaninNum(pObj) == 0 ) continue; // duplicate the node - Abc_NtkDupObj(pNtkNew, pObj); + Abc_NtkDupObj(pNtkNew, pObj, 0); if ( Abc_ObjFaninNum(pObj) == 1 ) { assert( !Abc_ObjFaninC0(pObj) ); @@ -372,7 +372,7 @@ Abc_Ntk_t * Abc_NtkSeqToLogicSop_old( Abc_Ntk_t * pNtk ) // the complemented edges are subsumed by the node function } // add the latches and their names - Abc_NtkAddDummyLatchNames( pNtkNew ); + Abc_NtkAddDummyBoxNames( pNtkNew ); Abc_NtkOrderCisCos( pNtkNew ); // fix the problem with complemented and duplicated CO edges Abc_NtkLogicMakeSimpleCos( pNtkNew, 0 ); diff --git a/src/base/seq/seqFpgaCore.c b/src/base/seq/seqFpgaCore.c index c6360363..b106ded2 100644 --- a/src/base/seq/seqFpgaCore.c +++ b/src/base/seq/seqFpgaCore.c @@ -126,7 +126,7 @@ Abc_Ntk_t * Seq_NtkFpgaDup( Abc_Ntk_t * pNtk ) // duplicate the nodes in the mapping Vec_PtrForEachEntry( p->vMapAnds, pObj, i ) - Abc_NtkDupObj( pNtkNew, pObj ); + Abc_NtkDupObj( pNtkNew, pObj, 0 ); // recursively construct the internals of each node Vec_PtrForEachEntry( p->vMapAnds, pObj, i ) @@ -321,7 +321,7 @@ Abc_Ntk_t * Seq_NtkSeqFpgaMapped( Abc_Ntk_t * pNtk ) } // add the latches and their names - Abc_NtkAddDummyLatchNames( pNtkMap ); + Abc_NtkAddDummyBoxNames( pNtkMap ); Abc_NtkOrderCisCos( pNtkMap ); // fix the problem with complemented and duplicated CO edges Abc_NtkLogicMakeSimpleCos( pNtkMap, 1 ); diff --git a/src/base/seq/seqMapCore.c b/src/base/seq/seqMapCore.c index 3db29abd..c465f31f 100644 --- a/src/base/seq/seqMapCore.c +++ b/src/base/seq/seqMapCore.c @@ -412,7 +412,7 @@ Abc_Ntk_t * Seq_NtkSeqMapMapped( Abc_Ntk_t * pNtk ) } // add the latches and their names - Abc_NtkAddDummyLatchNames( pNtkMap ); + Abc_NtkAddDummyBoxNames( pNtkMap ); Abc_NtkOrderCisCos( pNtkMap ); // fix the problem with complemented and duplicated CO edges Abc_NtkLogicMakeSimpleCos( pNtkMap, 1 ); diff --git a/src/base/seq/seqRetCore.c b/src/base/seq/seqRetCore.c index 1945826f..ba2c154c 100644 --- a/src/base/seq/seqRetCore.c +++ b/src/base/seq/seqRetCore.c @@ -125,14 +125,14 @@ Abc_Ntk_t * Seq_NtkRetimeDerive( Abc_Ntk_t * pNtk, int fVerbose ) Abc_NtkCleanCopy( pNtk ); // clone the PIs/POs/latches Abc_NtkForEachPi( pNtk, pObj, i ) - Abc_NtkDupObj( pNtkNew, pObj ); + Abc_NtkDupObj( pNtkNew, pObj, 0 ); Abc_NtkForEachPo( pNtk, pObj, i ) - Abc_NtkDupObj( pNtkNew, pObj ); + Abc_NtkDupObj( pNtkNew, pObj, 0 ); // copy the names Abc_NtkForEachPi( pNtk, pObj, i ) - Abc_NtkLogicStoreName( pObj->pCopy, Abc_ObjName(pObj) ); + Abc_ObjAssignName( pObj->pCopy, Abc_ObjName(pObj), NULL ); Abc_NtkForEachPo( pNtk, pObj, i ) - Abc_NtkLogicStoreName( pObj->pCopy, Abc_ObjName(pObj) ); + Abc_ObjAssignName( pObj->pCopy, Abc_ObjName(pObj), NULL ); // create one AND for each logic node in the topological order vMapAnds = Abc_NtkDfs( pNtk, 0 ); @@ -354,7 +354,7 @@ Abc_Ntk_t * Seq_NtkRetimeReconstruct( Abc_Ntk_t * pNtkOld, Abc_Ntk_t * pNtkSeq ) Abc_NtkForEachNode( pNtkOld, pObj, i ) { if ( i == 0 ) continue; - Abc_NtkDupObj( pNtkNew, pObj ); + Abc_NtkDupObj( pNtkNew, pObj, 0 ); pObj->pNext->pCopy = pObj->pCopy; } Abc_NtkForEachLatch( pNtkOld, pObj, i ) @@ -407,7 +407,7 @@ Abc_Ntk_t * Seq_NtkRetimeReconstruct( Abc_Ntk_t * pNtkOld, Abc_Ntk_t * pNtkSeq ) Seq_NtkShareLatchesClean( pNtkSeq ); // add the latches and their names - Abc_NtkAddDummyLatchNames( pNtkNew ); + Abc_NtkAddDummyBoxNames( pNtkNew ); Abc_NtkOrderCisCos( pNtkNew ); // fix the problem with complemented and duplicated CO edges Abc_NtkLogicMakeSimpleCos( pNtkNew, 1 ); -- cgit v1.2.3