summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Mishchenko <alanmi@berkeley.edu>2014-04-22 18:31:46 -0700
committerAlan Mishchenko <alanmi@berkeley.edu>2014-04-22 18:31:46 -0700
commitd80efa1b49f5af926d0d07919034ab1b95b1ce78 (patch)
treeb8115c84dc62151dfa2709ee1ff1521a48a1b5d6
parent375b46a355608c119a7dc44eb78468d83e0809b9 (diff)
downloadabc-d80efa1b49f5af926d0d07919034ab1b95b1ce78.tar.gz
abc-d80efa1b49f5af926d0d07919034ab1b95b1ce78.tar.bz2
abc-d80efa1b49f5af926d0d07919034ab1b95b1ce78.zip
Bug fix in if -g when choices are used.
-rw-r--r--src/base/abci/abcIf.c2
-rw-r--r--src/misc/extra/extraUtilCube.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/base/abci/abcIf.c b/src/base/abci/abcIf.c
index 11707760..50abb6c7 100644
--- a/src/base/abci/abcIf.c
+++ b/src/base/abci/abcIf.c
@@ -504,7 +504,7 @@ Abc_Obj_t * Abc_NodeFromIf_rec( Abc_Ntk_t * pNtkNew, If_Man_t * pIfMan, If_Obj_t
pNodeNew->pData = Kit_TruthToHop( (Hop_Man_t *)pNtkNew->pManFunc, (unsigned *)pTruth, If_CutLeaveNum(pCutBest), vCover );
}
// complement the node if the cut was complemented
- if ( pCutBest->fCompl )
+ if ( pCutBest->fCompl && !pIfMan->pPars->fDelayOpt && !pIfMan->pPars->fDsdBalance )
Abc_NodeComplement( pNodeNew );
}
else
diff --git a/src/misc/extra/extraUtilCube.c b/src/misc/extra/extraUtilCube.c
index b08a4a21..7c3bc6aa 100644
--- a/src/misc/extra/extraUtilCube.c
+++ b/src/misc/extra/extraUtilCube.c
@@ -32,7 +32,7 @@ ABC_NAMESPACE_IMPL_START
////////////////////////////////////////////////////////////////////////
static inline void Abc_StatePush( Vec_Int_t * vData, char * pState, int k ) { int i; for ( i = 0; i < 6; i++ ) Vec_IntWriteEntry(vData, 6*k+i, ((int*)pState)[i]); }
-static inline void Abc_StatePerm( char * pState, char * pPerm, char * pRes ) { int i; for ( i = 0; i < 24; i++ ) pRes[i] = pState[pPerm[i]]; }
+static inline void Abc_StatePerm( char * pState, char * pPerm, char * pRes ) { int i; for ( i = 0; i < 24; i++ ) pRes[i] = pState[(int)pPerm[i]]; }
static inline void Abc_StatePrint( char * pState ) { int i; for ( i = 0; i < 24; i++ ) printf(" %2d", pState[i]); printf( "\n" ); }
////////////////////////////////////////////////////////////////////////