X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=14705d30df86c733a0519169bae8fb171777bfb9;hp=0fc684363985a086ccd63697b9797d106c069dd3;hb=be4ee0729ddc7eddcbb7912143a75769ea20fcd1;hpb=33c608e140b7fd7ced99086488e82a9bbe22e8e3 diff --git a/src/movegen.cpp b/src/movegen.cpp index 0fc68436..14705d30 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -1,6 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 - Copyright (C) 2004-2008 Tord Romstad (Glaurung author) Copyright (C) 2008 Marco Costalba + Copyright (C) 2004-2008 Tord Romstad (Glaurung author) + Copyright (C) 2008-2009 Marco Costalba Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -40,8 +41,10 @@ namespace { QUEEN_SIDE }; - const bool CAPTURE = true; - const bool NON_CAPTURE = false; + enum MoveType { + CAPTURE, + NON_CAPTURE + }; // Functions bool castling_is_check(const Position&, CastlingSide); @@ -50,18 +53,34 @@ namespace { template MoveStack* generate_castle_moves(const Position& pos, MoveStack* mlist); - template + template MoveStack* generate_pawn_blocking_evasions(const Position&, Bitboard, Bitboard, MoveStack*); - template + template MoveStack* generate_pawn_captures(const Position& pos, MoveStack* mlist); - template + template + MoveStack* generate_pawn_captures_diagonal(MoveStack* mlist, Bitboard pawns, Bitboard enemyPieces); + + template MoveStack* generate_pawn_noncaptures(const Position& pos, MoveStack* mlist); - template + template MoveStack* generate_pawn_checks(const Position&, Bitboard, Square, MoveStack*); + template + inline Bitboard move_pawns(Bitboard p) { + + if (Direction == DELTA_N) + return Us == WHITE ? p << 8 : p >> 8; + else if (Direction == DELTA_NE) + return Us == WHITE ? p << 9 : p >> 7; + else if (Direction == DELTA_NW) + return Us == WHITE ? p << 7 : p >> 9; + else + return p; + } + // Template generate_piece_checks() with specializations template MoveStack* generate_piece_checks(const Position&, MoveStack*, Color, Bitboard, Square); @@ -69,44 +88,39 @@ namespace { template<> inline MoveStack* generate_piece_checks(const Position& p, MoveStack* m, Color us, Bitboard dc, Square ksq) { - if (us == WHITE) - return generate_pawn_checks(p, dc, ksq, m); - else - return generate_pawn_checks(p, dc, ksq, m); - + return (us == WHITE ? generate_pawn_checks(p, dc, ksq, m) + : generate_pawn_checks(p, dc, ksq, m)); } - // Template generate_piece_moves() with specializations + // Template generate_piece_moves() with specializations and overloads template MoveStack* generate_piece_moves(const Position&, MoveStack*, Color us, Bitboard); template<> - MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target); + MoveStack* generate_piece_moves(const Position&, MoveStack*, Color, Bitboard); - template + template inline MoveStack* generate_piece_moves(const Position& p, MoveStack* m, Color us) { assert(Piece == PAWN); - if (Capture) - return (us == WHITE ? generate_pawn_captures(p, m) - : generate_pawn_captures(p, m)); + if (Type == CAPTURE) + return (us == WHITE ? generate_pawn_captures(p, m) + : generate_pawn_captures(p, m)); else - return (us == WHITE ? generate_pawn_noncaptures(p, m) - : generate_pawn_noncaptures(p, m)); + return (us == WHITE ? generate_pawn_noncaptures(p, m) + : generate_pawn_noncaptures(p, m)); } - // Template generate_piece_blocking_evasions() with specializations template - MoveStack* generate_piece_blocking_evasions(const Position&, MoveStack*, Color us, Bitboard, Bitboard); + MoveStack* generate_piece_moves(const Position&, MoveStack*, Color us, Bitboard, Bitboard); template<> - inline MoveStack* generate_piece_blocking_evasions(const Position& p, MoveStack* m, Color us, - Bitboard pnd, Bitboard bs) { - if (us == WHITE) - return generate_pawn_blocking_evasions(p, pnd, bs, m); - else - return generate_pawn_blocking_evasions(p, pnd, bs, m); + inline MoveStack* generate_piece_moves(const Position& p, MoveStack* m, + Color us, Bitboard t, Bitboard pnd) { + + return (us == WHITE ? generate_pawn_blocking_evasions(p, pnd, t, m) + : generate_pawn_blocking_evasions(p, pnd, t, m)); } } @@ -162,10 +176,10 @@ int generate_noncaptures(const Position& pos, MoveStack* mlist) { } -/// generate_checks() generates all pseudo-legal non-capturing, non-promoting -/// checks. It returns the number of generated moves. +/// generate_non_capture_checks() generates all pseudo-legal non-capturing, +/// non-promoting checks. It returns the number of generated moves. -int generate_checks(const Position& pos, MoveStack* mlist, Bitboard dc) { +int generate_non_capture_checks(const Position& pos, MoveStack* mlist, Bitboard dc) { assert(pos.is_ok()); assert(!pos.is_check()); @@ -174,7 +188,7 @@ int generate_checks(const Position& pos, MoveStack* mlist, Bitboard dc) { Square ksq = pos.king_square(opposite_color(us)); MoveStack* mlist_start = mlist; - assert(pos.piece_on(ksq) == king_of_color(opposite_color(us))); + assert(pos.piece_on(ksq) == piece_of_color_and_type(opposite_color(us), KING)); // Pieces moves mlist = generate_piece_checks(pos, mlist, us, dc, ksq); @@ -214,7 +228,7 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { Square ksq = pos.king_square(us); MoveStack* mlist_start = mlist; - assert(pos.piece_on(ksq) == king_of_color(us)); + assert(pos.piece_on(ksq) == piece_of_color_and_type(us, KING)); // The bitboard of occupied pieces without our king Bitboard b_noKing = pos.occupied_squares(); @@ -298,12 +312,11 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { if (blockSquares != EmptyBoardBB) { - // Pieces moves - mlist = generate_piece_blocking_evasions(pos, mlist, us, pinned, blockSquares); - mlist = generate_piece_blocking_evasions(pos, mlist, us, pinned, blockSquares); - mlist = generate_piece_blocking_evasions(pos, mlist, us, pinned, blockSquares); - mlist = generate_piece_blocking_evasions(pos, mlist, us, pinned, blockSquares); - mlist = generate_piece_blocking_evasions(pos, mlist, us, pinned, blockSquares); + mlist = generate_piece_moves(pos, mlist, us, blockSquares, pinned); + mlist = generate_piece_moves(pos, mlist, us, blockSquares, pinned); + mlist = generate_piece_moves(pos, mlist, us, blockSquares, pinned); + mlist = generate_piece_moves(pos, mlist, us, blockSquares, pinned); + mlist = generate_piece_moves(pos, mlist, us, blockSquares, pinned); } } @@ -400,7 +413,7 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { return false; assert(pos.square_is_empty(to)); - assert(pos.piece_on(to - pawn_push(us)) == pawn_of_color(them)); + assert(pos.piece_on(to - pawn_push(us)) == piece_of_color_and_type(them, PAWN)); // The move is pseudo-legal, check if it is also legal return pos.pl_move_is_legal(m, pinned); @@ -417,7 +430,7 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { assert(from == pos.king_square(us)); assert(to == pos.initial_kr_square(us)); - assert(pos.piece_on(to) == rook_of_color(us)); + assert(pos.piece_on(to) == piece_of_color_and_type(us, ROOK)); Square g1 = relative_square(us, SQ_G1); Square f1 = relative_square(us, SQ_F1); @@ -450,7 +463,7 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { assert(from == pos.king_square(us)); assert(to == pos.initial_qr_square(us)); - assert(pos.piece_on(to) == rook_of_color(us)); + assert(pos.piece_on(to) == piece_of_color_and_type(us, ROOK)); Square c1 = relative_square(us, SQ_C1); Square d1 = relative_square(us, SQ_D1); @@ -467,8 +480,8 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { illegal = true; if ( square_file(to) == FILE_B - && ( pos.piece_on(to + DELTA_W) == rook_of_color(them) - || pos.piece_on(to + DELTA_W) == queen_of_color(them))) + && ( pos.piece_on(to + DELTA_W) == piece_of_color_and_type(them, ROOK) + || pos.piece_on(to + DELTA_W) == piece_of_color_and_type(them, QUEEN))) illegal = true; return !illegal; @@ -483,6 +496,11 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { // Proceed according to the type of the moving piece. if (type_of_piece(pc) == PAWN) { + // Move direction must be compatible with pawn color + int direction = to - from; + if ((us == WHITE) != (direction > 0)) + return false; + // If the destination square is on the 8/1th rank, the move must // be a promotion. if ( ( (square_rank(to) == RANK_8 && us == WHITE) @@ -492,7 +510,7 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { // Proceed according to the square delta between the source and // destionation squares. - switch (to - from) + switch (direction) { case DELTA_NW: case DELTA_NE: @@ -539,7 +557,7 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { } // Luckly we can handle all the other pieces in one go - return ( pos.piece_attacks_square(from, to) + return ( pos.piece_attacks_square(pos.piece_on(from), from, to) && pos.pl_move_is_legal(m, pinned) && !move_promotion(m)); } @@ -562,20 +580,9 @@ namespace { return mlist; } - template<> - MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) { - - Bitboard b; - Square from = pos.king_square(us); - - b = pos.piece_attacks(from) & target; - SERIALIZE_MOVES(b); - return mlist; - } - template - MoveStack* generate_piece_blocking_evasions(const Position& pos, MoveStack* mlist, Color us, - Bitboard pinned, Bitboard blockSquares) { + MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, + Color us, Bitboard target, Bitboard pinned) { Square from; Bitboard b; @@ -585,30 +592,44 @@ namespace { if (pinned && bit_is_set(pinned, from)) continue; - b = pos.piece_attacks(from) & blockSquares; + b = pos.piece_attacks(from) & target; SERIALIZE_MOVES(b); } return mlist; } - template - MoveStack* generate_pawn_captures(const Position& pos, MoveStack* mlist) { + template<> + MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) { + + Bitboard b; + Square from = pos.king_square(us); + + b = pos.piece_attacks(from) & target; + SERIALIZE_MOVES(b); + return mlist; + } + + template + MoveStack* generate_pawn_captures_diagonal(MoveStack* mlist, Bitboard pawns, Bitboard enemyPieces) { + + // Calculate our parametrized parameters at compile time + const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB); + const Bitboard TFileABB = (Diagonal == DELTA_NE ? FileABB : FileHBB); + const SquareDelta TDELTA_NE = (Us == WHITE ? DELTA_NE : DELTA_SE); + const SquareDelta TDELTA_NW = (Us == WHITE ? DELTA_NW : DELTA_SW); + const SquareDelta TTDELTA_NE = (Diagonal == DELTA_NE ? TDELTA_NE : TDELTA_NW); Square to; - Bitboard pawns = pos.pawns(Us); - Bitboard enemyPieces = pos.pieces_of_color(Them); - // Captures in the a1-h8 (a8-h1 for black) direction - Bitboard b1 = (Us == WHITE ? pawns << 9 : pawns >> 7) & ~FileABB & enemyPieces; + // Captures in the a1-h8 (a8-h1 for black) diagonal or in the h1-a8 (h8-a1 for black) + Bitboard b1 = move_pawns(pawns) & ~TFileABB & enemyPieces; // Capturing promotions Bitboard b2 = b1 & TRank8BB; while (b2) { to = pop_1st_bit(&b2); - (*mlist++).move = make_promotion_move(to - TDELTA_NE, to, QUEEN); + (*mlist++).move = make_promotion_move(to - TTDELTA_NE, to, QUEEN); } // Capturing non-promotions @@ -616,30 +637,29 @@ namespace { while (b2) { to = pop_1st_bit(&b2); - (*mlist++).move = make_move(to - TDELTA_NE, to); + (*mlist++).move = make_move(to - TTDELTA_NE, to); } + return mlist; + } - // Captures in the h1-a8 (h8-a1 for black) direction - b1 = (Us == WHITE ? pawns << 7 : pawns >> 9) & ~FileHBB & enemyPieces; + template + MoveStack* generate_pawn_captures(const Position& pos, MoveStack* mlist) { - // Capturing promotions - b2 = b1 & TRank8BB; - while (b2) - { - to = pop_1st_bit(&b2); - (*mlist++).move = make_promotion_move(to - TDELTA_NW, to, QUEEN); - } + // Calculate our parametrized parameters at compile time + const Color Them = (Us == WHITE ? BLACK : WHITE); + const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB); + const SquareDelta TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S); - // Capturing non-promotions - b2 = b1 & ~TRank8BB; - while (b2) - { - to = pop_1st_bit(&b2); - (*mlist++).move = make_move(to - TDELTA_NW, to); - } + Square to; + Bitboard pawns = pos.pawns(Us); + Bitboard enemyPieces = pos.pieces_of_color(opposite_color(Us)); + + // Standard captures and capturing promotions in both directions + mlist = generate_pawn_captures_diagonal(mlist, pawns, enemyPieces); + mlist = generate_pawn_captures_diagonal(mlist, pawns, enemyPieces); // Non-capturing promotions - b1 = (Us == WHITE ? pawns << 8 : pawns >> 8) & pos.empty_squares() & TRank8BB; + Bitboard b1 = move_pawns(pawns) & pos.empty_squares() & TRank8BB; while (b1) { to = pop_1st_bit(&b1); @@ -664,19 +684,24 @@ namespace { return mlist; } - template + template MoveStack* generate_pawn_noncaptures(const Position& pos, MoveStack* mlist) { - Bitboard pawns = pos.pawns(Us); - Bitboard enemyPieces = pos.pieces_of_color(Them); - Bitboard emptySquares = pos.empty_squares(); + // Calculate our parametrized parameters at compile time + const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB); + const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB); + const SquareDelta TDELTA_NE = (Us == WHITE ? DELTA_NE : DELTA_SE); + const SquareDelta TDELTA_NW = (Us == WHITE ? DELTA_NW : DELTA_SW); + const SquareDelta TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S); + Bitboard b1, b2; Square to; + Bitboard pawns = pos.pawns(Us); + Bitboard enemyPieces = pos.pieces_of_color(opposite_color(Us)); + Bitboard emptySquares = pos.empty_squares(); // Underpromotion captures in the a1-h8 (a8-h1 for black) direction - b1 = (Us == WHITE ? pawns << 9 : pawns >> 7) & ~FileABB & enemyPieces & TRank8BB; + b1 = move_pawns(pawns) & ~FileABB & enemyPieces & TRank8BB; while (b1) { to = pop_1st_bit(&b1); @@ -686,7 +711,7 @@ namespace { } // Underpromotion captures in the h1-a8 (h8-a1 for black) direction - b1 = (Us == WHITE ? pawns << 7 : pawns >> 9) & ~FileHBB & enemyPieces & TRank8BB; + b1 = move_pawns(pawns) & ~FileHBB & enemyPieces & TRank8BB; while (b1) { to = pop_1st_bit(&b1); @@ -696,7 +721,7 @@ namespace { } // Single pawn pushes - b1 = (Us == WHITE ? pawns << 8 : pawns >> 8) & emptySquares; + b1 = move_pawns(pawns) & emptySquares; b2 = b1 & TRank8BB; while (b2) { @@ -713,7 +738,7 @@ namespace { } // Double pawn pushes - b2 = (Us == WHITE ? (b1 & TRank3BB) << 8 : (b1 & TRank3BB) >> 8) & emptySquares; + b2 = move_pawns(b1 & TRank3BB) & emptySquares; while (b2) { to = pop_1st_bit(&b2); @@ -723,22 +748,28 @@ namespace { } - template + template MoveStack* generate_pawn_checks(const Position& pos, Bitboard dc, Square ksq, MoveStack* mlist) { - // Find all friendly pawns not on the enemy king's file + // Calculate our parametrized parameters at compile time + const Color Them = (Us == WHITE ? BLACK : WHITE); + const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB); + const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB); + const SquareDelta TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S); + Bitboard b1, b2, b3; Bitboard empty = pos.empty_squares(); + Bitboard pawns = pos.pawns(Us); - if (dc != EmptyBoardBB) + if (dc & pawns) { // Pawn moves which gives discovered check. This is possible only if the // pawn is not on the same file as the enemy king, because we don't // generate captures. - b1 = pos.pawns(Us) & ~file_bb(ksq); + b1 = pawns & ~file_bb(ksq); // Discovered checks, single pawn pushes, no promotions - b2 = b3 = (Us == WHITE ? (b1 & dc) << 8 : (b1 & dc) >> 8) & empty & ~TRank8BB; + b2 = b3 = move_pawns(b1 & dc) & empty & ~TRank8BB; while (b3) { Square to = pop_1st_bit(&b3); @@ -746,7 +777,7 @@ namespace { } // Discovered checks, double pawn pushes - b3 = (Us == WHITE ? (b2 & TRank3BB) << 8 : (b2 & TRank3BB) >> 8) & empty; + b3 = move_pawns(b2 & TRank3BB) & empty; while (b3) { Square to = pop_1st_bit(&b3); @@ -756,10 +787,10 @@ namespace { // Direct checks. These are possible only for pawns on neighboring files // of the enemy king. - b1 = pos.pawns(Us) & neighboring_files_bb(ksq) & ~dc; + b1 = pawns & neighboring_files_bb(ksq) & ~dc; // Direct checks, single pawn pushes - b2 = (Us == WHITE ? b1 << 8 : b1 >> 8) & empty; + b2 = move_pawns(b1) & empty; b3 = b2 & pos.pawn_attacks(Them, ksq); while (b3) { @@ -768,9 +799,7 @@ namespace { } // Direct checks, double pawn pushes - b3 = (Us == WHITE ? (b2 & TRank3BB) << 8 : (b2 & TRank3BB) >> 8) - & empty - & pos.pawn_attacks(Them, ksq); + b3 = move_pawns(b2 & TRank3BB) & empty & pos.pawn_attacks(Them, ksq); while (b3) { Square to = pop_1st_bit(&b3); @@ -803,33 +832,47 @@ namespace { return mlist; Bitboard checkSqs = pos.piece_attacks(ksq) & pos.empty_squares(); + if (!checkSqs) + return mlist; + while (b) { Square from = pop_1st_bit(&b); + if ( (Piece == QUEEN && !(QueenPseudoAttacks[from] & checkSqs)) + || (Piece == ROOK && !(RookPseudoAttacks[from] & checkSqs)) + || (Piece == BISHOP && !(BishopPseudoAttacks[from] & checkSqs))) + continue; + Bitboard bb = pos.piece_attacks(from) & checkSqs; SERIALIZE_MOVES(bb); } return mlist; } - template + template MoveStack* generate_pawn_blocking_evasions(const Position& pos, Bitboard pinned, Bitboard blockSquares, MoveStack* mlist) { + + // Calculate our parametrized parameters at compile time + const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB); + const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB); + const SquareDelta TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S); + Square to; - // Find non-pinned pawns - Bitboard b1 = pos.pawns(Us) & ~pinned; + // Find non-pinned pawns and push them one square + Bitboard b1 = move_pawns(pos.pawns(Us) & ~pinned); - // Single pawn pushes. We don't have to AND with empty squares here, + // We don't have to AND with empty squares here, // because the blocking squares will always be empty. - Bitboard b2 = (Us == WHITE ? b1 << 8 : b1 >> 8) & blockSquares; + Bitboard b2 = b1 & blockSquares; while (b2) { to = pop_1st_bit(&b2); assert(pos.piece_on(to) == EMPTY); - if (square_rank(to) == TRANK_8) + if (square_rank(to) == TRank8BB) { (*mlist++).move = make_promotion_move(to - TDELTA_N, to, QUEEN); (*mlist++).move = make_promotion_move(to - TDELTA_N, to, ROOK); @@ -840,8 +883,8 @@ namespace { } // Double pawn pushes - b2 = (Us == WHITE ? b1 << 8 : b1 >> 8) & pos.empty_squares() & TRank3BB; - b2 = (Us == WHITE ? b2 << 8 : b2 >> 8) & blockSquares; + b2 = b1 & pos.empty_squares() & TRank3BB; + b2 = move_pawns(b2) & blockSquares; while (b2) { to = pop_1st_bit(&b2); @@ -866,7 +909,7 @@ namespace { Color them = opposite_color(us); Square ksq = pos.king_square(us); - assert(pos.piece_on(ksq) == king_of_color(us)); + assert(pos.piece_on(ksq) == piece_of_color_and_type(us, KING)); Square rsq = (Side == KING_SIDE ? pos.initial_kr_square(us) : pos.initial_qr_square(us)); Square s1 = relative_square(us, Side == KING_SIDE ? SQ_G1 : SQ_C1); @@ -874,7 +917,7 @@ namespace { Square s; bool illegal = false; - assert(pos.piece_on(rsq) == rook_of_color(us)); + assert(pos.piece_on(rsq) == piece_of_color_and_type(us, ROOK)); // It is a bit complicated to correctly handle Chess960 for (s = Min(ksq, s1); s <= Max(ksq, s1); s++) @@ -888,8 +931,8 @@ namespace { if ( Side == QUEEN_SIDE && square_file(rsq) == FILE_B - && ( pos.piece_on(relative_square(us, SQ_A1)) == rook_of_color(them) - || pos.piece_on(relative_square(us, SQ_A1)) == queen_of_color(them))) + && ( pos.piece_on(relative_square(us, SQ_A1)) == piece_of_color_and_type(them, ROOK) + || pos.piece_on(relative_square(us, SQ_A1)) == piece_of_color_and_type(them, QUEEN))) illegal = true; if (!illegal)