X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftypes.h;h=226d76e44d63a3607a8c2e45452871522c2e0460;hp=45afb3a76ef1fd9148e2e976da26c2c1ff032c57;hb=94b9c65e09b5d396bebb29b62d9979139b5fbdfa;hpb=187451294f02c2b6424c9679a12c901e336a4180

diff --git a/src/types.h b/src/types.h
index 45afb3a7..226d76e4 100644
--- a/src/types.h
+++ b/src/types.h
@@ -52,26 +52,31 @@ typedef uint64_t Bitboard;
 //// Configuration
 ////
 
-//// For Linux configuration is done using Makefile. To get started type "make help".
+//// For Linux and OSX configuration is done automatically using Makefile.
+//// To get started type "make help".
 ////
-//// For windows you need to set the right compiler switches manually:
+//// For windows part of the configuration is detected automatically, but
+//// some switches need to be set manually:
 ////
 //// -DNDEBUG       | Disable debugging mode. Use always.
 ////
-//// -DIS_64BIT     | Compile in 64-bit mode. Use on 64-bit systems.
-////
-//// -DBIGENDIAN    | Should not be used on Windows
-////
 //// -DNO_PREFETCH  | Disable use of prefetch asm-instruction. A must if you want the
 ////                | executable to run on some very old machines.
 ////
-//// -DUSE_BSFQ     | Use bsfq asm-instruction. Works only in 64-bit mode.
-////                | Works with ICC and GCC, not with MSVC. Gives a small speed up.
-////
 //// -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.
 
+// Automatic detection for 64-bit under Windows
+#if defined(_WIN64)
+#define IS_64BIT
+#endif
+
+// Automatic detection for use of bsfq asm-instruction under Windows.
+// Works only in 64-bit mode. Does not work with MSVC.
+#if defined(_WIN64) && defined(__INTEL_COMPILER)
+#define USE_BSFQ
+#endif
 
 // Cache line alignment specification
 #if defined(_MSC_VER) || defined(__INTEL_COMPILER)
@@ -104,4 +109,46 @@ inline void __cpuid(int CPUInfo[4], int)
 }
 #endif
 
+
+// Templetized operators used by enum types like Depth, Piece, Square and so on.
+// We don't want to write the same inline for each different enum. Note that we
+// pass by value (to silence scaring warnings on volatiles), so you really should
+// use only enum types with these functions to avoid hidden copies.
+
+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(i * int(d)); }
+
+template<typename T>
+inline T operator* (const T d, int i) { 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 T operator- (const T d) { return T(-int(d)); }
+
+template<typename T>
+inline void operator++ (T& d, int) { d = T(int(d) + 1); }
+
+template<typename T>
+inline void operator-- (T& d, int) { d = T(int(d) - 1); }
+
+template<typename T>
+inline void operator+= (T& d1, const T d2) { d1 = d1 + d2; }
+
+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); }
+
 #endif // !defined(TYPES_H_INCLUDED)