Silence silly MSVC warning c4146

[stockfish] / src / types.h

diff --git a/src/types.h b/src/types.h
index 1a9dab7e4d45e1ce25890b1a5484d1e302d82b3f..76ef4cdbb6ad385d5931382f40ed6a75219c373c 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -20,16 +20,16 @@
 #if !defined(TYPES_H_INCLUDED)
 #define TYPES_H_INCLUDED
 
-#if !defined(_MSC_VER)
-
-#include <inttypes.h>
+#include <cstdlib>
 
-#else
+#if defined(_MSC_VER)
 
 // 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
+#pragma warning(disable: 4146) // Unary minus operator applied to unsigned type
 
+// MSVC does not support <inttypes.h>
 typedef   signed __int8    int8_t;
 typedef unsigned __int8   uint8_t;
 typedef   signed __int16  int16_t;
@@ -39,15 +39,18 @@ typedef unsigned __int32 uint32_t;
 typedef   signed __int64  int64_t;
 typedef unsigned __int64 uint64_t;
 
-#endif // !defined(_MSC_VER)
+#else
+
+#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;
 
-#include <cstdlib>
+#define Min(x, y) (((x) < (y)) ? (x) : (y))
+#define Max(x, y) (((x) < (y)) ? (y) : (x))
 
 ////
 //// Configuration
@@ -124,7 +127,7 @@ inline void __cpuid(int CPUInfo[4], int)
 #define FORCE_INLINE  __forceinline
 #elif defined(__GNUC__)
 #define FORCE_INLINE  inline __attribute__((always_inline))
-#elif
+#else
 #define FORCE_INLINE  inline
 #endif
 
@@ -144,4 +147,31 @@ 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); }
 
+
+/// cpu_has_popcnt() detects support for popcnt instruction at runtime
+inline bool cpu_has_popcnt() {
+
+  int CPUInfo[4] = {-1};
+  __cpuid(CPUInfo, 0x00000001);
+  return (CPUInfo[2] >> 23) & 1;
+}
+
+/// CpuHasPOPCNT is a global constant initialized at startup that
+/// is set to true if CPU on which application runs supports popcnt
+/// hardware instruction. Unless USE_POPCNT is not defined.
+#if defined(USE_POPCNT)
+const bool CpuHasPOPCNT = cpu_has_popcnt();
+#else
+const bool CpuHasPOPCNT = false;
+#endif
+
+
+/// CpuIs64Bit is a global constant initialized at compile time that
+/// is set to true if CPU on which application runs is a 64 bits.
+#if defined(IS_64BIT)
+const bool CpuIs64Bit = true;
+#else
+const bool CpuIs64Bit = false;
+#endif
+
 #endif // !defined(TYPES_H_INCLUDED)