X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftypes.h;h=94c291f6b5383bd9400e48471f1a1b8c70eb82e4;hp=aa1f34fc112eaadf00663778a94a5e3ba11f2440;hb=c7e7d9217b232eb7d75b083a45f001ef998c9deb;hpb=5a156df719790ddd882a928ddf721f8ba81587b1
diff --git a/src/types.h b/src/types.h
index aa1f34fc..94c291f6 100644
--- a/src/types.h
+++ b/src/types.h
@@ -1,7 +1,7 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, 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,7 +17,7 @@
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
@@ -26,7 +26,7 @@
/// For Windows, part of the configuration is detected automatically, but some
/// switches need to be set manually:
///
-/// -DNDEBUG | Disable debugging mode. Use always.
+/// -DNDEBUG | Disable debugging mode. Always use this.
///
/// -DNO_PREFETCH | Disable use of prefetch asm-instruction. A must if you want
/// | the executable to run on some very old machines.
@@ -42,6 +42,8 @@
#include "platform.h"
+#define unlikely(x) (x) // For code annotation purposes
+
#if defined(_WIN64) && !defined(IS_64BIT)
# include // MSVC popcnt and bsfq instrinsics
# define IS_64BIT
@@ -56,13 +58,14 @@
# 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(64))
+# define CACHE_LINE_ALIGNMENT __declspec(align(CACHE_LINE_SIZE))
#else
-# define CACHE_LINE_ALIGNMENT __attribute__ ((aligned(64)))
+# define CACHE_LINE_ALIGNMENT __attribute__ ((aligned(CACHE_LINE_SIZE)))
#endif
-#if defined(_MSC_VER)
+#ifdef _MSC_VER
# define FORCE_INLINE __forceinline
#elif defined(__GNUC__)
# define FORCE_INLINE inline __attribute__((always_inline))
@@ -70,13 +73,13 @@
# define FORCE_INLINE inline
#endif
-#if defined(USE_POPCNT)
+#ifdef USE_POPCNT
const bool HasPopCnt = true;
#else
const bool HasPopCnt = false;
#endif
-#if defined(IS_64BIT)
+#ifdef IS_64BIT
const bool Is64Bit = true;
#else
const bool Is64Bit = false;
@@ -85,60 +88,41 @@ const bool Is64Bit = false;
typedef uint64_t Key;
typedef uint64_t Bitboard;
-const int MAX_MOVES = 192;
+const int MAX_MOVES = 256;
const int MAX_PLY = 100;
-const int MAX_PLY_PLUS_2 = MAX_PLY + 2;
-
-const Bitboard FileABB = 0x0101010101010101ULL;
-const Bitboard FileBBB = FileABB << 1;
-const Bitboard FileCBB = FileABB << 2;
-const Bitboard FileDBB = FileABB << 3;
-const Bitboard FileEBB = FileABB << 4;
-const Bitboard FileFBB = FileABB << 5;
-const Bitboard FileGBB = FileABB << 6;
-const Bitboard FileHBB = FileABB << 7;
-
-const Bitboard Rank1BB = 0xFF;
-const Bitboard Rank2BB = Rank1BB << (8 * 1);
-const Bitboard Rank3BB = Rank1BB << (8 * 2);
-const Bitboard Rank4BB = Rank1BB << (8 * 3);
-const Bitboard Rank5BB = Rank1BB << (8 * 4);
-const Bitboard Rank6BB = Rank1BB << (8 * 5);
-const Bitboard Rank7BB = Rank1BB << (8 * 6);
-const Bitboard Rank8BB = Rank1BB << (8 * 7);
-
+const int MAX_PLY_PLUS_6 = MAX_PLY + 6;
/// 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)
///
/// 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
/// while MOVE_NONE and MOVE_NULL have the same origin and destination square.
enum Move {
- MOVE_NONE = 0,
+ MOVE_NONE,
MOVE_NULL = 65
};
enum MoveType {
- NORMAL = 0,
+ NORMAL,
PROMOTION = 1 << 14,
ENPASSANT = 2 << 14,
- CASTLE = 3 << 14
+ CASTLING = 3 << 14
};
-enum CastleRight { // Defined as in PolyGlot book hash key
- CASTLES_NONE = 0,
- WHITE_OO = 1,
- WHITE_OOO = 2,
- BLACK_OO = 4,
- BLACK_OOO = 8,
- ALL_CASTLES = 15,
- CASTLE_RIGHT_NB = 16
+enum CastlingFlag { // Defined as in PolyGlot book hash key
+ 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_FLAG_NB = 16
};
enum CastlingSide {
@@ -148,7 +132,7 @@ enum CastlingSide {
};
enum Phase {
- PHASE_ENDGAME = 0,
+ PHASE_ENDGAME,
PHASE_MIDGAME = 128,
MG = 0, EG = 1, PHASE_NB = 2
};
@@ -161,9 +145,9 @@ enum ScaleFactor {
};
enum Bound {
- BOUND_NONE = 0,
- BOUND_UPPER = 1,
- BOUND_LOWER = 2,
+ BOUND_NONE,
+ BOUND_UPPER,
+ BOUND_LOWER,
BOUND_EXACT = BOUND_UPPER | BOUND_LOWER
};
@@ -189,15 +173,15 @@ enum Value {
};
enum PieceType {
- NO_PIECE_TYPE = 0, ALL_PIECES = 0,
- PAWN = 1, KNIGHT = 2, BISHOP = 3, ROOK = 4, QUEEN = 5, KING = 6,
+ NO_PIECE_TYPE, PAWN, KNIGHT, BISHOP, ROOK, QUEEN, KING,
+ ALL_PIECES = 0,
PIECE_TYPE_NB = 8
};
enum Piece {
- NO_PIECE = 0,
- W_PAWN = 1, W_KNIGHT = 2, W_BISHOP = 3, W_ROOK = 4, W_QUEEN = 5, W_KING = 6,
- B_PAWN = 9, B_KNIGHT = 10, B_BISHOP = 11, B_ROOK = 12, B_QUEEN = 13, B_KING = 14,
+ NO_PIECE,
+ W_PAWN = 1, W_KNIGHT, W_BISHOP, W_ROOK, W_QUEEN, W_KING,
+ B_PAWN = 9, B_KNIGHT, B_BISHOP, B_ROOK, B_QUEEN, B_KING,
PIECE_NB = 16
};
@@ -210,8 +194,8 @@ enum Depth {
ONE_PLY = 2,
DEPTH_ZERO = 0 * ONE_PLY,
- DEPTH_QS_CHECKS = -1 * ONE_PLY,
- DEPTH_QS_NO_CHECKS = -2 * ONE_PLY,
+ DEPTH_QS_CHECKS = 0 * ONE_PLY,
+ DEPTH_QS_NO_CHECKS = -1 * ONE_PLY,
DEPTH_QS_RECAPTURES = -5 * ONE_PLY,
DEPTH_NONE = -127 * ONE_PLY
@@ -244,34 +228,35 @@ enum Square {
};
enum File {
- FILE_A, FILE_B, FILE_C, FILE_D, FILE_E, FILE_F, FILE_G, FILE_H, FILE_NB = 8
+ FILE_A, FILE_B, FILE_C, FILE_D, FILE_E, FILE_F, FILE_G, FILE_H, FILE_NB
};
enum Rank {
- RANK_1, RANK_2, RANK_3, RANK_4, RANK_5, RANK_6, RANK_7, RANK_8, RANK_NB = 8
+ RANK_1, RANK_2, RANK_3, RANK_4, RANK_5, RANK_6, RANK_7, RANK_8, RANK_NB
};
-/// 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.
+/// The Score enum stores a midgame 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 midgame value. The compiler is
+/// free to choose the enum type as long as it can store the data, so we
+/// ensure that Score is an integer type by assigning some big int values.
enum Score {
- SCORE_ZERO = 0,
+ SCORE_ZERO,
SCORE_ENSURE_INTEGER_SIZE_P = INT_MAX,
SCORE_ENSURE_INTEGER_SIZE_N = INT_MIN
};
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 + 32768) & ~0xffff) / 0x10000); }
+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.
+/// version. Therefore, in this case we use faster code that, although not 100%
+/// standard compliant, seems to work for Intel and MSVC.
#if defined(IS_64BIT) && (!defined(__GNUC__) || defined(__INTEL_COMPILER))
inline Value eg_value(Score s) { return Value(int16_t(s & 0xffff)); }
@@ -290,15 +275,15 @@ 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; }
+inline T& operator+=(T& d1, const T d2) { return d1 = d1 + d2; } \
+inline T& operator-=(T& d1, const T d2) { return d1 = d1 - d2; } \
+inline T& operator*=(T& d, int i) { return d = T(int(d) * i); }
#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++(T& d) { return d = T(int(d) + 1); } \
+inline T& operator--(T& d) { return d = T(int(d) - 1); } \
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; }
+inline T& operator/=(T& d, int i) { return d = T(int(d) / i); }
ENABLE_OPERATORS_ON(Value)
ENABLE_OPERATORS_ON(PieceType)
@@ -324,47 +309,26 @@ inline Score operator/(Score s, int i) {
return make_score(mg_value(s) / i, eg_value(s) / i);
}
-/// Weight score v by score w trying to prevent overflow
-inline Score apply_weight(Score v, Score w) {
- return make_score((int(mg_value(v)) * mg_value(w)) / 0x100,
- (int(eg_value(v)) * eg_value(w)) / 0x100);
-}
-
#undef ENABLE_OPERATORS_ON
#undef ENABLE_SAFE_OPERATORS_ON
-namespace Zobrist {
-
- extern Key psq[COLOR_NB][PIECE_TYPE_NB][SQUARE_NB];
- extern Key enpassant[FILE_NB];
- extern Key castle[CASTLE_RIGHT_NB];
- extern Key side;
- extern Key exclusion;
-
- void init();
-}
-
-CACHE_LINE_ALIGNMENT
-
-extern Score pieceSquareTable[PIECE_NB][SQUARE_NB];
extern Value PieceValue[PHASE_NB][PIECE_NB];
-extern int SquareDistance[SQUARE_NB][SQUARE_NB];
-struct MoveStack {
+struct ExtMove {
Move move;
int score;
};
-inline bool operator<(const MoveStack& f, const MoveStack& s) {
+inline bool operator<(const ExtMove& f, const ExtMove& 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) {
@@ -383,8 +347,8 @@ inline Piece make_piece(Color c, PieceType pt) {
return Piece((c << 3) | pt);
}
-inline CastleRight make_castle_right(Color c, CastlingSide s) {
- return CastleRight(WHITE_OO << ((s == QUEEN_SIDE) + 2 * c));
+inline CastlingFlag make_castling_flag(Color c, CastlingSide s) {
+ return CastlingFlag(WHITE_OO << ((s == QUEEN_SIDE) + 2 * c));
}
inline PieceType type_of(Piece p) {
@@ -408,10 +372,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));
}
@@ -429,18 +389,6 @@ inline bool opposite_colors(Square s1, Square s2) {
return ((s >> 3) ^ s) & 1;
}
-inline int file_distance(Square s1, Square s2) {
- return abs(file_of(s1) - file_of(s2));
-}
-
-inline int rank_distance(Square s1, Square s2) {
- return abs(rank_of(s1) - rank_of(s2));
-}
-
-inline int square_distance(Square s1, Square s2) {
- return SquareDistance[s1][s2];
-}
-
inline char file_to_char(File f, bool tolower = true) {
return char(f - FILE_A + (tolower ? 'a' : 'A'));
}
@@ -489,4 +437,4 @@ inline const std::string square_to_string(Square s) {
return ch;
}
-#endif // !defined(TYPES_H_INCLUDED)
+#endif // #ifndef TYPES_H_INCLUDED