X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=37e66724e5decd81e25a8eaecd552264f200e2c1;hp=134127eb387837acd51e38a197ab4807c2b41fc2;hb=1b0fee9b17a1220b60b3051626e8444f474e884c;hpb=ff60dafe8d0799f0d6ba083ca566a11465351925 diff --git a/src/movegen.cpp b/src/movegen.cpp index 134127eb..37e66724 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 pnd, 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, pnd, bs, m); + return generate_pawn_blocking_evasions(p, pnd, t, m); else - return generate_pawn_blocking_evasions(p, pnd, bs, m); + return generate_pawn_blocking_evasions(p, pnd, t, m); } } @@ -165,16 +166,17 @@ 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. -int generate_checks(const Position& pos, MoveStack* mlist, Bitboard dc) { +int generate_checks(const Position& pos, MoveStack* mlist) { assert(pos.is_ok()); assert(!pos.is_check()); Color us = pos.side_to_move(); Square ksq = pos.king_square(opposite_color(us)); + Bitboard dc = pos.discovered_check_candidates(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,11 +202,10 @@ 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) { +int generate_evasions(const Position& pos, MoveStack* mlist) { assert(pos.is_ok()); assert(pos.is_check()); @@ -215,11 +216,11 @@ 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 @@ -231,14 +232,14 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { 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 @@ -247,7 +248,7 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { { to = pop_1st_bit(&b1); // Note that we can use square_is_attacked() only because we - // have already removed sliders checkers. + // have already removed slider checkers. if (!pos.square_is_attacked(to, them)) (*mlist++).move = make_move(ksq, to); } @@ -258,6 +259,7 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { if (!(checkers & (checkers - 1))) // Only one bit set? { Square checksq = first_1(checkers); + Bitboard pinned = pos.pinned_pieces(us); assert(pos.color_of_piece_on(checksq) == them); @@ -297,39 +299,41 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { assert((pos.occupied_squares() & 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); - } + 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); - // 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); + // 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 &= ~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); - } - } + 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); } @@ -345,10 +349,8 @@ 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, pinned); + return generate_evasions(pos, mlist); // Generate pseudo-legal moves int n = generate_captures(pos, mlist); @@ -356,7 +358,7 @@ int generate_legal_moves(const Position& pos, MoveStack* mlist) { // Remove illegal moves from the list for (int i = 0; i < n; i++) - if (!pos.pl_move_is_legal(mlist[i].move, pinned)) + if (!pos.pl_move_is_legal(mlist[i].move)) mlist[i--].move = mlist[--n].move; return n; @@ -369,12 +371,11 @@ int generate_legal_moves(const Position& pos, MoveStack* mlist) { /// returned. If not, the function returns false. This function must /// only be used when the side to move is not in check. -bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { +bool move_is_legal(const Position& pos, const Move m) { assert(pos.is_ok()); assert(!pos.is_check()); assert(move_is_ok(m)); - assert(pinned == pos.pinned_pieces(pos.side_to_move())); Color us = pos.side_to_move(); Color them = opposite_color(us); @@ -398,10 +399,10 @@ 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); + return pos.pl_move_is_legal(m); } // Castling moves @@ -415,7 +416,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); @@ -448,7 +449,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); @@ -465,8 +466,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; @@ -533,12 +534,12 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { return false; } // The move is pseudo-legal, check if it is also legal - return pos.pl_move_is_legal(m, pinned); + return pos.pl_move_is_legal(m); } // Luckly we can handle all the other pieces in one go - return ( pos.piece_attacks_square(from, to) - && pos.pl_move_is_legal(m, pinned) + return ( pos.piece_attacks_square(pos.piece_on(from), from, to) + && pos.pl_move_is_legal(m) && !move_promotion(m)); } @@ -560,20 +561,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; @@ -583,12 +573,23 @@ 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_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 @@ -864,7 +865,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); @@ -872,7 +873,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++) @@ -886,8 +887,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)