From d4b491d849c32195408b0fcc3e5eb42085186824 Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Fri, 10 Feb 2017 17:51:42 -0800 Subject: Changes to compile on Windows. --- abclib.dsp | 4 ++++ src/sat/satoko/utils/fixed.h | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/abclib.dsp b/abclib.dsp index f2fcf619..85307635 100644 --- a/abclib.dsp +++ b/abclib.dsp @@ -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; } -- cgit v1.2.3