X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=6f932cd05de6befd53b89737c5e0aadae1cdb516;hp=349d3b71e2c940d54b4657b2019b259212ff4871;hb=ee0afea1e57e4c39140c838b9f9f2d5c7c061e6b;hpb=12f4bbc8f2b6122d9dc0949f3483e7dd3f26a829 diff --git a/src/movegen.cpp b/src/movegen.cpp index 349d3b71..6f932cd0 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -26,6 +26,7 @@ #include "bitcount.h" #include "movegen.h" +#include "types.h" // Simple macro to wrap a very common while loop, no facny, no flexibility, // hardcoded list name 'mlist' and from square 'from'. @@ -45,15 +46,8 @@ namespace { QUEEN_SIDE }; - enum MoveType { - CAPTURE, - NON_CAPTURE, - CHECK, - EVASION - }; - 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); @@ -106,24 +100,24 @@ namespace { } 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) { + 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)); } 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; @@ -141,7 +135,7 @@ namespace { } 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); @@ -153,84 +147,73 @@ 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. -template<> -MoveStack* generate(const Position& pos, MoveStack* mlist) { +/// +/// 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. + +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; + 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); -/// generate_noncaptures() generates all pseudo-legal non-captures and -/// underpromotions. Returns a pointer to the end of the move list. -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.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. -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, 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. template<> -MoveStack* generate(const Position& pos, MoveStack* mlist) { +MoveStack* generate(const Position& pos, MoveStack* mlist) { assert(pos.is_ok()); assert(!pos.is_check()); @@ -271,7 +254,7 @@ MoveStack* generate(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(const Position& pos, MoveStack* mlist) { assert(pos.is_ok()); assert(pos.is_check()); @@ -327,7 +310,7 @@ MoveStack* generate(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,22 +318,26 @@ MoveStack* generate(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()); -MoveStack* generate_moves(const Position& pos, MoveStack* mlist, bool pseudoLegal) { + return pos.is_check() ? generate(pos, mlist) + : generate(pos, mlist); +} + +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(pos, mlist) - : generate(pos, mlist); - if (pseudoLegal) - return last; + last = generate(pos, mlist); // Remove illegal moves from the list while (cur != last) @@ -370,7 +357,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) @@ -515,10 +502,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); @@ -527,7 +514,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 @@ -551,16 +538,16 @@ namespace { 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 @@ -569,7 +556,7 @@ namespace { // Promotions and underpromotions if (pawnsOn7) { - if (Type == CAPTURE) + if (Type == MV_CAPTURE) emptySquares = pos.empty_squares(); pawns &= ~TRank7BB; @@ -579,19 +566,19 @@ 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) { // Consider only pawn moves which give direct checks b1 &= pos.attacks_from(ksq, Them); @@ -614,7 +601,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); @@ -622,7 +609,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); @@ -639,45 +626,41 @@ namespace { } 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) == piece_of_color_and_type(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) == piece_of_color_and_type(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)) == 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 ( 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