X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftypes.h;h=2219b40becd8d929e8e73186374e2895b2411e40;hp=17661c01e800a12b3ee61108173e8773be171477;hb=feeafb0a50556654e345a09d16529a5eb7715dc0;hpb=dc7fd868f4fa41251a9521a0b25e3adb483bfd83 diff --git a/src/types.h b/src/types.h index 17661c01..2219b40b 100644 --- a/src/types.h +++ b/src/types.h @@ -41,7 +41,7 @@ #include "platform.h" -#if defined(_WIN64) +#if defined(_WIN64) && !defined(IS_64BIT) # include // MSVC popcnt and bsfq instrinsics # define IS_64BIT # define USE_BSFQ @@ -51,6 +51,10 @@ # include // Intel header for _mm_popcnt_u64() intrinsic #endif +# if !defined(NO_PREFETCH) && (defined(__INTEL_COMPILER) || defined(_MSC_VER)) +# include // Intel and Microsoft header for _mm_prefetch() +# endif + #if defined(_MSC_VER) || defined(__INTEL_COMPILER) # define CACHE_LINE_ALIGNMENT __declspec(align(64)) #else @@ -132,12 +136,20 @@ enum CastleRight { // Defined as in PolyGlot book hash key WHITE_OOO = 2, BLACK_OO = 4, BLACK_OOO = 8, - ALL_CASTLES = 15 + ALL_CASTLES = 15, + CASTLE_RIGHT_NB = 16 }; enum CastlingSide { KING_SIDE, - QUEEN_SIDE + QUEEN_SIDE, + CASTLING_SIDE_NB = 2 +}; + +enum Phase { + PHASE_ENDGAME = 0, + PHASE_MIDGAME = 128, + MG = 0, EG = 1, PHASE_NB = 2 }; enum ScaleFactor { @@ -151,7 +163,7 @@ enum Bound { BOUND_NONE = 0, BOUND_UPPER = 1, BOUND_LOWER = 2, - BOUND_EXACT = BOUND_UPPER | BOUND_LOWER + BOUND_EXACT = BOUND_UPPER | BOUND_LOWER | 4 }; enum Value { @@ -166,22 +178,30 @@ enum Value { VALUE_MATED_IN_MAX_PLY = -VALUE_MATE + MAX_PLY, VALUE_ENSURE_INTEGER_SIZE_P = INT_MAX, - VALUE_ENSURE_INTEGER_SIZE_N = INT_MIN + VALUE_ENSURE_INTEGER_SIZE_N = INT_MIN, + + PawnValueMg = 198, PawnValueEg = 258, + KnightValueMg = 817, KnightValueEg = 846, + BishopValueMg = 836, BishopValueEg = 857, + RookValueMg = 1270, RookValueEg = 1278, + QueenValueMg = 2521, QueenValueEg = 2558 }; enum PieceType { NO_PIECE_TYPE = 0, ALL_PIECES = 0, - PAWN = 1, KNIGHT = 2, BISHOP = 3, ROOK = 4, QUEEN = 5, KING = 6 + PAWN = 1, KNIGHT = 2, BISHOP = 3, ROOK = 4, QUEEN = 5, KING = 6, + PIECE_TYPE_NB = 8 }; enum Piece { - NO_PIECE = 16, // color_of(NO_PIECE) == NO_COLOR + 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 + B_PAWN = 9, B_KNIGHT = 10, B_BISHOP = 11, B_ROOK = 12, B_QUEEN = 13, B_KING = 14, + PIECE_NB = 16 }; enum Color { - WHITE, BLACK, NO_COLOR + WHITE, BLACK, NO_COLOR, COLOR_NB = 2 }; enum Depth { @@ -207,6 +227,8 @@ enum Square { SQ_A8, SQ_B8, SQ_C8, SQ_D8, SQ_E8, SQ_F8, SQ_G8, SQ_H8, SQ_NONE, + SQUARE_NB = 64, + DELTA_N = 8, DELTA_E = 1, DELTA_S = -8, @@ -221,11 +243,11 @@ enum Square { }; enum File { - FILE_A, FILE_B, FILE_C, FILE_D, FILE_E, FILE_F, FILE_G, FILE_H + FILE_A, FILE_B, FILE_C, FILE_D, FILE_E, FILE_F, FILE_G, FILE_H, FILE_NB = 8 }; enum Rank { - RANK_1, RANK_2, RANK_3, RANK_4, RANK_5, RANK_6, RANK_7, RANK_8 + RANK_1, RANK_2, RANK_3, RANK_4, RANK_5, RANK_6, RANK_7, RANK_8, RANK_NB = 8 }; @@ -310,20 +332,22 @@ inline Score apply_weight(Score v, Score w) { #undef ENABLE_OPERATORS_ON #undef ENABLE_SAFE_OPERATORS_ON -const Value PawnValueMidgame = Value(198); -const Value PawnValueEndgame = Value(258); -const Value KnightValueMidgame = Value(817); -const Value KnightValueEndgame = Value(846); -const Value BishopValueMidgame = Value(836); -const Value BishopValueEndgame = Value(857); -const Value RookValueMidgame = Value(1270); -const Value RookValueEndgame = Value(1278); -const Value QueenValueMidgame = Value(2521); -const Value QueenValueEndgame = Value(2558); - -extern const Value PieceValueMidgame[17]; // Indexed by Piece or PieceType -extern const Value PieceValueEndgame[17]; -extern int SquareDistance[64][64]; +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 { Move move; @@ -367,7 +391,7 @@ inline PieceType type_of(Piece p) { } inline Color color_of(Piece p) { - return Color(p >> 3); + return p == NO_PIECE ? NO_COLOR : Color(p >> 3); } inline bool is_ok(Square s) { @@ -415,16 +439,12 @@ inline int square_distance(Square s1, Square s2) { return SquareDistance[s1][s2]; } -inline char piece_type_to_char(PieceType pt) { - return " PNBRQK"[pt]; -} - inline char file_to_char(File f) { - return char(f - FILE_A + int('a')); + return char(f - FILE_A + 'a'); } inline char rank_to_char(Rank r) { - return char(r - RANK_1 + int('1')); + return char(r - RANK_1 + '1'); } inline Square pawn_push(Color c) { @@ -451,16 +471,9 @@ inline Move make_move(Square from, Square to) { return Move(to | (from << 6)); } -inline Move make_promotion(Square from, Square to, PieceType pt) { - return Move(to | (from << 6) | (1 << 14) | ((pt - 2) << 12)) ; -} - -inline Move make_enpassant(Square from, Square to) { - return Move(to | (from << 6) | (2 << 14)); -} - -inline Move make_castle(Square from, Square to) { - return Move(to | (from << 6) | (3 << 14)); +template +inline Move make(Square from, Square to, PieceType pt = KNIGHT) { + return Move(to | (from << 6) | T | ((pt - KNIGHT) << 12)) ; } inline bool is_ok(Move m) { @@ -477,15 +490,15 @@ inline const std::string square_to_string(Square s) { /// Our insertion sort implementation, works with pointers and iterators and is /// guaranteed to be stable, as is needed. template -void sort(K first, K last) +void sort(K begin, K end) { T tmp; K p, q; - for (p = first + 1; p < last; p++) + for (p = begin + 1; p < end; p++) { tmp = *p; - for (q = p; q != first && *(q-1) < tmp; --q) + for (q = p; q != begin && *(q-1) < tmp; --q) *q = *(q-1); *q = tmp; }