diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2011-10-27 23:34:11 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2011-10-27 23:34:11 -0700 |
| commit | f08be2742e892b7b81f234785cbbae85c61ab024 (patch) | |
| tree | 185a735442567e15120825753a91ac5d29214ce1 /src/map/if | |
| parent | 24d27e5524fd40297078065a76934f596abfa80e (diff) | |
| download | abc-f08be2742e892b7b81f234785cbbae85c61ab024.tar.gz abc-f08be2742e892b7b81f234785cbbae85c61ab024.tar.bz2 abc-f08be2742e892b7b81f234785cbbae85c61ab024.zip | |
C++ portability changes.
Diffstat (limited to 'src/map/if')
| -rw-r--r-- | src/map/if/if.h | 4 | ||||
| -rw-r--r-- | src/map/if/ifDec16.c | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/map/if/if.h b/src/map/if/if.h index 54bc9206..47a5498c 100644 --- a/src/map/if/if.h +++ b/src/map/if/if.h @@ -426,6 +426,10 @@ extern int If_CutPerformCheck08( If_Man_t * p, unsigned * pTruth, in extern int If_CutPerformCheck10( If_Man_t * p, unsigned * pTruth, int nVars, int nLeaves, char * pStr ); extern int If_CutPerformCheck16( If_Man_t * p, unsigned * pTruth, int nVars, int nLeaves, char * pStr ); extern float If_CutDelayLutStruct( If_Man_t * p, If_Cut_t * pCut, char * pStr, float WireDelay ); +extern int If_CluCheckExt( void * p, word * pTruth, int nVars, int nLutLeaf, int nLutRoot, + char * pLut0, char * pLut1, word * pFunc0, word * pFunc1 ); +extern int If_CluCheckExt3( void * p, word * pTruth, int nVars, int nLutLeaf, int nLutLeaf2, int nLutRoot, + char * pLut0, char * pLut1, char * pLut2, word * pFunc0, word * pFunc1, word * pFunc2 ); /*=== ifLib.c =============================================================*/ extern If_Lib_t * If_LutLibRead( char * FileName ); extern If_Lib_t * If_LutLibDup( If_Lib_t * p ); diff --git a/src/map/if/ifDec16.c b/src/map/if/ifDec16.c index cf9a80e0..606fb912 100644 --- a/src/map/if/ifDec16.c +++ b/src/map/if/ifDec16.c @@ -19,6 +19,7 @@ ***********************************************************************/ #include "if.h" +#include "kit.h" ABC_NAMESPACE_IMPL_START @@ -1780,9 +1781,10 @@ If_Grp_t If_CluCheck3( If_Man_t * p, word * pTruth0, int nVars, int nLutLeaf, in } // returns the best group found -int If_CluCheckExt( If_Man_t * p, word * pTruth, int nVars, int nLutLeaf, int nLutRoot, +int If_CluCheckExt( void * pMan, word * pTruth, int nVars, int nLutLeaf, int nLutRoot, char * pLut0, char * pLut1, word * pFunc0, word * pFunc1 ) { + If_Man_t * p = (If_Man_t *)pMan; If_Grp_t G, R; G = If_CluCheck( p, pTruth, nVars, 0, nLutLeaf, nLutRoot, &R, pFunc0, pFunc1, NULL, 0 ); memcpy( pLut0, &R, sizeof(If_Grp_t) ); @@ -1792,9 +1794,10 @@ int If_CluCheckExt( If_Man_t * p, word * pTruth, int nVars, int nLutLeaf, int nL } // returns the best group found -int If_CluCheckExt3( If_Man_t * p, word * pTruth, int nVars, int nLutLeaf, int nLutLeaf2, int nLutRoot, +int If_CluCheckExt3( void * pMan, word * pTruth, int nVars, int nLutLeaf, int nLutLeaf2, int nLutRoot, char * pLut0, char * pLut1, char * pLut2, word * pFunc0, word * pFunc1, word * pFunc2 ) { + If_Man_t * p = (If_Man_t *)pMan; If_Grp_t G, G2, R; G = If_CluCheck3( p, pTruth, nVars, nLutLeaf, nLutLeaf2, nLutRoot, &R, &G2, pFunc0, pFunc1, pFunc2 ); memcpy( pLut0, &R, sizeof(If_Grp_t) ); |