diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2013-10-30 10:29:44 -0400 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2013-10-30 10:29:44 -0400 |
| commit | 80f46fa2ae6240c9439a8c01d806f922b625df48 (patch) | |
| tree | ce471955664e699ecf6b6086686e5429297b07da /src/bool | |
| parent | f4a250839dc1ff0ee4e4f027924a46baa4da2d78 (diff) | |
| download | abc-80f46fa2ae6240c9439a8c01d806f922b625df48.tar.gz abc-80f46fa2ae6240c9439a8c01d806f922b625df48.tar.bz2 abc-80f46fa2ae6240c9439a8c01d806f922b625df48.zip | |
Compiler warnings.
Diffstat (limited to 'src/bool')
| -rw-r--r-- | src/bool/lucky/luckyFast6.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/bool/lucky/luckyFast6.c b/src/bool/lucky/luckyFast6.c index f2e032fa..75135537 100644 --- a/src/bool/lucky/luckyFast6.c +++ b/src/bool/lucky/luckyFast6.c @@ -70,7 +70,7 @@ unsigned adjustInfoAfterSwap(char* pCanonPerm, unsigned uCanonPhase, int iVar, u } -inline word Extra_Truth6SwapAdjacent( word t, int iVar ) +word Extra_Truth6SwapAdjacent( word t, int iVar ) { // variable swapping code static word PMasks[5][3] = { @@ -83,7 +83,7 @@ inline word Extra_Truth6SwapAdjacent( word t, int iVar ) assert( iVar < 5 ); return (t & PMasks[iVar][0]) | ((t & PMasks[iVar][1]) << (1 << iVar)) | ((t & PMasks[iVar][2]) >> (1 << iVar)); } -inline word Extra_Truth6ChangePhase( word t, int iVar) +word Extra_Truth6ChangePhase( word t, int iVar) { // elementary truth tables static word Truth6[6] = { @@ -98,7 +98,7 @@ inline word Extra_Truth6ChangePhase( word t, int iVar) return ((t & ~Truth6[iVar]) << (1 << iVar)) | ((t & Truth6[iVar]) >> (1 << iVar)); } -inline word Extra_Truth6MinimumRoundOne( word t, int iVar, char* pCanonPerm, unsigned* pCanonPhase ) +word Extra_Truth6MinimumRoundOne( word t, int iVar, char* pCanonPerm, unsigned* pCanonPhase ) { word tCur, tMin = t; // ab unsigned info =0; @@ -155,7 +155,7 @@ inline word Extra_Truth6MinimumRoundOne( word t, int iVar, char* pCanonPerm, uns } } -inline word Extra_Truth6MinimumRoundOne_noEBFC( word t, int iVar, char* pCanonPerm, unsigned* pCanonPhase) +word Extra_Truth6MinimumRoundOne_noEBFC( word t, int iVar, char* pCanonPerm, unsigned* pCanonPhase) { word tMin; assert( iVar >= 0 && iVar < 5 ); @@ -173,7 +173,7 @@ inline word Extra_Truth6MinimumRoundOne_noEBFC( word t, int iVar, char* pCanonP // this function finds minimal for all TIED(and tied only) iVars //it finds tied vars based on rearranged Store info - group of tied vars has the same bit count in Store -inline word Extra_Truth6MinimumRoundMany( word t, int* pStore, char* pCanonPerm, unsigned* pCanonPhase ) +word Extra_Truth6MinimumRoundMany( word t, int* pStore, char* pCanonPerm, unsigned* pCanonPhase ) { int i, bitInfoTemp; word tMin0, tMin=t; @@ -192,7 +192,7 @@ inline word Extra_Truth6MinimumRoundMany( word t, int* pStore, char* pCanonPerm, return tMin; } -inline word Extra_Truth6MinimumRoundMany_noEBFC( word t, int* pStore, char* pCanonPerm, unsigned* pCanonPhase ) +word Extra_Truth6MinimumRoundMany_noEBFC( word t, int* pStore, char* pCanonPerm, unsigned* pCanonPhase ) { int i, bitInfoTemp; word tMin0, tMin=t; @@ -210,7 +210,7 @@ inline word Extra_Truth6MinimumRoundMany_noEBFC( word t, int* pStore, char* pCan }while ( tMin0 != tMin ); return tMin; } -inline word Extra_Truth6MinimumRoundMany1( word t, int* pStore, char* pCanonPerm, unsigned* pCanonPhase ) +word Extra_Truth6MinimumRoundMany1( word t, int* pStore, char* pCanonPerm, unsigned* pCanonPhase ) { word tMin0, tMin=t; char pCanonPerm1[16]; |