diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2017-02-10 17:51:42 -0800 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2017-02-10 17:51:42 -0800 |
| commit | d4b491d849c32195408b0fcc3e5eb42085186824 (patch) | |
| tree | 5f4038bec69ad226fae546dcdc21532bd1fba135 | |
| parent | f7a1fe88fb43ea326af3625fc33a914b22e96336 (diff) | |
| download | abc-d4b491d849c32195408b0fcc3e5eb42085186824.tar.gz abc-d4b491d849c32195408b0fcc3e5eb42085186824.tar.bz2 abc-d4b491d849c32195408b0fcc3e5eb42085186824.zip | |
Changes to compile on Windows.
| -rw-r--r-- | abclib.dsp | 4 | ||||
| -rw-r--r-- | src/sat/satoko/utils/fixed.h | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -2031,6 +2031,10 @@ SOURCE=.\src\sat\satoko\cnf_reader.c # End Source File # Begin Source File +SOURCE=.\src\sat\satoko\utils\fixed.h +# End Source File +# Begin Source File + SOURCE=.\src\sat\satoko\utils\heap.h # End Source File # Begin Source File diff --git a/src/sat/satoko/utils/fixed.h b/src/sat/satoko/utils/fixed.h index 91fc9b79..bddd1bb4 100644 --- a/src/sat/satoko/utils/fixed.h +++ b/src/sat/satoko/utils/fixed.h @@ -16,11 +16,11 @@ ABC_NAMESPACE_HEADER_START typedef unsigned fixed_t; static const int FIXED_W_BITS = 16; /* */ -static const int FIXED_F_BITS = 32 - FIXED_W_BITS; -static const int FIXED_F_MASK = (1 << FIXED_F_BITS) - 1; +static const int FIXED_F_BITS = 16;//32 - FIXED_W_BITS; +static const int FIXED_F_MASK = 0xFFFF; //(1 << FIXED_F_BITS) - 1; static const fixed_t FIXED_MAX = 0xFFFFFFFF; static const fixed_t FIXED_MIN = 0x00000000; -static const fixed_t FIXED_ONE = (1 << FIXED_F_BITS); +static const fixed_t FIXED_ONE = 0x10000;//(1 << FIXED_F_BITS); /* Conversion functions */ static inline fixed_t uint2fixed(unsigned a) { return a * FIXED_ONE; } |