X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=dbdb0875b658b3ac197215e6572e22093c9c5117;hp=9bc149d5103359a802a27d1fd61ad6adba93dded;hb=6c9a64124a37afe82825e2a8ff91fe8418d8f388;hpb=769f2fdecb2ff2ba01f9cff6bee12926866510ed diff --git a/src/movegen.cpp b/src/movegen.cpp index 9bc149d5..dbdb0875 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 @@ -23,11 +24,12 @@ #include +#include "bitcount.h" #include "movegen.h" // Simple macro to wrap a very common while loop, no facny, no flexibility, // hardcoded list name 'mlist' and from square 'from'. -#define SERIALIZE_MOVES(b) while (b) (*mlist++).move = make_move(from, pop_1st_bit(&b)) +#define SERIALIZE_MOVES(b, bsf) while (b) (*mlist++).move = make_move(from, pop_1st_bit(&b)) //// //// Local definitions @@ -40,73 +42,86 @@ namespace { QUEEN_SIDE }; - static const bool CAPTURE = true; - static const bool NON_CAPTURE = false; + enum MoveType { + CAPTURE, + NON_CAPTURE + }; - // Function + // Functions bool castling_is_check(const Position&, CastlingSide); // Helper templates 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 + template MoveStack* generate_piece_checks(const Position&, MoveStack*, Color, Bitboard, Square); 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); + inline MoveStack* generate_piece_checks(const Position& p, MoveStack* m, Color us, Bitboard dc, Square ksq) { + return (us == WHITE ? generate_pawn_checks(p, dc, ksq, m) + : generate_pawn_checks(p, dc, ksq, m)); } - // Template generate_piece_moves() with specializations - template + // 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); + template + 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 np, Bitboard bs) { - if (us == WHITE) - return generate_pawn_blocking_evasions(p, np, bs, m); - else - return generate_pawn_blocking_evasions(p, np, 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)); } } @@ -118,7 +133,7 @@ namespace { /// generate_captures generates() all pseudo-legal captures and queen /// promotions. The return value is the number of moves generated. - +template int generate_captures(const Position& pos, MoveStack* mlist) { assert(pos.is_ok()); @@ -128,19 +143,25 @@ int generate_captures(const Position& pos, MoveStack* mlist) { Bitboard target = pos.pieces_of_color(opposite_color(us)); MoveStack* mlist_start = mlist; - mlist = generate_piece_moves(pos, mlist, us, target); - mlist = generate_piece_moves(pos, mlist, us, target); - mlist = generate_piece_moves(pos, mlist, us, target); - mlist = generate_piece_moves(pos, mlist, us, target); + mlist = generate_piece_moves(pos, mlist, us, target); + mlist = generate_piece_moves(pos, mlist, us, target); + mlist = generate_piece_moves(pos, mlist, us, target); + mlist = generate_piece_moves(pos, mlist, us, target); mlist = generate_piece_moves(pos, mlist, us); - mlist = generate_piece_moves(pos, mlist, us, target); + mlist = generate_piece_moves(pos, mlist, us, target); return int(mlist - mlist_start); } +int generate_captures(const Position& pos, MoveStack* mlist) { + + return CpuHasPOPCNT ? generate_captures(pos, mlist) + : generate_captures(pos, mlist); +} + /// generate_noncaptures() generates all pseudo-legal non-captures and /// underpromotions. The return value is the number of moves generated. - +template int generate_noncaptures(const Position& pos, MoveStack* mlist) { assert(pos.is_ok()); @@ -151,21 +172,27 @@ int generate_noncaptures(const Position& pos, MoveStack* mlist) { MoveStack* mlist_start = mlist; mlist = generate_piece_moves(pos, mlist, us); - mlist = generate_piece_moves(pos, mlist, us, target); - mlist = generate_piece_moves(pos, mlist, us, target); - mlist = generate_piece_moves(pos, mlist, us, target); - mlist = generate_piece_moves(pos, mlist, us, target); - mlist = generate_piece_moves(pos, mlist, us, target); + mlist = generate_piece_moves(pos, mlist, us, target); + mlist = generate_piece_moves(pos, mlist, us, target); + mlist = generate_piece_moves(pos, mlist, us, target); + mlist = generate_piece_moves(pos, mlist, us, target); + mlist = generate_piece_moves(pos, mlist, us, target); mlist = generate_castle_moves(pos, mlist); mlist = generate_castle_moves(pos, mlist); return int(mlist - mlist_start); } +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. + return CpuHasPOPCNT ? generate_noncaptures(pos, mlist) + : generate_noncaptures(pos, mlist); +} -int generate_checks(const Position& pos, MoveStack* mlist, Bitboard dc) { + +/// generate_non_capture_checks() generates all pseudo-legal non-capturing, +/// non-promoting checks. It returns the number of generated moves. +template +int generate_non_capture_checks(const Position& pos, MoveStack* mlist, Bitboard dc) { assert(pos.is_ok()); assert(!pos.is_check()); @@ -174,15 +201,15 @@ 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); - mlist = generate_piece_checks(pos, mlist, us, dc, ksq); - mlist = generate_piece_checks(pos, mlist, us, dc, ksq); - mlist = generate_piece_checks(pos, mlist, us, dc, ksq); - mlist = generate_piece_checks(pos, mlist, us, dc, ksq); - mlist = generate_piece_checks(pos, mlist, us, dc, ksq); + mlist = generate_piece_checks(pos, mlist, us, dc, ksq); + mlist = generate_piece_checks(pos, mlist, us, dc, ksq); + mlist = generate_piece_checks(pos, mlist, us, dc, ksq); + mlist = generate_piece_checks(pos, mlist, us, dc, ksq); + mlist = generate_piece_checks(pos, mlist, us, dc, ksq); + mlist = generate_piece_checks(pos, mlist, us, dc, ksq); // Castling moves that give check. Very rare but nice to have! if ( pos.can_castle_queenside(us) @@ -198,13 +225,18 @@ int generate_checks(const Position& pos, MoveStack* mlist, Bitboard dc) { return int(mlist - mlist_start); } +int generate_non_capture_checks(const Position& pos, MoveStack* mlist, Bitboard dc) { -/// generate_evasions() generates all check evasions when the side to move is -/// in check. Unlike the other move generation functions, this one generates -/// only legal moves. It returns the number of generated moves. This -/// function is very ugly, and needs cleaning up some time later. FIXME + return CpuHasPOPCNT ? generate_non_capture_checks(pos, mlist, dc) + : generate_non_capture_checks(pos, mlist, dc); +} -int generate_evasions(const Position& pos, MoveStack* mlist) { + +/// generate_evasions() generates all check evasions when the side to move is +/// in check. Unlike the other move generation functions, this one generates +/// only legal moves. It returns the number of generated moves. +template +int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { assert(pos.is_ok()); assert(pos.is_check()); @@ -215,29 +247,30 @@ int generate_evasions(const Position& pos, MoveStack* mlist) { 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 b2 = pos.occupied_squares(); - clear_bit(&b2, ksq); + Bitboard b_noKing = pos.occupied_squares(); + clear_bit(&b_noKing, ksq); // Find squares attacked by slider checkers, we will // remove them from king evasions set so to avoid a couple - // of cycles in the slow king evasions legality check loop. + // of cycles in the slow king evasions legality check loop + // and to be able to use square_is_attacked(). Bitboard checkers = pos.checkers(); Bitboard checkersAttacks = EmptyBoardBB; Bitboard b = checkers & (pos.queens() | pos.bishops()); while (b) { from = pop_1st_bit(&b); - checkersAttacks |= bishop_attacks_bb(from, b2); + checkersAttacks |= bishop_attacks_bb(from, b_noKing); } b = checkers & (pos.queens() | pos.rooks()); while (b) { from = pop_1st_bit(&b); - checkersAttacks |= rook_attacks_bb(from, b2); + checkersAttacks |= rook_attacks_bb(from, b_noKing); } // Generate evasions for king @@ -245,17 +278,9 @@ int generate_evasions(const Position& pos, MoveStack* mlist) { while (b1) { to = pop_1st_bit(&b1); - - // Make sure 'to' is not attacked by the other side. This is a bit ugly, - // because we can't use Position::square_is_attacked. Instead we use - // the low-level bishop_attacks_bb and rook_attacks_bb with the bitboard - // b2 (the occupied squares with the king removed) in order to test whether - // the king will remain in check on the destination square. - if (!( (pos.piece_attacks(to) & pos.knights(them)) - || (pos.pawn_attacks(us, to) & pos.pawns(them)) - || (bishop_attacks_bb(to, b2) & pos.bishops_and_queens(them)) - || (rook_attacks_bb(to, b2) & pos.rooks_and_queens(them)) - || (pos.piece_attacks(to) & pos.kings(them)))) + // Note that we can use square_is_attacked() only because we + // have already removed slider checkers. + if (!pos.square_is_attacked(to, them)) (*mlist++).move = make_move(ksq, to); } @@ -268,13 +293,10 @@ int generate_evasions(const Position& pos, MoveStack* mlist) { assert(pos.color_of_piece_on(checksq) == them); - // Find pinned pieces - Bitboard not_pinned = ~pos.pinned_pieces(us); - // Generate captures of the checking piece // Pawn captures - b1 = pos.pawn_attacks(them, checksq) & pos.pawns(us) & not_pinned; + b1 = pos.pawn_attacks(them, checksq) & pos.pawns(us) & ~pinned; while (b1) { from = pop_1st_bit(&b1); @@ -291,7 +313,7 @@ int generate_evasions(const Position& pos, MoveStack* mlist) { // Pieces captures b1 = ( (pos.piece_attacks(checksq) & pos.knights(us)) | (pos.piece_attacks(checksq) & pos.bishops_and_queens(us)) - | (pos.piece_attacks(checksq) & pos.rooks_and_queens(us)) ) & not_pinned; + | (pos.piece_attacks(checksq) & pos.rooks_and_queens(us)) ) & ~pinned; while (b1) { @@ -300,56 +322,58 @@ int generate_evasions(const Position& pos, MoveStack* mlist) { } // Blocking check evasions are possible only if the checking piece is - // a slider + // a slider. if (checkers & pos.sliders()) { Bitboard blockSquares = squares_between(checksq, ksq); assert((pos.occupied_squares() & blockSquares) == EmptyBoardBB); - // Pieces moves - mlist = generate_piece_blocking_evasions(pos, mlist, us, not_pinned, blockSquares); - mlist = generate_piece_blocking_evasions(pos, mlist, us, not_pinned, blockSquares); - mlist = generate_piece_blocking_evasions(pos, mlist, us, not_pinned, blockSquares); - mlist = generate_piece_blocking_evasions(pos, mlist, us, not_pinned, blockSquares); - mlist = generate_piece_blocking_evasions(pos, mlist, us, not_pinned, blockSquares); - } + if (blockSquares != EmptyBoardBB) + { + 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); + } + } - // Finally, the ugly special case of en passant captures. An en passant - // capture can only be a check evasion if the check is not a discovered - // check. If pos.ep_square() is set, the last move made must have been - // a double pawn push. If, furthermore, the checking piece is a pawn, - // an en passant check evasion may be possible. - if (pos.ep_square() != SQ_NONE && (checkers & pos.pawns(them))) - { - to = pos.ep_square(); - b1 = pos.pawn_attacks(them, to) & pos.pawns(us); + // Finally, the special case of en passant captures. An en passant + // capture can only be a check evasion if the check is not a discovered + // check. If pos.ep_square() is set, the last move made must have been + // a double pawn push. If, furthermore, the checking piece is a pawn, + // an en passant check evasion may be possible. + if (pos.ep_square() != SQ_NONE && (checkers & pos.pawns(them))) + { + to = pos.ep_square(); + b1 = pos.pawn_attacks(them, to) & pos.pawns(us); - assert(b1 != EmptyBoardBB); + // The checking pawn cannot be a discovered (bishop) check candidate + // otherwise we were in check also before last double push move. + assert(!bit_is_set(pos.discovered_check_candidates(them), checksq)); + assert(count_1s(b1) == 1 || count_1s(b1) == 2); - b1 &= not_pinned; - while (b1) - { - from = pop_1st_bit(&b1); - - // Before generating the move, we have to make sure it is legal. - // This is somewhat tricky, because the two disappearing pawns may - // cause new "discovered checks". We test this by removing the - // two relevant bits from the occupied squares bitboard, and using - // the low-level bitboard functions for bishop and rook attacks. - b2 = pos.occupied_squares(); - clear_bit(&b2, from); - clear_bit(&b2, checksq); - if (!( (bishop_attacks_bb(ksq, b2) & pos.bishops_and_queens(them)) - ||(rook_attacks_bb(ksq, b2) & pos.rooks_and_queens(them)))) - - (*mlist++).move = make_ep_move(from, to); - } - } + b1 &= ~pinned; + while (b1) + { + from = pop_1st_bit(&b1); + // Move is always legal because checking pawn is not a discovered + // check candidate and our capturing pawn has been already tested + // against pinned pieces. + (*mlist++).move = make_ep_move(from, to); + } + } } return int(mlist - mlist_start); } +int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { + + return CpuHasPOPCNT ? generate_evasions(pos, mlist, pinned) + : generate_evasions(pos, mlist, pinned); +} + /// generate_legal_moves() computes a complete list of legal moves in the /// current position. This function is not very fast, and should be used @@ -361,15 +385,15 @@ int generate_legal_moves(const Position& pos, MoveStack* mlist) { assert(pos.is_ok()); + Bitboard pinned = pos.pinned_pieces(pos.side_to_move()); + if (pos.is_check()) - return generate_evasions(pos, mlist); + return generate_evasions(pos, mlist, pinned); // Generate pseudo-legal moves int n = generate_captures(pos, mlist); n += generate_noncaptures(pos, mlist + n); - Bitboard pinned = pos.pinned_pieces(pos.side_to_move()); - // Remove illegal moves from the list for (int i = 0; i < n; i++) if (!pos.pl_move_is_legal(mlist[i].move, pinned)) @@ -414,7 +438,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); @@ -431,7 +455,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); @@ -464,7 +488,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); @@ -481,8 +505,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; @@ -497,6 +521,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) @@ -506,7 +535,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: @@ -553,7 +582,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)); } @@ -561,7 +590,7 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { namespace { - template + template MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) { Square from; @@ -571,54 +600,61 @@ namespace { { from = pos.piece_list(us, Piece, i); b = pos.piece_attacks(from) & target; - SERIALIZE_MOVES(b); + SERIALIZE_MOVES(b, HasBSF); + } + return mlist; + } + + template + MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, + Color us, Bitboard target, Bitboard pinned) { + Square from; + Bitboard b; + + for (int i = 0, e = pos.piece_count(us, Piece); i < e; i++) + { + from = pos.piece_list(us, Piece, i); + if (pinned && bit_is_set(pinned, from)) + continue; + + b = pos.piece_attacks(from) & target; + SERIALIZE_MOVES(b, HasBSF); } return mlist; } template<> - MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) { + 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); + SERIALIZE_MOVES(b, false); return mlist; } - template - MoveStack* generate_piece_blocking_evasions(const Position& pos, MoveStack* mlist, Color us, - Bitboard not_pinned, Bitboard blockSquares) { + template + MoveStack* generate_pawn_captures_diagonal(MoveStack* mlist, Bitboard pawns, Bitboard enemyPieces) { - Bitboard b = pos.pieces_of_color_and_type(us, Piece) & not_pinned; - while (b) - { - Square from = pop_1st_bit(&b); - Bitboard bb = pos.piece_attacks(from) & blockSquares; - SERIALIZE_MOVES(bb); - } - return mlist; - } - - template - MoveStack* generate_pawn_captures(const Position& pos, MoveStack* mlist) { + // 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 @@ -626,30 +662,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); @@ -674,19 +709,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); @@ -696,7 +736,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); @@ -706,7 +746,7 @@ namespace { } // Single pawn pushes - b1 = (Us == WHITE ? pawns << 8 : pawns >> 8) & emptySquares; + b1 = move_pawns(pawns) & emptySquares; b2 = b1 & TRank8BB; while (b2) { @@ -723,7 +763,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); @@ -733,22 +773,30 @@ 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); + const SquareDelta TDELTA_S = (Us == WHITE ? DELTA_S : DELTA_N); + Bitboard b1, b2, b3; - Bitboard empty = pos.empty_squares(); + Bitboard pawns = pos.pawns(Us); - if (dc != EmptyBoardBB) + if (dc & pawns) { + Bitboard empty = pos.empty_squares(); + // 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); @@ -756,7 +804,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); @@ -765,11 +813,16 @@ 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; + // and in the two ranks that, after the push, are in front of the enemy king. + b1 = pawns & neighboring_files_bb(ksq) & ~dc; + b2 = rank_bb(ksq + 2 * TDELTA_S) | rank_bb(ksq + 3 * TDELTA_S); + b1 &= b2; + if (!b1) + return mlist; // Direct checks, single pawn pushes - b2 = (Us == WHITE ? b1 << 8 : b1 >> 8) & empty; + Bitboard empty = pos.empty_squares(); + b2 = move_pawns(b1) & empty; b3 = b2 & pos.pawn_attacks(Them, ksq); while (b3) { @@ -778,9 +831,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); @@ -789,7 +840,7 @@ namespace { return mlist; } - template + template MoveStack* generate_piece_checks(const Position& pos, MoveStack* mlist, Color us, Bitboard dc, Square ksq) { @@ -804,42 +855,56 @@ namespace { if (Piece == KING) bb &= ~QueenPseudoAttacks[ksq]; - SERIALIZE_MOVES(bb); + SERIALIZE_MOVES(bb, HasBSF); } // Direct checks b = target & ~dc; - if (Piece == KING || !b) - return mlist; - - Bitboard checkSqs = pos.piece_attacks(ksq) & pos.empty_squares(); - while (b) + if (Piece != KING || b) { - Square from = pop_1st_bit(&b); - Bitboard bb = pos.piece_attacks(from) & checkSqs; - SERIALIZE_MOVES(bb); + 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, HasBSF); + } } return mlist; } - template - MoveStack* generate_pawn_blocking_evasions(const Position& pos, Bitboard not_pinned, + 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) & not_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); @@ -850,8 +915,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); @@ -876,7 +941,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); @@ -884,7 +949,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++) @@ -898,8 +963,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)