Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
/// _WIN32 Building on Windows (any)
/// _WIN64 Building on Windows 64 bit
-#if defined(_WIN64) && !defined(IS_64BIT) // Last condition means Makefile is not used
+#if defined(_WIN64) && defined(_MSC_VER) // No Makefile used
# include <intrin.h> // MSVC popcnt and bsfq instrinsics
# define IS_64BIT
-# define USE_BSFQ
#endif
-#if defined(USE_POPCNT) && defined(__INTEL_COMPILER) && defined(_MSC_VER)
+#if defined(USE_POPCNT) && (defined(__INTEL_COMPILER) || defined(_MSC_VER))
# include <nmmintrin.h> // Intel header for _mm_popcnt_u64() intrinsic
#endif
VALUE_MATED_IN_MAX_PLY = -VALUE_MATE + 2 * MAX_PLY,
PawnValueMg = 198, PawnValueEg = 258,
- KnightValueMg = 817, KnightValueEg = 846,
- BishopValueMg = 836, BishopValueEg = 857,
- RookValueMg = 1270, RookValueEg = 1281,
- QueenValueMg = 2521, QueenValueEg = 2558,
+ KnightValueMg = 817, KnightValueEg = 896,
+ BishopValueMg = 836, BishopValueEg = 907,
+ RookValueMg = 1270, RookValueEg = 1356,
+ QueenValueMg = 2521, QueenValueEg = 2658,
MidgameLimit = 15581, EndgameLimit = 3998
};
return Piece((c << 3) | pt);
}
-inline PieceType type_of(Piece pc) {
+inline PieceType type_of(Piece pc) {
return PieceType(pc & 7);
}