X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftypes.h;h=67e40fffd2c53ba54164c8910f99fd407cdd0a98;hp=4931531b54a87f37e70628c035158c91b9642c8e;hb=842efefcad9c6100d0376e20c59264852d225920;hpb=80bee85d5f48cc1e06f16236a73c86a14c1d0756

diff --git a/src/types.h b/src/types.h
index 4931531b..67e40fff 100644
--- a/src/types.h
+++ b/src/types.h
@@ -17,36 +17,39 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(TYPES_H_INCLUDED)
 #define TYPES_H_INCLUDED
 
-#if !defined(_MSC_VER)
+#include <cstdlib>
 
-#include <inttypes.h>
+#if defined(_MSC_VER)
 
-#else
+// Disable some silly and noisy warning from MSVC compiler
+#pragma warning(disable: 4800) // Forcing value to bool 'true' or 'false'
+#pragma warning(disable: 4127) // Conditional expression is constant
 
-typedef __int8 int8_t;
-typedef unsigned __int8 uint8_t;
-typedef __int16 int16;
+// MSVC does not support <inttypes.h>
+typedef   signed __int8    int8_t;
+typedef unsigned __int8   uint8_t;
+typedef   signed __int16  int16_t;
 typedef unsigned __int16 uint16_t;
-typedef __int32 int32_t;
+typedef   signed __int32  int32_t;
 typedef unsigned __int32 uint32_t;
-typedef __int64 int64_t;
+typedef   signed __int64  int64_t;
 typedef unsigned __int64 uint64_t;
 
-typedef __int16 int16_t;
-typedef __int64 int64_t;
+#else
 
-#endif // !defined(_MSC_VER)
+#include <inttypes.h>
 
-// Hash keys
-typedef uint64_t Key;
+#endif
 
-// Bitboard type
+// Our hash key and bitboard types
+typedef uint64_t Key;
 typedef uint64_t Bitboard;
 
+#define Min(x, y) (((x) < (y)) ? (x) : (y))
+#define Max(x, y) (((x) < (y)) ? (y) : (x))
 
 ////
 //// Configuration
@@ -66,6 +69,10 @@ typedef uint64_t Bitboard;
 //// -DUSE_POPCNT   | Add runtime support for use of popcnt asm-instruction.
 ////                | Works only in 64-bit mode. For compiling requires hardware
 ////                | with popcnt support. Around 4% speed-up.
+////
+//// -DOLD_LOCKS    | By default under Windows are used the fast Slim Reader/Writer (SRW)
+////                | Locks and Condition Variables: these are not supported by Windows XP
+////                | and older, to compile for those platforms you should enable OLD_LOCKS.
 
 // Automatic detection for 64-bit under Windows
 #if defined(_WIN64)
@@ -78,6 +85,11 @@ typedef uint64_t Bitboard;
 #define USE_BSFQ
 #endif
 
+// Intel header for _mm_popcnt_u64() intrinsic
+#if defined(USE_POPCNT) && defined(_MSC_VER) && defined(__INTEL_COMPILER)
+#include <nmmintrin.h>
+#endif
+
 // Cache line alignment specification
 #if defined(_MSC_VER) || defined(__INTEL_COMPILER)
 #define CACHE_LINE_ALIGNMENT __declspec(align(64))
@@ -109,29 +121,29 @@ inline void __cpuid(int CPUInfo[4], int)
 }
 #endif
 
+// Define FORCE_INLINE macro to force inlining overriding compiler choice
+#if defined(_MSC_VER)
+#define FORCE_INLINE  __forceinline
+#elif defined(__GNUC__)
+#define FORCE_INLINE  inline __attribute__((always_inline))
+#else
+#define FORCE_INLINE  inline
+#endif
 
-// Templetized enum operations, we avoid to repeat the same inlines for each
-// different enum.
-
-template<typename T>
-inline T operator+ (const T d1, const T d2) { return T(int(d1) + int(d2)); }
-
-template<typename T>
-inline T operator- (const T d1, const T d2) { return T(int(d1) - int(d2)); }
-
-template<typename T>
-inline T operator* (int i, const T d) { return T(int(d) * i); }
-
-template<typename T>
-inline T operator/ (const T d, int i) { return T(int(d) / i); }
-
-template<typename T>
-inline void operator+= (T& d1, const T d2) { d1 = d1 + d2; }
-
-template<typename T>
-inline void operator*= (T& d, int i) { d = T(int(d) * i); }
-
-template<typename T>
-inline void operator/= (T &d, int i) { d = T(int(d) / i); }
+// Operators used by enum types like Depth, Piece, Square and so on.
+
+#define ENABLE_OPERATORS_ON(T) \
+inline T operator+ (const T d1, const T d2) { return T(int(d1) + int(d2)); } \
+inline T operator- (const T d1, const T d2) { return T(int(d1) - int(d2)); } \
+inline T operator* (int i, const T d) {  return T(i * int(d)); } \
+inline T operator* (const T d, int i) {  return T(int(d) * i); } \
+inline T operator/ (const T d, int i) { return T(int(d) / i); } \
+inline T operator- (const T d) { return T(-int(d)); } \
+inline T operator++ (T& d, int) {d = T(int(d) + 1); return d; } \
+inline T operator-- (T& d, int) { d = T(int(d) - 1); return d; } \
+inline void operator+= (T& d1, const T d2) { d1 = d1 + d2; } \
+inline void operator-= (T& d1, const T d2) { d1 = d1 - d2; } \
+inline void operator*= (T& d, int i) { d = T(int(d) * i); } \
+inline void operator/= (T& d, int i) { d = T(int(d) / i); }
 
 #endif // !defined(TYPES_H_INCLUDED)