X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftypes.h;h=10dfdb07183d1a09c7f8b281f8b71bb1e7301445;hb=0784bd542bf17679febd9d9d87858fd0fd0424f9;hp=444d7afd3d08eeab3132c389c155cae066a1ccd5;hpb=8cff4862a65bdbf156609fea14f47ea4bdf42df3;p=stockfish
diff --git a/src/types.h b/src/types.h
index 444d7afd..10dfdb07 100644
--- a/src/types.h
+++ b/src/types.h
@@ -1,7 +1,8 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad
+ 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
@@ -17,67 +18,80 @@
along with this program. If not, see .
*/
-#if !defined(TYPES_H_INCLUDED)
+#ifndef TYPES_H_INCLUDED
#define TYPES_H_INCLUDED
-/// For Linux and OSX configuration is done automatically using Makefile. To get
-/// started type 'make help'.
+/// When compiling with provided Makefile (e.g. for Linux and OSX), configuration
+/// is done automatically. To get started type 'make help'.
///
-/// For Windows, part of the configuration is detected automatically, but some
-/// switches need to be set manually:
+/// When Makefile is not used (e.g. with Microsoft Visual Studio) some switches
+/// need to be set manually:
///
-/// -DNDEBUG | Disable debugging mode. Use always.
+/// -DNDEBUG | Disable debugging mode. Always use this for release.
///
-/// -DNO_PREFETCH | Disable use of prefetch asm-instruction. A must if you want
-/// | the executable to run on some very old machines.
+/// -DNO_PREFETCH | Disable use of prefetch asm-instruction. You may need this to
+/// | run on some very old machines.
///
/// -DUSE_POPCNT | Add runtime support for use of popcnt asm-instruction. Works
-/// | only in 64-bit mode. For compiling requires hardware with
-/// | popcnt support.
+/// | only in 64-bit mode and requires hardware with popcnt support.
+///
+/// -DUSE_PEXT | Add runtime support for use of pext asm-instruction. Works
+/// | only in 64-bit mode and requires hardware with pext support.
#include
#include
#include
+#include
#include
-#include "platform.h"
+#if defined(_MSC_VER)
+// Disable some silly and noisy warning from MSVC compiler
+#pragma warning(disable: 4127) // Conditional expression is constant
+#pragma warning(disable: 4146) // Unary minus operator applied to unsigned type
+#pragma warning(disable: 4800) // Forcing value to bool 'true' or 'false'
+#endif
-#if defined(_WIN64) && !defined(IS_64BIT)
-# include // MSVC popcnt and bsfq instrinsics
+/// Predefined macros hell:
+///
+/// __GNUC__ Compiler is gcc, Clang or Intel on Linux
+/// __INTEL_COMPILER Compiler is Intel
+/// _MSC_VER Compiler is MSVC or Intel on Windows
+/// _WIN32 Building on Windows (any)
+/// _WIN64 Building on Windows 64 bit
+
+#if defined(_WIN64) && defined(_MSC_VER) // No Makefile used
+# include // Microsoft header for _BitScanForward64()
# define IS_64BIT
-# define USE_BSFQ
#endif
-#if defined(USE_POPCNT) && defined(_MSC_VER) && defined(__INTEL_COMPILER)
-# include // Intel header for _mm_popcnt_u64() intrinsic
+#if defined(USE_POPCNT) && (defined(__INTEL_COMPILER) || defined(_MSC_VER))
+# include // Intel and Microsoft header for _mm_popcnt_u64()
#endif
-# if !defined(NO_PREFETCH) && (defined(__INTEL_COMPILER) || defined(_MSC_VER))
-# include // Intel and Microsoft header for _mm_prefetch()
-# endif
-
-#define CACHE_LINE_SIZE 64
-#if defined(_MSC_VER) || defined(__INTEL_COMPILER)
-# define CACHE_LINE_ALIGNMENT __declspec(align(CACHE_LINE_SIZE))
-#else
-# define CACHE_LINE_ALIGNMENT __attribute__ ((aligned(CACHE_LINE_SIZE)))
+#if !defined(NO_PREFETCH) && (defined(__INTEL_COMPILER) || defined(_MSC_VER))
+# include // Intel and Microsoft header for _mm_prefetch()
#endif
-#if defined(_MSC_VER)
-# define FORCE_INLINE __forceinline
-#elif defined(__GNUC__)
-# define FORCE_INLINE inline __attribute__((always_inline))
+#if defined(USE_PEXT)
+# include // Header for _pext_u64() intrinsic
+# define pext(b, m) _pext_u64(b, m)
#else
-# define FORCE_INLINE inline
+# define pext(b, m) (0)
#endif
-#if defined(USE_POPCNT)
+#ifdef USE_POPCNT
const bool HasPopCnt = true;
#else
const bool HasPopCnt = false;
#endif
-#if defined(IS_64BIT)
+#ifdef USE_PEXT
+const bool HasPext = true;
+#else
+const bool HasPext = false;
+#endif
+
+#ifdef IS_64BIT
const bool Is64Bit = true;
#else
const bool Is64Bit = false;
@@ -86,16 +100,16 @@ const bool Is64Bit = false;
typedef uint64_t Key;
typedef uint64_t Bitboard;
-const int MAX_MOVES = 192;
-const int MAX_PLY = 100;
-const int MAX_PLY_PLUS_2 = MAX_PLY + 2;
+const int MAX_MOVES = 256;
+const int MAX_PLY = 128;
/// A move needs 16 bits to be stored
///
/// bit 0- 5: destination square (from 0 to 63)
/// bit 6-11: origin square (from 0 to 63)
/// bit 12-13: promotion piece type - 2 (from KNIGHT-2 to QUEEN-2)
-/// bit 14-15: special move flag: promotion (1), en passant (2), castle (3)
+/// bit 14-15: special move flag: promotion (1), en passant (2), castling (3)
+/// NOTE: EN-PASSANT bit is set only when a pawn can be captured
///
/// Special cases are MOVE_NONE and MOVE_NULL. We can sneak these in because in
/// any normal move destination square is always different from origin square
@@ -110,23 +124,31 @@ enum MoveType {
NORMAL,
PROMOTION = 1 << 14,
ENPASSANT = 2 << 14,
- CASTLE = 3 << 14
+ CASTLING = 3 << 14
};
-enum CastleRight { // Defined as in PolyGlot book hash key
- CASTLES_NONE,
- WHITE_OO,
- WHITE_OOO = WHITE_OO << 1,
- BLACK_OO = WHITE_OO << 2,
- BLACK_OOO = WHITE_OO << 3,
- ALL_CASTLES = WHITE_OO | WHITE_OOO | BLACK_OO | BLACK_OOO,
- CASTLE_RIGHT_NB = 16
+enum Color {
+ WHITE, BLACK, NO_COLOR, COLOR_NB = 2
};
enum CastlingSide {
- KING_SIDE,
- QUEEN_SIDE,
- CASTLING_SIDE_NB = 2
+ KING_SIDE, QUEEN_SIDE, CASTLING_SIDE_NB = 2
+};
+
+enum CastlingRight {
+ NO_CASTLING,
+ WHITE_OO,
+ WHITE_OOO = WHITE_OO << 1,
+ BLACK_OO = WHITE_OO << 2,
+ BLACK_OOO = WHITE_OO << 3,
+ ANY_CASTLING = WHITE_OO | WHITE_OOO | BLACK_OO | BLACK_OOO,
+ CASTLING_RIGHT_NB = 16
+};
+
+template struct MakeCastling {
+ static const CastlingRight
+ right = C == WHITE ? S == QUEEN_SIDE ? WHITE_OOO : WHITE_OO
+ : S == QUEEN_SIDE ? BLACK_OOO : BLACK_OO;
};
enum Phase {
@@ -136,10 +158,11 @@ enum Phase {
};
enum ScaleFactor {
- SCALE_FACTOR_DRAW = 0,
- SCALE_FACTOR_NORMAL = 64,
- SCALE_FACTOR_MAX = 128,
- SCALE_FACTOR_NONE = 255
+ SCALE_FACTOR_DRAW = 0,
+ SCALE_FACTOR_ONEPAWN = 48,
+ SCALE_FACTOR_NORMAL = 64,
+ SCALE_FACTOR_MAX = 128,
+ SCALE_FACTOR_NONE = 255
};
enum Bound {
@@ -149,25 +172,24 @@ enum Bound {
BOUND_EXACT = BOUND_UPPER | BOUND_LOWER
};
-enum Value {
+enum Value : int {
VALUE_ZERO = 0,
VALUE_DRAW = 0,
- VALUE_KNOWN_WIN = 15000,
- VALUE_MATE = 30000,
- VALUE_INFINITE = 30001,
- VALUE_NONE = 30002,
+ VALUE_KNOWN_WIN = 10000,
+ VALUE_MATE = 32000,
+ VALUE_INFINITE = 32001,
+ VALUE_NONE = 32002,
- VALUE_MATE_IN_MAX_PLY = VALUE_MATE - MAX_PLY,
- VALUE_MATED_IN_MAX_PLY = -VALUE_MATE + MAX_PLY,
-
- VALUE_ENSURE_INTEGER_SIZE_P = INT_MAX,
- VALUE_ENSURE_INTEGER_SIZE_N = INT_MIN,
+ VALUE_MATE_IN_MAX_PLY = VALUE_MATE - 2 * MAX_PLY,
+ 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 = 1278,
- QueenValueMg = 2521, QueenValueEg = 2558
+ KnightValueMg = 817, KnightValueEg = 896,
+ BishopValueMg = 836, BishopValueEg = 907,
+ RookValueMg = 1270, RookValueEg = 1356,
+ QueenValueMg = 2521, QueenValueEg = 2658,
+
+ MidgameLimit = 15581, EndgameLimit = 3998
};
enum PieceType {
@@ -183,20 +205,17 @@ enum Piece {
PIECE_NB = 16
};
-enum Color {
- WHITE, BLACK, NO_COLOR, COLOR_NB = 2
-};
-
enum Depth {
- ONE_PLY = 2,
+ ONE_PLY = 1,
- DEPTH_ZERO = 0 * ONE_PLY,
- DEPTH_QS_CHECKS = -1 * ONE_PLY,
- DEPTH_QS_NO_CHECKS = -2 * ONE_PLY,
- DEPTH_QS_RECAPTURES = -7 * ONE_PLY,
+ DEPTH_ZERO = 0,
+ DEPTH_QS_CHECKS = 0,
+ DEPTH_QS_NO_CHECKS = -1,
+ DEPTH_QS_RECAPTURES = -5,
- DEPTH_NONE = -127 * ONE_PLY
+ DEPTH_NONE = -6,
+ DEPTH_MAX = MAX_PLY
};
enum Square {
@@ -234,68 +253,67 @@ enum Rank {
};
-/// Score enum keeps a midgame and an endgame value in a single integer (enum),
-/// first LSB 16 bits are used to store endgame value, while upper bits are used
-/// for midgame value. Compiler is free to choose the enum type as long as can
-/// keep its data, so ensure Score to be an integer type.
-enum Score {
- SCORE_ZERO,
- SCORE_ENSURE_INTEGER_SIZE_P = INT_MAX,
- SCORE_ENSURE_INTEGER_SIZE_N = INT_MIN
-};
+/// Score enum stores a middlegame and an endgame value in a single integer
+/// (enum). The least significant 16 bits are used to store the endgame value
+/// and the upper 16 bits are used to store the middlegame value.
+enum Score : int { SCORE_ZERO };
-inline Score make_score(int mg, int eg) { return Score((mg << 16) + eg); }
+inline Score make_score(int mg, int eg) {
+ return Score((mg << 16) + eg);
+}
-/// Extracting the signed lower and upper 16 bits it not so trivial because
+/// Extracting the signed lower and upper 16 bits is not so trivial because
/// according to the standard a simple cast to short is implementation defined
/// and so is a right shift of a signed integer.
-inline Value mg_value(Score s) { return Value(((s + 0x8000) & ~0xffff) / 0x10000); }
-
-/// On Intel 64 bit we have a small speed regression with the standard conforming
-/// version, so use a faster code in this case that, although not 100% standard
-/// compliant it seems to work for Intel and MSVC.
-#if defined(IS_64BIT) && (!defined(__GNUC__) || defined(__INTEL_COMPILER))
+inline Value mg_value(Score s) {
-inline Value eg_value(Score s) { return Value(int16_t(s & 0xffff)); }
-
-#else
+ union { uint16_t u; int16_t s; } mg = { uint16_t(unsigned(s + 0x8000) >> 16) };
+ return Value(mg.s);
+}
inline Value eg_value(Score s) {
- return Value((int)(unsigned(s) & 0x7fffu) - (int)(unsigned(s) & 0x8000u));
-}
-#endif
+ union { uint16_t u; int16_t s; } eg = { uint16_t(unsigned(s)) };
+ return Value(eg.s);
+}
-#define ENABLE_SAFE_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) { return T(-int(d)); } \
-inline T& operator+=(T& d1, const T d2) { d1 = d1 + d2; return d1; } \
-inline T& operator-=(T& d1, const T d2) { d1 = d1 - d2; return d1; } \
-inline T& operator*=(T& d, int i) { d = T(int(d) * i); return d; }
-
-#define ENABLE_OPERATORS_ON(T) ENABLE_SAFE_OPERATORS_ON(T) \
-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 T operator/(const T d, int i) { return T(int(d) / i); } \
-inline T& operator/=(T& d, int i) { d = T(int(d) / i); return d; }
-
-ENABLE_OPERATORS_ON(Value)
-ENABLE_OPERATORS_ON(PieceType)
-ENABLE_OPERATORS_ON(Piece)
-ENABLE_OPERATORS_ON(Color)
-ENABLE_OPERATORS_ON(Depth)
-ENABLE_OPERATORS_ON(Square)
-ENABLE_OPERATORS_ON(File)
-ENABLE_OPERATORS_ON(Rank)
-
-/// Added operators for adding integers to a Value
+#define ENABLE_BASE_OPERATORS_ON(T) \
+inline T operator+(T d1, T d2) { return T(int(d1) + int(d2)); } \
+inline T operator-(T d1, T d2) { return T(int(d1) - int(d2)); } \
+inline T operator*(int i, T d) { return T(i * int(d)); } \
+inline T operator*(T d, int i) { return T(int(d) * i); } \
+inline T operator-(T d) { return T(-int(d)); } \
+inline T& operator+=(T& d1, T d2) { return d1 = d1 + d2; } \
+inline T& operator-=(T& d1, T d2) { return d1 = d1 - d2; } \
+inline T& operator*=(T& d, int i) { return d = T(int(d) * i); }
+
+#define ENABLE_FULL_OPERATORS_ON(T) \
+ENABLE_BASE_OPERATORS_ON(T) \
+inline T& operator++(T& d) { return d = T(int(d) + 1); } \
+inline T& operator--(T& d) { return d = T(int(d) - 1); } \
+inline T operator/(T d, int i) { return T(int(d) / i); } \
+inline int operator/(T d1, T d2) { return int(d1) / int(d2); } \
+inline T& operator/=(T& d, int i) { return d = T(int(d) / i); }
+
+ENABLE_FULL_OPERATORS_ON(Value)
+ENABLE_FULL_OPERATORS_ON(PieceType)
+ENABLE_FULL_OPERATORS_ON(Piece)
+ENABLE_FULL_OPERATORS_ON(Color)
+ENABLE_FULL_OPERATORS_ON(Depth)
+ENABLE_FULL_OPERATORS_ON(Square)
+ENABLE_FULL_OPERATORS_ON(File)
+ENABLE_FULL_OPERATORS_ON(Rank)
+
+ENABLE_BASE_OPERATORS_ON(Score)
+
+#undef ENABLE_FULL_OPERATORS_ON
+#undef ENABLE_BASE_OPERATORS_ON
+
+/// Additional operators to add integers to a Value
inline Value operator+(Value v, int i) { return Value(int(v) + i); }
inline Value operator-(Value v, int i) { return Value(int(v) - i); }
-
-ENABLE_SAFE_OPERATORS_ON(Score)
+inline Value& operator+=(Value& v, int i) { return v = v + i; }
+inline Value& operator-=(Value& v, int i) { return v = v - i; }
/// Only declared but not defined. We don't want to multiply two scores due to
/// a very high risk of overflow. So user should explicitly convert to integer.
@@ -306,30 +324,18 @@ inline Score operator/(Score s, int i) {
return make_score(mg_value(s) / i, eg_value(s) / i);
}
-#undef ENABLE_OPERATORS_ON
-#undef ENABLE_SAFE_OPERATORS_ON
-
extern Value PieceValue[PHASE_NB][PIECE_NB];
-struct MoveStack {
- Move move;
- int score;
-};
-
-inline bool operator<(const MoveStack& f, const MoveStack& s) {
- return f.score < s.score;
-}
-
inline Color operator~(Color c) {
- return Color(c ^ 1);
+ return Color(c ^ BLACK);
}
inline Square operator~(Square s) {
- return Square(s ^ 56); // Vertical flip SQ_A1 -> SQ_A8
+ return Square(s ^ SQ_A8); // Vertical flip SQ_A1 -> SQ_A8
}
-inline Square operator|(File f, Rank r) {
- return Square((r << 3) | f);
+inline CastlingRight operator|(Color c, CastlingSide s) {
+ return CastlingRight(WHITE_OO << ((s == QUEEN_SIDE) + 2 * c));
}
inline Value mate_in(int ply) {
@@ -340,21 +346,21 @@ inline Value mated_in(int ply) {
return -VALUE_MATE + ply;
}
-inline Piece make_piece(Color c, PieceType pt) {
- return Piece((c << 3) | pt);
+inline Square make_square(File f, Rank r) {
+ return Square((r << 3) | f);
}
-inline CastleRight make_castle_right(Color c, CastlingSide s) {
- return CastleRight(WHITE_OO << ((s == QUEEN_SIDE) + 2 * c));
+inline Piece make_piece(Color c, PieceType pt) {
+ return Piece((c << 3) | pt);
}
-inline PieceType type_of(Piece p) {
- return PieceType(p & 7);
+inline PieceType type_of(Piece pc) {
+ return PieceType(pc & 7);
}
-inline Color color_of(Piece p) {
- assert(p != NO_PIECE);
- return Color(p >> 3);
+inline Color color_of(Piece pc) {
+ assert(pc != NO_PIECE);
+ return Color(pc >> 3);
}
inline bool is_ok(Square s) {
@@ -369,10 +375,6 @@ inline Rank rank_of(Square s) {
return Rank(s >> 3);
}
-inline Square mirror(Square s) {
- return Square(s ^ 7); // Horizontal flip SQ_A1 -> SQ_H1
-}
-
inline Square relative_square(Color c, Square s) {
return Square(s ^ (c * 56));
}
@@ -390,14 +392,6 @@ inline bool opposite_colors(Square s1, Square s2) {
return ((s >> 3) ^ s) & 1;
}
-inline char file_to_char(File f, bool tolower = true) {
- return char(f - FILE_A + (tolower ? 'a' : 'A'));
-}
-
-inline char rank_to_char(Rank r) {
- return char(r - RANK_1 + '1');
-}
-
inline Square pawn_push(Color c) {
return c == WHITE ? DELTA_N : DELTA_S;
}
@@ -415,7 +409,7 @@ inline MoveType type_of(Move m) {
}
inline PieceType promotion_type(Move m) {
- return PieceType(((m >> 12) & 3) + 2);
+ return PieceType(((m >> 12) & 3) + KNIGHT);
}
inline Move make_move(Square from, Square to) {
@@ -428,14 +422,7 @@ inline Move make(Square from, Square to, PieceType pt = KNIGHT) {
}
inline bool is_ok(Move m) {
- return from_sq(m) != to_sq(m); // Catches also MOVE_NULL and MOVE_NONE
-}
-
-#include
-
-inline const std::string square_to_string(Square s) {
- char ch[] = { file_to_char(file_of(s)), rank_to_char(rank_of(s)), 0 };
- return ch;
+ return from_sq(m) != to_sq(m); // Catch MOVE_NULL and MOVE_NONE
}
-#endif // !defined(TYPES_H_INCLUDED)
+#endif // #ifndef TYPES_H_INCLUDED