X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=90d0135a4d0dbe246aa38daa54b94d28820d5ad4;hp=0f3e4ddb203f3b57db2812a4b04efc94ca58109c;hb=ad1f28bc1c1c5426fb8ab246f5d43ad57002b4d5;hpb=22ca7a601f8484d03eb7e9be79e03a74d2e4aa2c diff --git a/src/movegen.cpp b/src/movegen.cpp index 0f3e4ddb..90d0135a 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -17,15 +17,11 @@ along with this program. If not, see . */ - -//// -//// Includes -//// - #include #include "bitcount.h" #include "movegen.h" +#include "position.h" // Simple macro to wrap a very common while loop, no facny, no flexibility, // hardcoded list name 'mlist' and from square 'from'. @@ -34,10 +30,6 @@ // Version used for pawns, where the 'from' square is given as a delta from the 'to' square #define SERIALIZE_MOVES_D(b, d) while (b) { to = pop_1st_bit(&b); (*mlist++).move = make_move(to + (d), to); } -//// -//// Local definitions -//// - namespace { enum CastlingSide { @@ -45,103 +37,97 @@ namespace { QUEEN_SIDE }; - enum MoveType { - CAPTURE, - NON_CAPTURE, - CHECK, - EVASION - }; - - template - MoveStack* generate_castle_moves(const Position&, MoveStack*); + template + MoveStack* generate_castle_moves(const Position&, MoveStack*, Color us); - template + template MoveStack* generate_pawn_moves(const Position&, MoveStack*, Bitboard, Square); - template + template inline MoveStack* generate_discovered_checks(const Position& pos, MoveStack* mlist, Square from) { - assert(Piece != QUEEN); + assert(Pt != QUEEN); + assert(Pt != PAWN); + + Bitboard b = pos.attacks_from(from) & pos.empty_squares(); + + if (Pt == KING) + b &= ~QueenPseudoAttacks[pos.king_square(opposite_color(pos.side_to_move()))]; - Bitboard b = pos.attacks_from(from) & pos.empty_squares(); - if (Piece == KING) - { - Square ksq = pos.king_square(opposite_color(pos.side_to_move())); - b &= ~QueenPseudoAttacks[ksq]; - } SERIALIZE_MOVES(b); return mlist; } - template + template inline MoveStack* generate_direct_checks(const Position& pos, MoveStack* mlist, Color us, Bitboard dc, Square ksq) { - assert(Piece != KING); + assert(Pt != KING); + assert(Pt != PAWN); Bitboard checkSqs, b; Square from; - const Square* ptr = pos.piece_list_begin(us, Piece); + const Square* pl = pos.piece_list(us, Pt); - if ((from = *ptr++) == SQ_NONE) + if ((from = *pl++) == SQ_NONE) return mlist; - checkSqs = pos.attacks_from(ksq) & pos.empty_squares(); + checkSqs = pos.attacks_from(ksq) & pos.empty_squares(); do { - if ( (Piece == QUEEN && !(QueenPseudoAttacks[from] & checkSqs)) - || (Piece == ROOK && !(RookPseudoAttacks[from] & checkSqs)) - || (Piece == BISHOP && !(BishopPseudoAttacks[from] & checkSqs))) + if ( (Pt == QUEEN && !(QueenPseudoAttacks[from] & checkSqs)) + || (Pt == ROOK && !(RookPseudoAttacks[from] & checkSqs)) + || (Pt == BISHOP && !(BishopPseudoAttacks[from] & checkSqs))) continue; if (dc && bit_is_set(dc, from)) continue; - b = pos.attacks_from(from) & checkSqs; + b = pos.attacks_from(from) & checkSqs; SERIALIZE_MOVES(b); - } while ((from = *ptr++) != SQ_NONE); + } while ((from = *pl++) != SQ_NONE); return mlist; } template<> - inline MoveStack* generate_direct_checks(const Position& p, MoveStack* m, Color us, Bitboard dc, Square ksq) { + FORCE_INLINE MoveStack* generate_direct_checks(const Position& p, MoveStack* m, Color us, Bitboard dc, Square ksq) { - return (us == WHITE ? generate_pawn_moves(p, m, dc, ksq) - : generate_pawn_moves(p, m, dc, ksq)); + return (us == WHITE ? generate_pawn_moves(p, m, dc, ksq) + : generate_pawn_moves(p, m, dc, ksq)); } - template - inline MoveStack* generate_piece_moves(const Position& p, MoveStack* m, Color us, Bitboard t) { + template + FORCE_INLINE MoveStack* generate_piece_moves(const Position& p, MoveStack* m, Color us, Bitboard t) { - assert(Piece == PAWN); - assert(Type == CAPTURE || Type == NON_CAPTURE || Type == EVASION); + assert(Pt == PAWN); + assert(Type == MV_CAPTURE || Type == MV_NON_CAPTURE || Type == MV_EVASION); return (us == WHITE ? generate_pawn_moves(p, m, t, SQ_NONE) : generate_pawn_moves(p, m, t, SQ_NONE)); } - template - inline MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) { + template + FORCE_INLINE MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) { Bitboard b; Square from; - const Square* ptr = pos.piece_list_begin(us, Piece); + const Square* pl = pos.piece_list(us, Pt); - if (*ptr != SQ_NONE) + if (*pl != SQ_NONE) { do { - from = *ptr; - b = pos.attacks_from(from) & target; + from = *pl; + b = pos.attacks_from(from) & target; SERIALIZE_MOVES(b); - } while (*++ptr != SQ_NONE); + } while (*++pl != SQ_NONE); } return mlist; } template<> - inline MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) { + FORCE_INLINE MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) { Bitboard b; Square from = pos.king_square(us); @@ -154,101 +140,84 @@ namespace { } -//// -//// Functions -//// - - -/// generate_captures() generates all pseudo-legal captures and queen +/// generate generates all pseudo-legal captures and queen /// promotions. Returns a pointer to the end of the move list. +/// +/// generate generates all pseudo-legal non-captures and +/// underpromotions. Returns a pointer to the end of the move list. +/// +/// generate generates all pseudo-legal captures and +/// non-captures. Returns a pointer to the end of the move list. -MoveStack* generate_captures(const Position& pos, MoveStack* mlist) { +template +MoveStack* generate(const Position& pos, MoveStack* mlist) { - assert(pos.is_ok()); - assert(!pos.is_check()); + assert(!pos.in_check()); Color us = pos.side_to_move(); - Bitboard target = pos.pieces_of_color(opposite_color(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); - return generate_piece_moves(pos, mlist, us, target); -} - - -/// generate_noncaptures() generates all pseudo-legal non-captures and -/// underpromotions. Returns a pointer to the end of the move list. - -MoveStack* generate_noncaptures(const Position& pos, MoveStack* mlist) { + Bitboard target; - assert(pos.is_ok()); - assert(!pos.is_check()); + if (Type == MV_CAPTURE || Type == MV_NON_EVASION) + target = pos.pieces(opposite_color(us)); + else if (Type == MV_NON_CAPTURE) + target = pos.empty_squares(); + else + assert(false); - Color us = pos.side_to_move(); - Bitboard target = pos.empty_squares(); + if (Type == MV_NON_EVASION) + { + mlist = generate_piece_moves(pos, mlist, us, target); + mlist = generate_piece_moves(pos, mlist, us, pos.empty_squares()); + target |= pos.empty_squares(); + } + else + 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); - return generate_castle_moves(pos, mlist); -} + if (Type != MV_CAPTURE && pos.can_castle(us)) + { + if (pos.can_castle(us == WHITE ? WHITE_OO : BLACK_OO)) + mlist = generate_castle_moves(pos, mlist, us); -/// generate_non_evasions() generates all pseudo-legal captures and -/// non-captures. Returns a pointer to the end of the move list. - -MoveStack* generate_non_evasions(const Position& pos, MoveStack* mlist) { - - assert(pos.is_ok()); - assert(!pos.is_check()); - - Color us = pos.side_to_move(); - Bitboard target = pos.pieces_of_color(opposite_color(us)); - - mlist = generate_piece_moves(pos, mlist, us, target); - mlist = generate_piece_moves(pos, mlist, us, pos.empty_squares()); - - target |= pos.empty_squares(); + if (pos.can_castle(us == WHITE ? WHITE_OOO : BLACK_OOO)) + mlist = generate_castle_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_castle_moves(pos, mlist); - return generate_castle_moves(pos, mlist); + return mlist; } +// Explicit template instantiations +template MoveStack* generate(const Position& pos, MoveStack* mlist); +template MoveStack* generate(const Position& pos, MoveStack* mlist); +template MoveStack* generate(const Position& pos, MoveStack* mlist); + /// generate_non_capture_checks() generates all pseudo-legal non-captures and knight /// underpromotions that give check. Returns a pointer to the end of the move list. +template<> +MoveStack* generate(const Position& pos, MoveStack* mlist) { -MoveStack* generate_non_capture_checks(const Position& pos, MoveStack* mlist) { - - assert(pos.is_ok()); - assert(!pos.is_check()); + assert(!pos.in_check()); Bitboard b, dc; Square from; Color us = pos.side_to_move(); Square ksq = pos.king_square(opposite_color(us)); - assert(pos.piece_on(ksq) == piece_of_color_and_type(opposite_color(us), KING)); + assert(pos.piece_on(ksq) == make_piece(opposite_color(us), KING)); // Discovered non-capture checks - b = dc = pos.discovered_check_candidates(us); + b = dc = pos.discovered_check_candidates(); while (b) { from = pop_1st_bit(&b); - switch (pos.type_of_piece_on(from)) + switch (piece_type(pos.piece_on(from))) { case PAWN: /* Will be generated togheter with pawns direct checks */ break; case KNIGHT: mlist = generate_discovered_checks(pos, mlist, from); break; @@ -270,11 +239,10 @@ MoveStack* generate_non_capture_checks(const Position& pos, MoveStack* mlist) { /// generate_evasions() generates all pseudo-legal check evasions when /// the side to move is in check. Returns a pointer to the end of the move list. +template<> +MoveStack* generate(const Position& pos, MoveStack* mlist) { -MoveStack* generate_evasions(const Position& pos, MoveStack* mlist) { - - assert(pos.is_ok()); - assert(pos.is_check()); + assert(pos.in_check()); Bitboard b, target; Square from, checksq; @@ -284,7 +252,7 @@ MoveStack* generate_evasions(const Position& pos, MoveStack* mlist) { Bitboard checkers = pos.checkers(); Bitboard sliderAttacks = EmptyBoardBB; - assert(pos.piece_on(ksq) == piece_of_color_and_type(us, KING)); + assert(pos.piece_on(ksq) == make_piece(us, KING)); assert(checkers); // Find squares attacked by slider checkers, we will remove @@ -296,26 +264,31 @@ MoveStack* generate_evasions(const Position& pos, MoveStack* mlist) { checkersCnt++; checksq = pop_1st_bit(&b); - assert(pos.color_of_piece_on(checksq) == opposite_color(us)); + assert(piece_color(pos.piece_on(checksq)) == opposite_color(us)); - switch (pos.type_of_piece_on(checksq)) + switch (piece_type(pos.piece_on(checksq))) { case BISHOP: sliderAttacks |= BishopPseudoAttacks[checksq]; break; case ROOK: sliderAttacks |= RookPseudoAttacks[checksq]; break; case QUEEN: - // In case of a queen remove also squares attacked in the other direction to - // avoid possible illegal moves when queen and king are on adjacent squares. - if (RookPseudoAttacks[checksq] & (1ULL << ksq)) - sliderAttacks |= RookPseudoAttacks[checksq] | pos.attacks_from(checksq); + // If queen and king are far we can safely remove all the squares attacked + // in the other direction becuase are not reachable by the king anyway. + if (squares_between(ksq, checksq) || (RookPseudoAttacks[checksq] & (1ULL << ksq))) + sliderAttacks |= QueenPseudoAttacks[checksq]; + + // Otherwise, if king and queen are adjacent and on a diagonal line, we need to + // use real rook attacks to check if king is safe to move in the other direction. + // For example: king in B2, queen in A1 a knight in B1, and we can safely move to C1. else sliderAttacks |= BishopPseudoAttacks[checksq] | pos.attacks_from(checksq); + default: break; } } while (b); // Generate evasions for king, capture and non capture moves - b = pos.attacks_from(ksq) & ~pos.pieces_of_color(us) & ~sliderAttacks; + b = pos.attacks_from(ksq) & ~pos.pieces(us) & ~sliderAttacks; from = ksq; SERIALIZE_MOVES(b); @@ -327,7 +300,7 @@ MoveStack* generate_evasions(const Position& pos, MoveStack* mlist) { // checker piece is possible. target = squares_between(checksq, ksq) | checkers; - 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); @@ -335,148 +308,31 @@ MoveStack* generate_evasions(const Position& pos, MoveStack* mlist) { } -/// generate_moves() computes a complete list of legal or pseudo-legal moves in -/// the current position. This function is not very fast, and should be used -/// only in non time-critical paths. - -MoveStack* generate_moves(const Position& pos, MoveStack* mlist, bool pseudoLegal) { +/// generate computes a complete list of legal moves in the current position - assert(pos.is_ok()); +template<> +MoveStack* generate(const Position& pos, MoveStack* mlist) { MoveStack *last, *cur = mlist; - Bitboard pinned = pos.pinned_pieces(pos.side_to_move()); + Bitboard pinned = pos.pinned_pieces(); - // Generate pseudo-legal moves - last = pos.is_check() ? generate_evasions(pos, mlist) - : generate_non_evasions(pos, mlist); - if (pseudoLegal) - return last; + last = pos.in_check() ? generate(pos, mlist) + : generate(pos, mlist); // Remove illegal moves from the list while (cur != last) - if (pos.pl_move_is_legal(cur->move, pinned)) - cur++; - else + if (!pos.pl_move_is_legal(cur->move, pinned)) cur->move = (--last)->move; + else + cur++; return last; } -/// move_is_legal() takes a position and a (not necessarily pseudo-legal) -/// move and tests whether the move is legal. This version is not very fast -/// and should be used only in non time-critical paths. - -bool move_is_legal(const Position& pos, const Move m) { - - MoveStack mlist[MOVES_MAX]; - MoveStack *cur, *last = generate_moves(pos, mlist, true); - - for (cur = mlist; cur != last; cur++) - if (cur->move == m) - return pos.pl_move_is_legal(m, pos.pinned_pieces(pos.side_to_move())); - - return false; -} - - -/// Fast version of move_is_legal() that takes a position a move and a -/// bitboard of pinned pieces as input, and tests whether the move is legal. - -bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { - - assert(pos.is_ok()); - 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); - Square from = move_from(m); - Square to = move_to(m); - Piece pc = pos.piece_on(from); - - // Use a slower but simpler function for uncommon cases - if (move_is_special(m)) - return move_is_legal(pos, m); - - // If the from square is not occupied by a piece belonging to the side to - // move, the move is obviously not legal. - if (color_of_piece(pc) != us) - return false; - - // The destination square cannot be occupied by a friendly piece - if (pos.color_of_piece_on(to) == us) - return false; - - // Handle the special case of a pawn move - 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; - - // We have already handled promotion moves, so destination - // cannot be on the 8/1th rank. - if (square_rank(to) == RANK_8 || square_rank(to) == RANK_1) - return false; - - // Proceed according to the square delta between the origin and - // destination squares. - switch (direction) - { - case DELTA_NW: - case DELTA_NE: - case DELTA_SW: - case DELTA_SE: - // Capture. The destination square must be occupied by an enemy - // piece (en passant captures was handled earlier). - if (pos.color_of_piece_on(to) != them) - return false; - break; - - case DELTA_N: - case DELTA_S: - // Pawn push. The destination square must be empty. - if (!pos.square_is_empty(to)) - return false; - break; - - case DELTA_NN: - // Double white pawn push. The destination square must be on the fourth - // rank, and both the destination square and the square between the - // source and destination squares must be empty. - if ( square_rank(to) != RANK_4 - || !pos.square_is_empty(to) - || !pos.square_is_empty(from + DELTA_N)) - return false; - break; - - case DELTA_SS: - // Double black pawn push. The destination square must be on the fifth - // rank, and both the destination square and the square between the - // source and destination squares must be empty. - if ( square_rank(to) != RANK_5 - || !pos.square_is_empty(to) - || !pos.square_is_empty(from + DELTA_S)) - return false; - break; - - default: - return false; - } - } - else if (!bit_is_set(pos.attacks_from(pc, from), to)) - return false; - - // The move is pseudo-legal, check if it is also legal - return pos.is_check() ? pos.pl_move_is_evasion(m, pinned) : pos.pl_move_is_legal(m, pinned); -} - - namespace { - template + template inline Bitboard move_pawns(Bitboard p) { return Delta == DELTA_N ? p << 8 : Delta == DELTA_S ? p >> 8 : @@ -484,7 +340,7 @@ namespace { Delta == DELTA_NW ? p << 7 : Delta == DELTA_SW ? p >> 9 : p; } - template + template inline MoveStack* generate_pawn_captures(MoveStack* mlist, Bitboard pawns, Bitboard target) { const Bitboard TFileABB = (Delta == DELTA_NE || Delta == DELTA_SE ? FileABB : FileHBB); @@ -498,7 +354,7 @@ namespace { return mlist; } - template + template inline MoveStack* generate_promotions(const Position& pos, MoveStack* mlist, Bitboard pawnsOn7, Bitboard target) { const Bitboard TFileABB = (Delta == DELTA_NE || Delta == DELTA_SE ? FileABB : FileHBB); @@ -516,10 +372,10 @@ namespace { { to = pop_1st_bit(&b); - if (Type == CAPTURE || Type == EVASION) + if (Type == MV_CAPTURE || Type == MV_EVASION) (*mlist++).move = make_promotion_move(to - Delta, to, QUEEN); - if (Type == NON_CAPTURE || Type == EVASION) + if (Type == MV_NON_CAPTURE || Type == MV_EVASION) { (*mlist++).move = make_promotion_move(to - Delta, to, ROOK); (*mlist++).move = make_promotion_move(to - Delta, to, BISHOP); @@ -528,8 +384,8 @@ namespace { // This is the only possible under promotion that can give a check // not already included in the queen-promotion. - if ( Type == CHECK - && bit_is_set(pos.attacks_from(to), pos.king_square(opposite_color(Us)))) + if ( Type == MV_CHECK + && bit_is_set(pos.attacks_from(to), pos.king_square(Delta > 0 ? BLACK : WHITE))) (*mlist++).move = make_promotion_move(to - Delta, to, KNIGHT); else (void)pos; // Silence a warning under MSVC } @@ -541,27 +397,27 @@ namespace { // Calculate our parametrized parameters at compile time, named // according to the point of view of white side. - const Color Them = (Us == WHITE ? BLACK : WHITE); - const Bitboard TRank7BB = (Us == WHITE ? Rank7BB : Rank2BB); - const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB); - const SquareDelta TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S); - const SquareDelta TDELTA_NE = (Us == WHITE ? DELTA_NE : DELTA_SE); - const SquareDelta TDELTA_NW = (Us == WHITE ? DELTA_NW : DELTA_SW); + const Color Them = (Us == WHITE ? BLACK : WHITE); + const Bitboard TRank7BB = (Us == WHITE ? Rank7BB : Rank2BB); + const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB); + const Square UP = (Us == WHITE ? DELTA_N : DELTA_S); + const Square RIGHT_UP = (Us == WHITE ? DELTA_NE : DELTA_SW); + const Square LEFT_UP = (Us == WHITE ? DELTA_NW : DELTA_SE); Square to; Bitboard b1, b2, dc1, dc2, pawnPushes, emptySquares; Bitboard pawns = pos.pieces(PAWN, Us); Bitboard pawnsOn7 = pawns & TRank7BB; - Bitboard enemyPieces = (Type == CAPTURE ? target : pos.pieces_of_color(Them)); + Bitboard enemyPieces = (Type == MV_CAPTURE ? target : pos.pieces(Them)); // Pre-calculate pawn pushes before changing emptySquares definition - if (Type != CAPTURE) + if (Type != MV_CAPTURE) { - emptySquares = (Type == NON_CAPTURE ? target : pos.empty_squares()); - pawnPushes = move_pawns(pawns & ~TRank7BB) & emptySquares; + emptySquares = (Type == MV_NON_CAPTURE ? target : pos.empty_squares()); + pawnPushes = move_pawns(pawns & ~TRank7BB) & emptySquares; } - if (Type == EVASION) + if (Type == MV_EVASION) { emptySquares &= target; // Only blocking squares enemyPieces &= target; // Capture only the checker piece @@ -570,29 +426,29 @@ namespace { // Promotions and underpromotions if (pawnsOn7) { - if (Type == CAPTURE) + if (Type == MV_CAPTURE) emptySquares = pos.empty_squares(); pawns &= ~TRank7BB; - mlist = generate_promotions(pos, mlist, pawnsOn7, enemyPieces); - mlist = generate_promotions(pos, mlist, pawnsOn7, enemyPieces); - mlist = generate_promotions(pos, mlist, pawnsOn7, emptySquares); + mlist = generate_promotions(pos, mlist, pawnsOn7, enemyPieces); + mlist = generate_promotions(pos, mlist, pawnsOn7, enemyPieces); + mlist = generate_promotions(pos, mlist, pawnsOn7, emptySquares); } // Standard captures - if (Type == CAPTURE || Type == EVASION) + if (Type == MV_CAPTURE || Type == MV_EVASION) { - mlist = generate_pawn_captures(mlist, pawns, enemyPieces); - mlist = generate_pawn_captures(mlist, pawns, enemyPieces); + mlist = generate_pawn_captures(mlist, pawns, enemyPieces); + mlist = generate_pawn_captures(mlist, pawns, enemyPieces); } // Single and double pawn pushes - if (Type != CAPTURE) + if (Type != MV_CAPTURE) { - b1 = pawnPushes & emptySquares; - b2 = move_pawns(pawnPushes & TRank3BB) & emptySquares; + b1 = (Type != MV_EVASION ? pawnPushes : pawnPushes & emptySquares); + b2 = move_pawns(pawnPushes & TRank3BB) & emptySquares; - if (Type == CHECK) + if (Type == MV_CHECK) { // Consider only pawn moves which give direct checks b1 &= pos.attacks_from(ksq, Them); @@ -603,19 +459,19 @@ namespace { // don't generate captures. if (pawns & target) // For CHECK type target is dc bitboard { - dc1 = move_pawns(pawns & target & ~file_bb(ksq)) & emptySquares; - dc2 = move_pawns(dc1 & TRank3BB) & emptySquares; + dc1 = move_pawns(pawns & target & ~file_bb(ksq)) & emptySquares; + dc2 = move_pawns(dc1 & TRank3BB) & emptySquares; b1 |= dc1; b2 |= dc2; } } - SERIALIZE_MOVES_D(b1, -TDELTA_N); - SERIALIZE_MOVES_D(b2, -TDELTA_N -TDELTA_N); + SERIALIZE_MOVES_D(b1, -UP); + SERIALIZE_MOVES_D(b2, -UP -UP); } // En passant captures - if ((Type == CAPTURE || Type == EVASION) && pos.ep_square() != SQ_NONE) + if ((Type == MV_CAPTURE || Type == MV_EVASION) && pos.ep_square() != SQ_NONE) { assert(Us != WHITE || square_rank(pos.ep_square()) == RANK_6); assert(Us != BLACK || square_rank(pos.ep_square()) == RANK_3); @@ -623,7 +479,7 @@ namespace { // An en passant capture can be an evasion only if the checking piece // is the double pushed pawn and so is in the target. Otherwise this // is a discovery check and we are forced to do otherwise. - if (Type == EVASION && !bit_is_set(target, pos.ep_square() - TDELTA_N)) + if (Type == MV_EVASION && !bit_is_set(target, pos.ep_square() - UP)) return mlist; b1 = pawns & pos.attacks_from(pos.ep_square(), Them); @@ -640,45 +496,49 @@ namespace { } template - MoveStack* generate_castle_moves(const Position& pos, MoveStack* mlist) { + MoveStack* generate_castle_moves(const Position& pos, MoveStack* mlist, Color us) { + + CastleRight f = CastleRight((Side == KING_SIDE ? WHITE_OO : WHITE_OOO) << us); + Color them = opposite_color(us); + + // After castling, the rook and king's final positions are exactly the same + // in Chess960 as they would be in standard chess. + Square kfrom = pos.king_square(us); + Square rfrom = pos.castle_rook_square(f); + Square kto = relative_square(us, Side == KING_SIDE ? SQ_G1 : SQ_C1); + Square rto = relative_square(us, Side == KING_SIDE ? SQ_F1 : SQ_D1); + + assert(!pos.in_check()); + assert(pos.piece_on(kfrom) == make_piece(us, KING)); + assert(pos.piece_on(rfrom) == make_piece(us, ROOK)); + + // Unimpeded rule: All the squares between the king's initial and final squares + // (including the final square), and all the squares between the rook's initial + // and final squares (including the final square), must be vacant except for + // the king and castling rook. + for (Square s = Min(kfrom, kto); s <= Max(kfrom, kto); s++) + if ( (s != kfrom && s != rfrom && !pos.square_is_empty(s)) + ||(pos.attackers_to(s) & pos.pieces(them))) + return mlist; - Color us = pos.side_to_move(); + for (Square s = Min(rfrom, rto); s <= Max(rfrom, rto); s++) + if (s != kfrom && s != rfrom && !pos.square_is_empty(s)) + return mlist; - if ( (Side == KING_SIDE && pos.can_castle_kingside(us)) - ||(Side == QUEEN_SIDE && pos.can_castle_queenside(us))) + // Because we generate only legal castling moves we need to verify that + // when moving the castling rook we do not discover some hidden checker. + // For instance an enemy queen in SQ_A1 when castling rook is in SQ_B1. + if (pos.is_chess960()) { - Color them = opposite_color(us); - Square ksq = pos.king_square(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); - Square s2 = relative_square(us, Side == KING_SIDE ? SQ_F1 : SQ_D1); - Square s; - bool illegal = false; - - 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++) - if ( (s != ksq && s != rsq && pos.square_is_occupied(s)) - ||(pos.attackers_to(s) & pos.pieces_of_color(them))) - illegal = true; - - for (s = Min(rsq, s2); s <= Max(rsq, s2); s++) - if (s != ksq && s != rsq && pos.square_is_occupied(s)) - illegal = true; + Bitboard occ = pos.occupied_squares(); + clear_bit(&occ, rfrom); + if (pos.attackers_to(kto, occ) & pos.pieces(them)) + return mlist; + } - if ( Side == QUEEN_SIDE - && square_file(rsq) == FILE_B - && ( 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; + (*mlist++).move = make_castle_move(kfrom, rfrom); - if (!illegal) - (*mlist++).move = make_castle_move(ksq, rsq); - } return mlist; } -} + +} // namespace