diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-08-09 18:55:30 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-08-09 18:55:30 -0700 |
| commit | 518410af359e2e4dcb61613fcebcb6dfe85cae08 (patch) | |
| tree | 029e908133a5cb329ba7be5e4bbb0a104203e5eb | |
| parent | 20518f59d12c8dcb7e0ae9046edd937da7f1f6fe (diff) | |
| download | abc-518410af359e2e4dcb61613fcebcb6dfe85cae08.tar.gz abc-518410af359e2e4dcb61613fcebcb6dfe85cae08.tar.bz2 abc-518410af359e2e4dcb61613fcebcb6dfe85cae08.zip | |
Compiler warnings.
| -rw-r--r-- | src/bool/lucky/lucky.c | 2 | ||||
| -rw-r--r-- | src/bool/lucky/luckyInt.h | 20 | ||||
| -rw-r--r-- | src/bool/lucky/luckySwap.c | 13 |
3 files changed, 18 insertions, 17 deletions
diff --git a/src/bool/lucky/lucky.c b/src/bool/lucky/lucky.c index 27d8c098..8fc413be 100644 --- a/src/bool/lucky/lucky.c +++ b/src/bool/lucky/lucky.c @@ -85,7 +85,7 @@ void sortAndUnique(word** a, Abc_TtStore_t* p) { int i, count=1, WordsPtrN = p->nFuncs; word* tempWordPtr; - qsort(a,WordsPtrN,sizeof(word*),compareWords3); + qsort(a,WordsPtrN,sizeof(word*),(int(*)(const void *,const void *))compareWords3); tempWordPtr = a[0]; for(i=1;i<WordsPtrN;i++) if(memcmp(a[i],tempWordPtr,sizeof(word)*(p->nWords)) != 0) diff --git a/src/bool/lucky/luckyInt.h b/src/bool/lucky/luckyInt.h index 3848069a..295d3c30 100644 --- a/src/bool/lucky/luckyInt.h +++ b/src/bool/lucky/luckyInt.h @@ -35,27 +35,15 @@ #define ABC_NAMESPACE_IMPL_START #define ABC_NAMESPACE_IMPL_END typedef unsigned __int64 word; -#endif - - -ABC_NAMESPACE_HEADER_START - - #define bool int #define false 0 #define true 1 #define inline __inline // compatible with MS VS 6.0 #define ABC_ALLOC(type, num) ((type *) malloc(sizeof(type) * (num))) -static word mask1[6] = { 0xAAAAAAAAAAAAAAAA,0xCCCCCCCCCCCCCCCC, 0xF0F0F0F0F0F0F0F0,0xFF00FF00FF00FF00,0xFFFF0000FFFF0000, 0xFFFFFFFF00000000 }; -static word mask0[6] = { 0x5555555555555555,0x3333333333333333, 0x0F0F0F0F0F0F0F0F,0x00FF00FF00FF00FF,0x0000FFFF0000FFFF, 0x00000000FFFFFFFF}; -static word mask[6][2] = { - {0x5555555555555555,0xAAAAAAAAAAAAAAAA}, - {0x3333333333333333,0xCCCCCCCCCCCCCCCC}, - {0x0F0F0F0F0F0F0F0F,0xF0F0F0F0F0F0F0F0}, - {0x00FF00FF00FF00FF,0xFF00FF00FF00FF00}, - {0x0000FFFF0000FFFF,0xFFFF0000FFFF0000}, - {0x00000000FFFFFFFF,0xFFFFFFFF00000000} -}; +#endif + + +ABC_NAMESPACE_HEADER_START typedef struct { diff --git a/src/bool/lucky/luckySwap.c b/src/bool/lucky/luckySwap.c index cd3adaa6..46db2b0f 100644 --- a/src/bool/lucky/luckySwap.c +++ b/src/bool/lucky/luckySwap.c @@ -19,6 +19,19 @@ ABC_NAMESPACE_IMPL_START +static word mask0[6] = { 0x5555555555555555,0x3333333333333333, 0x0F0F0F0F0F0F0F0F,0x00FF00FF00FF00FF,0x0000FFFF0000FFFF, 0x00000000FFFFFFFF}; +/* +static word mask1[6] = { 0xAAAAAAAAAAAAAAAA,0xCCCCCCCCCCCCCCCC, 0xF0F0F0F0F0F0F0F0,0xFF00FF00FF00FF00,0xFFFF0000FFFF0000, 0xFFFFFFFF00000000 }; +static word mask[6][2] = { + {0x5555555555555555,0xAAAAAAAAAAAAAAAA}, + {0x3333333333333333,0xCCCCCCCCCCCCCCCC}, + {0x0F0F0F0F0F0F0F0F,0xF0F0F0F0F0F0F0F0}, + {0x00FF00FF00FF00FF,0xFF00FF00FF00FF00}, + {0x0000FFFF0000FFFF,0xFFFF0000FFFF0000}, + {0x00000000FFFFFFFF,0xFFFFFFFF00000000} +}; +*/ + inline int Kit_TruthWordNum_64bit( int nVars ) { return nVars <= 6 ? 1 : (1 << (nVars - 6));} inline int Kit_WordCountOnes_64bit(word x) |