X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=0056ce384dfff017f45d164d442d746a62649943;hp=0db293ccc7eb713901e139665578821a3b077a9f;hb=f427acbd2787cdf0373d081a3a20019b5eb253c6;hpb=4dded4e72f9b9582db8adc9a478e9eda5841d8c5 diff --git a/src/movegen.cpp b/src/movegen.cpp index 0db293cc..0056ce38 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -17,11 +17,6 @@ along with this program. If not, see . */ - -//// -//// Includes -//// - #include #include "bitcount.h" @@ -34,10 +29,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,131 +36,174 @@ namespace { QUEEN_SIDE }; - enum MoveType { - CAPTURE, - NON_CAPTURE, - CHECK, - EVASION - }; - - // Helper templates template - MoveStack* generate_castle_moves(const Position&, MoveStack*); + MoveStack* generate_castle_moves(const Position&, MoveStack*, Color us); template MoveStack* generate_pawn_moves(const Position&, MoveStack*, Bitboard, Square); - // Template generate_piece_moves (captures and non-captures) with specializations and overloads - template - MoveStack* generate_piece_moves(const Position&, MoveStack*, Color, Bitboard); + template + inline MoveStack* generate_discovered_checks(const Position& pos, MoveStack* mlist, Square from) { + + assert(Piece != QUEEN); + + 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 + inline MoveStack* generate_direct_checks(const Position& pos, MoveStack* mlist, Color us, + Bitboard dc, Square ksq) { + assert(Piece != KING); + + Bitboard checkSqs, b; + Square from; + const Square* ptr = pos.piece_list_begin(us, Piece); + + if ((from = *ptr++) == SQ_NONE) + return mlist; + + 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))) + continue; + + if (dc && bit_is_set(dc, from)) + continue; + + b = pos.attacks_from(from) & checkSqs; + SERIALIZE_MOVES(b); + + } while ((from = *ptr++) != SQ_NONE); + + return mlist; + } template<> - MoveStack* generate_piece_moves(const Position&, MoveStack*, Color, Bitboard); + 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)); + } template - inline MoveStack* generate_piece_moves(const Position& p, MoveStack* m, Color us, Bitboard t) { + 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(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)); } - // Templates for non-capture checks generation - template - MoveStack* generate_discovered_checks(const Position&, MoveStack*, Square); + FORCE_INLINE MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) { - template - MoveStack* generate_direct_checks(const Position&, MoveStack*, Color, Bitboard, Square); + Bitboard b; + Square from; + const Square* ptr = pos.piece_list_begin(us, Piece); + + if (*ptr != SQ_NONE) + { + do { + from = *ptr; + b = pos.attacks_from(from) & target; + SERIALIZE_MOVES(b); + } while (*++ptr != 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_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) { + + Bitboard b; + Square from = pos.king_square(us); - return (us == WHITE ? generate_pawn_moves(p, m, dc, ksq) - : generate_pawn_moves(p, m, dc, ksq)); + b = pos.attacks_from(from) & target; + SERIALIZE_MOVES(b); + return mlist; } -} +} //// //// 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()); 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); -} - + Bitboard 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) { - - assert(pos.is_ok()); - assert(!pos.is_check()); + if (Type == MV_CAPTURE || Type == MV_NON_EVASION) + target = pos.pieces_of_color(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); -} - - -/// 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()); + if (Type != MV_CAPTURE) + { + if (pos.can_castle_kingside(us)) + mlist = generate_castle_moves(pos, mlist, us); - target |= pos.empty_squares(); + if (pos.can_castle_queenside(us)) + 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 instantiation +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. - -MoveStack* generate_non_capture_checks(const Position& pos, MoveStack* mlist) { +template<> +MoveStack* generate(const Position& pos, MoveStack* mlist) { assert(pos.is_ok()); assert(!pos.is_check()); @@ -179,7 +213,7 @@ MoveStack* generate_non_capture_checks(const Position& pos, MoveStack* mlist) { 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); @@ -209,8 +243,8 @@ 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. - -MoveStack* generate_evasions(const Position& pos, MoveStack* mlist) { +template<> +MoveStack* generate(const Position& pos, MoveStack* mlist) { assert(pos.is_ok()); assert(pos.is_check()); @@ -223,7 +257,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 @@ -244,7 +278,7 @@ MoveStack* generate_evasions(const Position& pos, MoveStack* mlist) { 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 (squares_straight_aligned(checksq, ksq)) + if (RookPseudoAttacks[checksq] & (1ULL << ksq)) sliderAttacks |= RookPseudoAttacks[checksq] | pos.attacks_from(checksq); else sliderAttacks |= BishopPseudoAttacks[checksq] | pos.attacks_from(checksq); @@ -266,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); @@ -274,22 +308,26 @@ 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. +/// generate computes a complete list of legal +/// or pseudo-legal moves in the current position. +template<> +inline MoveStack* generate(const Position& pos, MoveStack* mlist) { + + assert(pos.is_ok()); + + return pos.is_check() ? generate(pos, mlist) + : generate(pos, mlist); +} -MoveStack* generate_moves(const Position& pos, MoveStack* mlist, bool pseudoLegal) { +template<> +MoveStack* generate(const Position& pos, MoveStack* mlist) { assert(pos.is_ok()); MoveStack *last, *cur = mlist; Bitboard pinned = pos.pinned_pieces(pos.side_to_move()); - // Generate pseudo-legal moves - last = pos.is_check() ? generate_evasions(pos, mlist) - : generate_non_evasions(pos, mlist); - if (pseudoLegal) - return last; + last = generate(pos, mlist); // Remove illegal moves from the list while (cur != last) @@ -309,7 +347,7 @@ MoveStack* generate_moves(const Position& pos, MoveStack* mlist, bool pseudoLega bool move_is_legal(const Position& pos, const Move m) { MoveStack mlist[MOVES_MAX]; - MoveStack *cur, *last = generate_moves(pos, mlist, true); + MoveStack *cur, *last = generate(pos, mlist); for (cur = mlist; cur != last; cur++) if (cur->move == m) @@ -325,7 +363,6 @@ bool move_is_legal(const Position& pos, const Move m) { 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(); @@ -415,36 +452,7 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { namespace { - template - 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); - - if (*ptr != SQ_NONE) - { - do { - from = *ptr; - b = pos.attacks_from(from) & target; - SERIALIZE_MOVES(b); - } while (*++ptr != SQ_NONE); - } - 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.attacks_from(from) & target; - SERIALIZE_MOVES(b); - return mlist; - } - - template + template inline Bitboard move_pawns(Bitboard p) { return Delta == DELTA_N ? p << 8 : Delta == DELTA_S ? p >> 8 : @@ -452,7 +460,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); @@ -466,7 +474,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); @@ -484,10 +492,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); @@ -496,7 +504,7 @@ namespace { // This is the only possible under promotion that can give a check // not already included in the queen-promotion. - if ( Type == CHECK + if ( Type == MV_CHECK && bit_is_set(pos.attacks_from(to), pos.king_square(opposite_color(Us)))) (*mlist++).move = make_promotion_move(to - Delta, to, KNIGHT); else (void)pos; // Silence a warning under MSVC @@ -509,27 +517,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 TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S); + const Square TDELTA_NE = (Us == WHITE ? DELTA_NE : DELTA_SE); + const Square TDELTA_NW = (Us == WHITE ? DELTA_NW : DELTA_SW); 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_of_color(Them)); // Pre-calculate pawn pushes before changing emptySquares definition - if (Type != CAPTURE) + if (Type != MV_CAPTURE) { - emptySquares = (Type == NON_CAPTURE ? target : pos.empty_squares()); + 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 @@ -538,7 +546,7 @@ namespace { // Promotions and underpromotions if (pawnsOn7) { - if (Type == CAPTURE) + if (Type == MV_CAPTURE) emptySquares = pos.empty_squares(); pawns &= ~TRank7BB; @@ -548,21 +556,21 @@ namespace { } // 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); } // Single and double pawn pushes - if (Type != CAPTURE) + if (Type != MV_CAPTURE) { b1 = pawnPushes & emptySquares; b2 = move_pawns(pawnPushes & TRank3BB) & emptySquares; - if (Type == CHECK) + if (Type == MV_CHECK) { - // Condider only pawn moves which give direct checks + // Consider only pawn moves which give direct checks b1 &= pos.attacks_from(ksq, Them); b2 &= pos.attacks_from(ksq, Them); @@ -583,7 +591,7 @@ namespace { } // 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); @@ -591,7 +599,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() - TDELTA_N)) return mlist; b1 = pawns & pos.attacks_from(pos.ep_square(), Them); @@ -607,93 +615,42 @@ namespace { return mlist; } - template - MoveStack* generate_discovered_checks(const Position& pos, MoveStack* mlist, Square from) { - - assert(Piece != QUEEN); - - 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 - MoveStack* generate_direct_checks(const Position& pos, MoveStack* mlist, Color us, - Bitboard dc, Square ksq) { - assert(Piece != KING); - - Bitboard checkSqs, b; - Square from; - const Square* ptr = pos.piece_list_begin(us, Piece); - - if ((from = *ptr++) == SQ_NONE) - return mlist; - - 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))) - continue; - - if (dc && bit_is_set(dc, from)) - continue; - - b = pos.attacks_from(from) & checkSqs; - SERIALIZE_MOVES(b); - - } while ((from = *ptr++) != SQ_NONE); - - return mlist; - } - template - MoveStack* generate_castle_moves(const Position& pos, MoveStack* mlist) { + MoveStack* generate_castle_moves(const Position& pos, MoveStack* mlist, Color us) { - Color us = pos.side_to_move(); + Color them = opposite_color(us); + Square ksq = pos.king_square(us); - if ( (Side == KING_SIDE && pos.can_castle_kingside(us)) - ||(Side == QUEEN_SIDE && pos.can_castle_queenside(us))) - { - Color them = opposite_color(us); - Square ksq = pos.king_square(us); + assert(pos.piece_on(ksq) == make_piece(us, KING)); - 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; - 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) == make_piece(us, ROOK)); - 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; - // 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; - for (s = Min(rsq, s2); s <= Max(rsq, s2); s++) - if (s != ksq && s != rsq && pos.square_is_occupied(s)) - illegal = true; + if ( Side == QUEEN_SIDE + && square_file(rsq) == FILE_B + && ( pos.piece_on(relative_square(us, SQ_A1)) == make_piece(them, ROOK) + || pos.piece_on(relative_square(us, SQ_A1)) == make_piece(them, QUEEN))) + illegal = true; - 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; + if (!illegal) + (*mlist++).move = make_castle_move(ksq, rsq); - if (!illegal) - (*mlist++).move = make_castle_move(ksq, rsq); - } return mlist; } -} + +} // namespace