diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2013-04-01 21:41:53 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2013-04-01 21:41:53 -0700 |
| commit | b902b00779be6ed036356c3fbca303e69d7f4d04 (patch) | |
| tree | 417f9691427b7c2eea6cf35d02d298bd8d8c9e0a | |
| parent | f99e5cd9d6c26987c3164dd28bae5b04c1404509 (diff) | |
| download | abc-b902b00779be6ed036356c3fbca303e69d7f4d04.tar.gz abc-b902b00779be6ed036356c3fbca303e69d7f4d04.tar.bz2 abc-b902b00779be6ed036356c3fbca303e69d7f4d04.zip | |
Small changes to LMS code.
| -rw-r--r-- | src/aig/gia/giaIf.c | 6 | ||||
| -rw-r--r-- | src/base/abci/abcRec3.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/aig/gia/giaIf.c b/src/aig/gia/giaIf.c index 0b6cc9ae..10f65af1 100644 --- a/src/aig/gia/giaIf.c +++ b/src/aig/gia/giaIf.c @@ -31,7 +31,7 @@ ABC_NAMESPACE_IMPL_START //////////////////////////////////////////////////////////////////////// extern int Kit_TruthToGia( Gia_Man_t * pMan, unsigned * pTruth, int nVars, Vec_Int_t * vMemory, Vec_Int_t * vLeaves, int fHash ); -extern int Abc_RecToGia2( Gia_Man_t * pMan, If_Man_t * pIfMan, If_Cut_t * pCut, If_Obj_t * pIfObj, Vec_Int_t * vLeaves, int fHash ); +extern int Abc_RecToGia3( Gia_Man_t * pMan, If_Man_t * pIfMan, If_Cut_t * pCut, Vec_Int_t * vLeaves, int fHash ); //////////////////////////////////////////////////////////////////////// /// FUNCTION DEFINITIONS /// @@ -387,6 +387,8 @@ int Gia_ManNodeIfSopToGiaInt( Gia_Man_t * pNew, Vec_Wrd_t * vAnds, int nVars, Ve iRes1 = Abc_LitNotCond( Vec_IntEntry(vResults, This.iFan1), This.fCompl1 ); if ( fHash ) iRes = Gia_ManHashAnd( pNew, iRes0, iRes1 ); + else if ( iRes0 == iRes1 ) + iRes = iRes0; else iRes = Gia_ManAppendAnd( pNew, iRes0, iRes1 ); Vec_IntPush( vResults, iRes ); @@ -527,7 +529,7 @@ Gia_Man_t * Gia_ManFromIf( If_Man_t * pIfMan ) else if ( pIfMan->pPars->fDelayOpt ) pIfObj->iCopy = Gia_ManNodeIfSopToGia( pNew, pIfMan, pCutBest, vLeaves, fHash ); else if ( pIfMan->pPars->fUserRecLib ) - pIfObj->iCopy = Abc_RecToGia2( pNew, pIfMan, pCutBest, pIfObj, vLeaves, fHash ); + pIfObj->iCopy = Abc_RecToGia3( pNew, pIfMan, pCutBest, vLeaves, fHash ); else pIfObj->iCopy = Gia_ManNodeIfToGia( pNew, pIfMan, pIfObj, vLeaves, fHash ); // complement the node if the TT was used and the cut was complemented diff --git a/src/base/abci/abcRec3.c b/src/base/abci/abcRec3.c index 00609926..689f73f2 100644 --- a/src/base/abci/abcRec3.c +++ b/src/base/abci/abcRec3.c @@ -1084,7 +1084,7 @@ Hop_Obj_t * Abc_RecToHop3( Hop_Man_t * pMan, If_Man_t * pIfMan, If_Cut_t * pCut, SeeAlso [] ***********************************************************************/ -int Abc_RecToGia3( Gia_Man_t * pMan, If_Man_t * pIfMan, If_Cut_t * pCut, If_Obj_t * pIfObj, Vec_Int_t * vLeaves, int fHash ) +int Abc_RecToGia3( Gia_Man_t * pMan, If_Man_t * pIfMan, If_Cut_t * pCut, Vec_Int_t * vLeaves, int fHash ) { Lms_Man_t * p = s_pMan3; char pCanonPerm[LMS_VAR_MAX]; |