X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=258f9c710616a208339b055599f999c0817b382a;hp=f30d45720234603fe1dd3b0bec3fef05c5631861;hb=a9e55d43262d11a916bdfa68cd1de0174d884cd3;hpb=67535711e8d86a975ff9aac9c2d2fdad24ec5915 diff --git a/src/movegen.cpp b/src/movegen.cpp index f30d4572..258f9c71 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -40,8 +40,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); @@ -76,19 +78,19 @@ namespace { } - // 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) + if (Type == CAPTURE) return (us == WHITE ? generate_pawn_captures(p, m) : generate_pawn_captures(p, m)); else @@ -96,17 +98,16 @@ namespace { : 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 np, Bitboard bs) { + inline MoveStack* generate_piece_moves(const Position& p, MoveStack* m, + Color us, Bitboard t, Bitboard pnd) { if (us == WHITE) - return generate_pawn_blocking_evasions(p, np, bs, m); + return generate_pawn_blocking_evasions(p, pnd, t, m); else - return generate_pawn_blocking_evasions(p, np, bs, m); + return generate_pawn_blocking_evasions(p, pnd, t, m); } } @@ -174,7 +175,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); @@ -200,9 +201,8 @@ int generate_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 +/// in check. Unlike the other move generation functions, this one generates +/// only legal moves. It returns the number of generated moves. int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { @@ -215,29 +215,30 @@ 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 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 +246,9 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { 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); } @@ -265,14 +258,13 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { if (!(checkers & (checkers - 1))) // Only one bit set? { Square checksq = first_1(checkers); - Bitboard not_pinned = ~pinned; assert(pos.color_of_piece_on(checksq) == them); // 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); @@ -289,7 +281,7 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { // 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) { @@ -298,52 +290,48 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { } // 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); } @@ -412,7 +400,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); @@ -429,7 +417,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); @@ -462,7 +450,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); @@ -479,8 +467,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; @@ -551,7 +539,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)); } @@ -574,6 +562,24 @@ namespace { 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); + } + return mlist; + } + template<> MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) { @@ -585,20 +591,6 @@ namespace { return mlist; } - template - MoveStack* generate_piece_blocking_evasions(const Position& pos, MoveStack* mlist, Color us, - Bitboard not_pinned, Bitboard blockSquares) { - - 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 @@ -821,12 +813,12 @@ namespace { } template - MoveStack* generate_pawn_blocking_evasions(const Position& pos, Bitboard not_pinned, + MoveStack* generate_pawn_blocking_evasions(const Position& pos, Bitboard pinned, Bitboard blockSquares, MoveStack* mlist) { Square to; // Find non-pinned pawns - Bitboard b1 = pos.pawns(Us) & not_pinned; + Bitboard b1 = pos.pawns(Us) & ~pinned; // Single pawn pushes. We don't have to AND with empty squares here, // because the blocking squares will always be empty. @@ -874,7 +866,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); @@ -882,7 +874,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++) @@ -896,8 +888,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)