diff options
Diffstat (limited to 'src/map/if')
-rw-r--r-- | src/map/if/if.h | 1 | ||||
-rw-r--r-- | src/map/if/ifDec16.c | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/map/if/if.h b/src/map/if/if.h index aac141fd..c51fa940 100644 --- a/src/map/if/if.h +++ b/src/map/if/if.h @@ -103,6 +103,7 @@ struct If_Par_t_ float DelayTarget; // delay target float Epsilon; // value used in comparison floating point numbers int nRelaxRatio; // delay relaxation ratio + int nStructType; // type of the structure int fPreprocess; // preprossing int fArea; // area-oriented mapping int fFancy; // a fancy feature diff --git a/src/map/if/ifDec16.c b/src/map/if/ifDec16.c index aa73f445..de1d9ac4 100644 --- a/src/map/if/ifDec16.c +++ b/src/map/if/ifDec16.c @@ -24,8 +24,6 @@ ABC_NAMESPACE_IMPL_START -#define IF_USE_CASE3 0 // 0 allowed; 1 not allowed; 2 exclusive - //////////////////////////////////////////////////////////////////////// /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// @@ -2020,11 +2018,11 @@ If_Grp_t If_CluCheck3( If_Man_t * p, word * pTruth0, int nVars, int nLutLeaf, in } // the new variable is at the bottom - skip it (iVarStart = 1) - if ( IF_USE_CASE3 == 0 ) + if ( p->pPars->nStructType == 0 ) // allowed G2 = If_CluCheck( p, pLeftOver, R2.nVars, 0, 0, nLutLeaf2, nLutRoot, &R, &Func0, &Func2, NULL, 0 ); - else if ( IF_USE_CASE3 == 1 ) + else if ( p->pPars->nStructType == 1 ) // not allowed G2 = If_CluCheck( p, pLeftOver, R2.nVars, 1, 0, nLutLeaf2, nLutRoot, &R, &Func0, &Func2, NULL, 0 ); - else if ( IF_USE_CASE3 == 2 ) + else if ( p->pPars->nStructType == 2 ) // required G2 = If_CluCheck( p, pLeftOver, R2.nVars, 0, 1, nLutLeaf2, nLutRoot, &R, &Func0, &Func2, NULL, 0 ); else assert( 0 ); |