X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=4b36360c56ae7a13c67178e14d495b320897b531;hp=ce8f54cac77ef35a103a662a63c71f58c41f02cf;hb=7a68916ff992115d8013e7ce31850aec558d8ac5;hpb=aed542d74cf57438fef19b662a56d8d810bc1965 diff --git a/src/movegen.cpp b/src/movegen.cpp index ce8f54ca..4b36360c 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -47,81 +47,48 @@ namespace { enum MoveType { CAPTURE, - NON_CAPTURE + NON_CAPTURE, + CHECK, + EVASION }; - // Functions - bool castling_is_check(const Position&, CastlingSide); - // Helper templates template - MoveStack* generate_castle_moves(const Position& pos, MoveStack* mlist); - - template - MoveStack* generate_pawn_blocking_evasions(const Position&, Bitboard, Bitboard, MoveStack*); - - template - MoveStack* generate_pawn_captures(const Position& pos, MoveStack* mlist); - - template - MoveStack* generate_pawn_captures_diagonal(MoveStack* mlist, Bitboard pawns, Bitboard enemyPieces, bool promotion); + MoveStack* generate_castle_moves(const Position&, MoveStack*); - template - MoveStack* generate_pawn_noncaptures(const Position& pos, MoveStack* mlist, Bitboard dc = EmptyBoardBB, Square ksq = SQ_NONE); + template + MoveStack* generate_pawn_moves(const Position&, MoveStack*, Bitboard, Square); - template - inline Bitboard move_pawns(Bitboard p) { - - if (Direction == DELTA_N) - return Us == WHITE ? p << 8 : p >> 8; - else if (Direction == DELTA_NE) - return Us == WHITE ? p << 9 : p >> 7; - else if (Direction == DELTA_NW) - return Us == WHITE ? p << 7 : p >> 9; - else - return p; - } - - // Template generate_piece_checks() with specializations - template - MoveStack* generate_piece_checks(const Position&, MoveStack*, Color, Bitboard, Square); - - template<> - inline MoveStack* generate_piece_checks(const Position& p, MoveStack* m, Color us, Bitboard dc, Square ksq) { - - return (us == WHITE ? generate_pawn_noncaptures(p, m, dc, ksq) - : generate_pawn_noncaptures(p, m, dc, ksq)); - } - - // Template generate_piece_moves() with specializations and overloads + // Template generate_piece_moves (captures and non-captures) with specializations and overloads template - MoveStack* generate_piece_moves(const Position&, MoveStack*, Color us, Bitboard); + MoveStack* generate_piece_moves(const Position&, MoveStack*, Color, Bitboard); template<> MoveStack* generate_piece_moves(const Position&, MoveStack*, Color, Bitboard); template - inline MoveStack* generate_piece_moves(const Position& p, MoveStack* m, Color us) { + inline MoveStack* generate_piece_moves(const Position& p, MoveStack* m, Color us, Bitboard t) { - assert(Piece == PAWN); + assert(Piece == PAWN); + assert(Type == CAPTURE || Type == NON_CAPTURE || Type == EVASION); - if (Type == CAPTURE) - return (us == WHITE ? generate_pawn_captures(p, m) - : generate_pawn_captures(p, m)); - else - return (us == WHITE ? generate_pawn_noncaptures(p, m) - : generate_pawn_noncaptures(p, m)); + 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); + template - MoveStack* generate_piece_moves(const Position&, MoveStack*, Color us, Bitboard, Bitboard); + MoveStack* generate_direct_checks(const Position&, MoveStack*, Color, Bitboard, Square); template<> - inline MoveStack* generate_piece_moves(const Position& p, MoveStack* m, - Color us, Bitboard t, Bitboard pnd) { + inline MoveStack* generate_direct_checks(const Position& p, MoveStack* m, Color us, Bitboard dc, Square ksq) { - return (us == WHITE ? generate_pawn_blocking_evasions(p, pnd, t, m) - : generate_pawn_blocking_evasions(p, pnd, t, m)); + return (us == WHITE ? generate_pawn_moves(p, m, dc, ksq) + : generate_pawn_moves(p, m, dc, ksq)); } } @@ -131,7 +98,7 @@ namespace { //// -/// generate_captures generates() all pseudo-legal captures and queen +/// generate_captures() generates all pseudo-legal captures and queen /// promotions. Returns a pointer to the end of the move list. MoveStack* generate_captures(const Position& pos, MoveStack* mlist) { @@ -146,7 +113,7 @@ MoveStack* generate_captures(const Position& pos, MoveStack* mlist) { 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); + mlist = generate_piece_moves(pos, mlist, us, target); return generate_piece_moves(pos, mlist, us, target); } @@ -162,7 +129,7 @@ MoveStack* generate_noncaptures(const Position& pos, MoveStack* mlist) { Color us = pos.side_to_move(); Bitboard target = pos.empty_squares(); - mlist = generate_piece_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); @@ -173,324 +140,191 @@ MoveStack* generate_noncaptures(const Position& pos, MoveStack* mlist) { } -/// generate_non_capture_checks() generates all pseudo-legal non-capturing, -/// non-promoting checks. Returns a pointer to the end of the move list. +/// 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, Bitboard dc) { +MoveStack* generate_non_capture_checks(const Position& pos, MoveStack* mlist) { assert(pos.is_ok()); assert(!pos.is_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)); - // Pieces moves - mlist = generate_piece_checks(pos, mlist, us, dc, ksq); - mlist = generate_piece_checks(pos, mlist, us, dc, ksq); - mlist = generate_piece_checks(pos, mlist, us, dc, ksq); - mlist = generate_piece_checks(pos, mlist, us, dc, ksq); - mlist = generate_piece_checks(pos, mlist, us, dc, ksq); - mlist = generate_piece_checks(pos, mlist, us, dc, ksq); - - // Castling moves that give check. Very rare but nice to have! - if ( pos.can_castle_queenside(us) - && (square_rank(ksq) == square_rank(pos.king_square(us)) || square_file(ksq) == FILE_D) - && castling_is_check(pos, QUEEN_SIDE)) - mlist = generate_castle_moves(pos, mlist); - - if ( pos.can_castle_kingside(us) - && (square_rank(ksq) == square_rank(pos.king_square(us)) || square_file(ksq) == FILE_F) - && castling_is_check(pos, KING_SIDE)) - mlist = generate_castle_moves(pos, mlist); - - return mlist; + // Discovered non-capture checks + b = dc = pos.discovered_check_candidates(us); + + while (b) + { + from = pop_1st_bit(&b); + switch (pos.type_of_piece_on(from)) + { + case PAWN: /* Will be generated togheter with pawns direct checks */ break; + case KNIGHT: mlist = generate_discovered_checks(pos, mlist, from); break; + case BISHOP: mlist = generate_discovered_checks(pos, mlist, from); break; + case ROOK: mlist = generate_discovered_checks(pos, mlist, from); break; + case KING: mlist = generate_discovered_checks(pos, mlist, from); break; + default: assert(false); break; + } + } + + // Direct non-capture checks + mlist = generate_direct_checks(pos, mlist, us, dc, ksq); + mlist = generate_direct_checks(pos, mlist, us, dc, ksq); + mlist = generate_direct_checks(pos, mlist, us, dc, ksq); + mlist = generate_direct_checks(pos, mlist, us, dc, ksq); + return generate_direct_checks(pos, mlist, us, dc, ksq); } -/// 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. Returns a pointer to the end of the move list. +/// 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, Bitboard pinned) { +MoveStack* generate_evasions(const Position& pos, MoveStack* mlist) { assert(pos.is_ok()); assert(pos.is_check()); - Square from, to; + Bitboard b, target; + Square from, checksq; + int checkersCnt = 0; Color us = pos.side_to_move(); - Color them = opposite_color(us); Square ksq = pos.king_square(us); - Bitboard sliderAttacks = EmptyBoardBB; Bitboard checkers = pos.checkers(); + Bitboard sliderAttacks = EmptyBoardBB; assert(pos.piece_on(ksq) == piece_of_color_and_type(us, KING)); + assert(checkers); - // The bitboard of occupied pieces without our king - 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 - // and to be able to use attackers_to(). - Bitboard b = checkers & pos.pieces(BISHOP, QUEEN); - while (b) + // Find squares attacked by slider checkers, we will remove + // them from the king evasions set so to early skip known + // illegal moves and avoid an useless legality check later. + b = checkers; + do { - from = pop_1st_bit(&b); - sliderAttacks |= bishop_attacks_bb(from, b_noKing); - } + checkersCnt++; + checksq = pop_1st_bit(&b); - b = checkers & pos.pieces(ROOK, QUEEN); - while (b) - { - from = pop_1st_bit(&b); - sliderAttacks |= rook_attacks_bb(from, b_noKing); - } - - // Generate evasions for king, both captures and non captures - Bitboard b1 = pos.attacks_from(ksq) & ~pos.pieces_of_color(us) & ~sliderAttacks; - Bitboard enemy = pos.pieces_of_color(them); - while (b1) - { - to = pop_1st_bit(&b1); - // Note that we can use attackers_to() only because we - // have already removed slider checkers attacked squares. - if (!(pos.attackers_to(to) & enemy)) - (*mlist++).move = make_move(ksq, to); - } + assert(pos.color_of_piece_on(checksq) == opposite_color(us)); - // Generate evasions for other pieces only if not double check. We use a - // simple bit twiddling hack here rather than calling count_1s in order to - // save some time (we know that pos.checkers() has at most two nonzero bits). - if (!(checkers & (checkers - 1))) // Only one bit set? - { - Square checksq = first_1(checkers); - - assert(pos.color_of_piece_on(checksq) == them); - - // Generate captures of the checking piece - - // Pawn captures - b1 = pos.attacks_from(checksq, them) & pos.pieces(PAWN, us) & ~pinned; - while (b1) + switch (pos.type_of_piece_on(checksq)) { - from = pop_1st_bit(&b1); - if (relative_rank(us, checksq) == RANK_8) - { - (*mlist++).move = make_promotion_move(from, checksq, QUEEN); - (*mlist++).move = make_promotion_move(from, checksq, ROOK); - (*mlist++).move = make_promotion_move(from, checksq, BISHOP); - (*mlist++).move = make_promotion_move(from, checksq, KNIGHT); - } else - (*mlist++).move = make_move(from, 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 (direction_is_straight(checksq, ksq)) + sliderAttacks |= RookPseudoAttacks[checksq] | pos.attacks_from(checksq); + else + sliderAttacks |= BishopPseudoAttacks[checksq] | pos.attacks_from(checksq); + default: + break; } + } while (b); - // Pieces captures - b1 = ( (pos.attacks_from(checksq) & pos.pieces(KNIGHT, us)) - | (pos.attacks_from(checksq) & pos.pieces(BISHOP, QUEEN, us)) - | (pos.attacks_from(checksq) & pos.pieces(ROOK, QUEEN, us)) ) & ~pinned; + // Generate evasions for king, capture and non capture moves + b = pos.attacks_from(ksq) & ~pos.pieces_of_color(us) & ~sliderAttacks; + from = ksq; + SERIALIZE_MOVES(b); - while (b1) - { - from = pop_1st_bit(&b1); - (*mlist++).move = make_move(from, checksq); - } + // Generate evasions for other pieces only if not double check + if (checkersCnt > 1) + return mlist; - // Blocking check evasions are possible only if the checking piece is a slider - if (sliderAttacks) - { - Bitboard blockSquares = squares_between(checksq, ksq); - - assert((pos.occupied_squares() & blockSquares) == EmptyBoardBB); - - if (blockSquares) - { - 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); - } - } + // Find squares where a blocking evasion or a capture of the + // checker piece is possible. + target = squares_between(checksq, ksq) | checkers; - // 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.pieces(PAWN, them))) - { - to = pos.ep_square(); - b1 = pos.attacks_from(to, them) & pos.pieces(PAWN, 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); - - 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 mlist; + 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_legal_moves() computes a complete list of legal moves in the -/// current position. This function is not very fast, and should be used -/// only in situations where performance is unimportant. It wouldn't be -/// very hard to write an efficient legal move generator, but for the moment -/// we don't need it. +/// 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_legal_moves(const Position& pos, MoveStack* mlist) { +MoveStack* generate_moves(const Position& pos, MoveStack* mlist, bool pseudoLegal) { assert(pos.is_ok()); + MoveStack *last, *cur = mlist; Bitboard pinned = pos.pinned_pieces(pos.side_to_move()); + // Generate pseudo-legal moves if (pos.is_check()) - return generate_evasions(pos, mlist, pinned); + last = generate_evasions(pos, mlist); + else + last = generate_noncaptures(pos, generate_captures(pos, mlist)); - // Generate pseudo-legal moves - MoveStack* last = generate_captures(pos, mlist); - last = generate_noncaptures(pos, last); + if (pseudoLegal) + return last; // Remove illegal moves from the list - for (MoveStack* cur = mlist; cur != last; cur++) - if (!pos.pl_move_is_legal(cur->move, pinned)) - { + while (cur != last) + if (pos.pl_move_is_legal(cur->move, pinned)) + cur++; + else cur->move = (--last)->move; - cur--; - } + return last; } /// move_is_legal() takes a position and a (not necessarily pseudo-legal) -/// move and a pinned pieces bitboard as input, and tests whether -/// the move is legal. If the move is legal, the move itself is -/// returned. If not, the function returns false. This function must -/// only be used when the side to move is not in check. +/// 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[256]; + 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(!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); 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_ep(m) || move_is_castle(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; - Color them = opposite_color(us); - Square to = move_to(m); - - // En passant moves - if (move_is_ep(m)) - { - // The piece must be a pawn and destination square must be the - // en passant square. - if ( type_of_piece(pc) != PAWN - || to != pos.ep_square()) - return false; - - assert(pos.square_is_empty(to)); - 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); - } - - // Castling moves - if (move_is_short_castle(m)) - { - // The piece must be a king and side to move must still have - // the right to castle kingside. - if ( type_of_piece(pc) != KING - ||!pos.can_castle_kingside(us)) - return false; - - assert(from == pos.king_square(us)); - assert(to == pos.initial_kr_square(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); - Square s; - bool illegal = false; - - // Check if any of the squares between king and rook - // is occupied or under attack. - for (s = Min(from, g1); s <= Max(from, g1); s++) - if ( (s != from && s != to && !pos.square_is_empty(s)) - ||(pos.attackers_to(s) & pos.pieces_of_color(them))) - illegal = true; - - // Check if any of the squares between king and rook - // is occupied. - for (s = Min(to, f1); s <= Max(to, f1); s++) - if (s != from && s != to && !pos.square_is_empty(s)) - illegal = true; - - return !illegal; - } - - if (move_is_long_castle(m)) - { - // The piece must be a king and side to move must still have - // the right to castle kingside. - if ( type_of_piece(pc) != KING - ||!pos.can_castle_queenside(us)) - return false; - - assert(from == pos.king_square(us)); - assert(to == pos.initial_qr_square(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); - Square s; - bool illegal = false; - - for (s = Min(from, c1); s <= Max(from, c1); s++) - if( (s != from && s != to && !pos.square_is_empty(s)) - ||(pos.attackers_to(s) & pos.pieces_of_color(them))) - illegal = true; - - for (s = Min(to, d1); s <= Max(to, d1); s++) - if(s != from && s != to && !pos.square_is_empty(s)) - illegal = true; - - if ( square_file(to) == FILE_B - && ( 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; - } - - // Normal moves - // The destination square cannot be occupied by a friendly piece if (pos.color_of_piece_on(to) == us) return false; - // Proceed according to the type of the moving piece. + // Handle the special case of a pawn move if (type_of_piece(pc) == PAWN) { // Move direction must be compatible with pawn color @@ -498,15 +332,14 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { if ((us == WHITE) != (direction > 0)) return false; - // If the destination square is on the 8/1th rank, the move must - // be a promotion. - if ( ( (square_rank(to) == RANK_8 && us == WHITE) - ||(square_rank(to) == RANK_1 && us != WHITE)) - && !move_is_promotion(m)) + // A pawn move is a promotion iff the destination square is + // on the 8/1th rank. + if (( (square_rank(to) == RANK_8 && us == WHITE) + ||(square_rank(to) == RANK_1 && us != WHITE)) != bool(move_is_promotion(m))) return false; - // Proceed according to the square delta between the source and - // destionation squares. + // Proceed according to the square delta between the origin and + // destination squares. switch (direction) { case DELTA_NW: @@ -550,37 +383,13 @@ 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.is_check() ? pos.pl_move_is_evasion(m, pinned) : pos.pl_move_is_legal(m, pinned); } // Luckly we can handle all the other pieces in one go - return ( bit_is_set(pos.attacks_from(pc, from), to) - && pos.pl_move_is_legal(m, pinned) - && !move_is_promotion(m)); -} - - -/// Another version of move_is_legal(), which takes only a position and a move -/// as input. This function does not require that the side to move is not in -/// check. It is not optimized for speed, and is only used for verifying move -/// legality when building a PV from the transposition table. - -bool move_is_legal(const Position& pos, const Move m) { - - Bitboard pinned = pos.pinned_pieces(pos.side_to_move()); - if (!pos.is_check()) - return move_is_legal(pos, m, pinned); - else - { - Position p(pos); - MoveStack mlist[64]; - MoveStack* last = generate_evasions(p, mlist, pinned); - for (MoveStack* cur = mlist; cur != last; cur++) - if (cur->move == m) - return true; - - return false; - } + return bit_is_set(pos.attacks_from(pc, from), to) + && (pos.is_check() ? pos.pl_move_is_evasion(m, pinned) : pos.pl_move_is_legal(m, pinned)) + && !move_is_promotion(m); } @@ -589,30 +398,12 @@ namespace { template MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) { - Square from; Bitboard b; - - for (int i = 0, e = pos.piece_count(us, Piece); i < e; i++) - { - from = pos.piece_list(us, Piece, i); - b = pos.attacks_from(from) & target; - SERIALIZE_MOVES(b); - } - return mlist; - } - - template - MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, - Color us, Bitboard target, Bitboard pinned) { Square from; - Bitboard b; + const Square* ptr = pos.piece_list_begin(us, Piece); - for (int i = 0, e = pos.piece_count(us, Piece); i < e; i++) + while ((from = *ptr++) != SQ_NONE) { - from = pos.piece_list(us, Piece, i); - if (pinned && bit_is_set(pinned, from)) - continue; - b = pos.attacks_from(from) & target; SERIALIZE_MOVES(b); } @@ -630,8 +421,21 @@ namespace { return mlist; } - template - MoveStack* generate_pawn_captures_diagonal(MoveStack* mlist, Bitboard pawns, Bitboard enemyPieces, bool promotion) { + template + inline Bitboard move_pawns(Bitboard p) { + + if (Direction == DELTA_N) + return Us == WHITE ? p << 8 : p >> 8; + else if (Direction == DELTA_NE) + return Us == WHITE ? p << 9 : p >> 7; + else if (Direction == DELTA_NW) + return Us == WHITE ? p << 7 : p >> 9; + else + return p; + } + + template + inline MoveStack* generate_pawn_captures(MoveStack* mlist, Bitboard pawns, Bitboard enemyPieces) { // Calculate our parametrized parameters at compile time const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB); @@ -640,236 +444,207 @@ namespace { const SquareDelta TDELTA_NW = (Us == WHITE ? DELTA_NW : DELTA_SW); const SquareDelta TTDELTA_NE = (Diagonal == DELTA_NE ? TDELTA_NE : TDELTA_NW); + Bitboard b1, b2; Square to; // Captures in the a1-h8 (a8-h1 for black) diagonal or in the h1-a8 (h8-a1 for black) - Bitboard b1 = move_pawns(pawns) & ~TFileABB & enemyPieces; + b1 = move_pawns(pawns) & ~TFileABB & enemyPieces; - // Capturing promotions - if (promotion) + // Capturing promotions and under-promotions + if (b1 & TRank8BB) { - Bitboard b2 = b1 & TRank8BB; + b2 = b1 & TRank8BB; b1 &= ~TRank8BB; while (b2) { to = pop_1st_bit(&b2); - (*mlist++).move = make_promotion_move(to - TTDELTA_NE, to, QUEEN); + + if (Type == CAPTURE || Type == EVASION) + (*mlist++).move = make_promotion_move(to - TTDELTA_NE, to, QUEEN); + + if (Type == NON_CAPTURE || Type == EVASION) + { + (*mlist++).move = make_promotion_move(to - TTDELTA_NE, to, ROOK); + (*mlist++).move = make_promotion_move(to - TTDELTA_NE, to, BISHOP); + (*mlist++).move = make_promotion_move(to - TTDELTA_NE, to, KNIGHT); + } + + // This is the only possible under promotion that can give a check + // not already included in the queen-promotion. It is not sure that + // the promoted knight will give check, but it doesn't worth to verify. + if (Type == CHECK) + (*mlist++).move = make_promotion_move(to - TTDELTA_NE, to, KNIGHT); } } - // Capturing non-promotions - SERIALIZE_MOVES_D(b1, -TTDELTA_NE); + // Serialize standard captures + if (Type == CAPTURE || Type == EVASION) + SERIALIZE_MOVES_D(b1, -TTDELTA_NE); + return mlist; } - template - MoveStack* generate_pawn_captures(const Position& pos, MoveStack* mlist) { + template + MoveStack* generate_pawn_moves(const Position& pos, MoveStack* mlist, Bitboard target, Square ksq) { // Calculate our parametrized parameters at compile time const Color Them = (Us == WHITE ? BLACK : WHITE); const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB); const Bitboard TRank7BB = (Us == WHITE ? Rank7BB : Rank2BB); + const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB); const SquareDelta TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S); Square to; + Bitboard b1, b2, enemyPieces, emptySquares; Bitboard pawns = pos.pieces(PAWN, Us); - Bitboard enemyPieces = pos.pieces_of_color(opposite_color(Us)); - bool possiblePromotion = (pawns & TRank7BB); - - // Standard captures and capturing promotions in both directions - mlist = generate_pawn_captures_diagonal(mlist, pawns, enemyPieces, possiblePromotion); - mlist = generate_pawn_captures_diagonal(mlist, pawns, enemyPieces, possiblePromotion); - // Non-capturing promotions - if (possiblePromotion) + // Standard captures and capturing promotions and underpromotions + if (Type == CAPTURE || Type == EVASION || (pawns & TRank7BB)) { - Bitboard b1 = move_pawns(pawns) & pos.empty_squares() & TRank8BB; - while (b1) - { - to = pop_1st_bit(&b1); - (*mlist++).move = make_promotion_move(to - TDELTA_N, to, QUEEN); - } + enemyPieces = (Type == CAPTURE ? target : pos.pieces_of_color(opposite_color(Us))); + + if (Type == EVASION) + enemyPieces &= target; // Capture only the checker piece + + mlist = generate_pawn_captures(mlist, pawns, enemyPieces); + mlist = generate_pawn_captures(mlist, pawns, enemyPieces); } - // En passant captures - if (pos.ep_square() != SQ_NONE) + // Non-capturing promotions and underpromotions + if (pawns & TRank7BB) { - assert(Us != WHITE || square_rank(pos.ep_square()) == RANK_6); - assert(Us != BLACK || square_rank(pos.ep_square()) == RANK_3); + b1 = move_pawns(pawns) & TRank8BB & pos.empty_squares(); - Bitboard b1 = pawns & pos.attacks_from(pos.ep_square(), Them); - assert(b1 != EmptyBoardBB); + if (Type == EVASION) + b1 &= target; // Only blocking promotion pushes while (b1) { to = pop_1st_bit(&b1); - (*mlist++).move = make_ep_move(to, pos.ep_square()); - } - } - return mlist; - } - template - MoveStack* generate_pawn_noncaptures(const Position& pos, MoveStack* mlist, Bitboard dc, Square ksq) { + if (Type == CAPTURE || Type == EVASION) + (*mlist++).move = make_promotion_move(to - TDELTA_N, to, QUEEN); - // Calculate our parametrized parameters at compile time - const Color Them = (Us == WHITE ? BLACK : WHITE); - const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB); - const Bitboard TRank7BB = (Us == WHITE ? Rank7BB : Rank2BB); - const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB); - const SquareDelta TDELTA_NE = (Us == WHITE ? DELTA_NE : DELTA_SE); - const SquareDelta TDELTA_NW = (Us == WHITE ? DELTA_NW : DELTA_SW); - const SquareDelta TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S); + if (Type == NON_CAPTURE || Type == EVASION) + { + (*mlist++).move = make_promotion_move(to - TDELTA_N, to, ROOK); + (*mlist++).move = make_promotion_move(to - TDELTA_N, to, BISHOP); + (*mlist++).move = make_promotion_move(to - TDELTA_N, to, KNIGHT); + } - Bitboard b1, b2, dcPawns1, dcPawns2; - Square to; - Bitboard pawns = pos.pieces(PAWN, Us); - Bitboard emptySquares = pos.empty_squares(); + // 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(Them))) + (*mlist++).move = make_promotion_move(to - TDELTA_N, to, KNIGHT); + } + } - if (pawns & TRank7BB) // There is some promotion candidate ? + // Standard pawn pushes and double pushes + if (Type != CAPTURE) { - // When generating checks consider under-promotion moves (both captures - // and non captures) only if can give a discovery check. - Bitboard pp = GenerateChecks ? pawns & dc & EmptyBoardBB: pawns; - Bitboard enemyPieces = pos.pieces_of_color(opposite_color(Us)); + emptySquares = (Type == NON_CAPTURE ? target : pos.empty_squares()); - // Underpromotion captures in the a1-h8 (a8-h1 for black) direction - b1 = move_pawns(pp) & ~FileABB & enemyPieces & TRank8BB; - while (b1) + // Single and double pawn pushes + b1 = move_pawns(pawns) & emptySquares & ~TRank8BB; + b2 = move_pawns(b1 & TRank3BB) & emptySquares; + + // Filter out unwanted pushes according to the move type + if (Type == EVASION) { - to = pop_1st_bit(&b1); - (*mlist++).move = make_promotion_move(to - TDELTA_NE, to, ROOK); - (*mlist++).move = make_promotion_move(to - TDELTA_NE, to, BISHOP); - (*mlist++).move = make_promotion_move(to - TDELTA_NE, to, KNIGHT); + b1 &= target; + b2 &= target; } - - // Underpromotion captures in the h1-a8 (h8-a1 for black) direction - b1 = move_pawns(pp) & ~FileHBB & enemyPieces & TRank8BB; - while (b1) + else if (Type == CHECK) { - to = pop_1st_bit(&b1); - (*mlist++).move = make_promotion_move(to - TDELTA_NW, to, ROOK); - (*mlist++).move = make_promotion_move(to - TDELTA_NW, to, BISHOP); - (*mlist++).move = make_promotion_move(to - TDELTA_NW, to, KNIGHT); + // Pawn moves which give direct cheks + b1 &= pos.attacks_from(ksq, Them); + b2 &= pos.attacks_from(ksq, Them); + + // Pawn moves which gives discovered check. This is possible only if + // the pawn is not on the same file as the enemy king, because we + // don't generate captures. + if (pawns & target) // For CHECK type target is dc bitboard + { + Bitboard dc1 = move_pawns(pawns & target & ~file_bb(ksq)) & emptySquares & ~TRank8BB; + Bitboard dc2 = move_pawns(dc1 & TRank3BB) & emptySquares; + + b1 |= dc1; + b2 |= dc2; + } } + SERIALIZE_MOVES_D(b1, -TDELTA_N); + SERIALIZE_MOVES_D(b2, -TDELTA_N -TDELTA_N); + } + + // En passant captures + if ((Type == CAPTURE || Type == 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); + + // 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)) + return mlist; + + b1 = pawns & pos.attacks_from(pos.ep_square(), Them); + + assert(b1 != EmptyBoardBB); - // Underpromotion pawn pushes - b1 = move_pawns(pp) & emptySquares & TRank8BB; while (b1) { to = pop_1st_bit(&b1); - (*mlist++).move = make_promotion_move(to - TDELTA_N, to, ROOK); - (*mlist++).move = make_promotion_move(to - TDELTA_N, to, BISHOP); - (*mlist++).move = make_promotion_move(to - TDELTA_N, to, KNIGHT); + (*mlist++).move = make_ep_move(to, pos.ep_square()); } } + return mlist; + } - dcPawns1 = dcPawns2 = EmptyBoardBB; - if (GenerateChecks && (dc & pawns)) - { - // Pawn moves which gives discovered check. This is possible only if the - // pawn is not on the same file as the enemy king, because we don't - // generate captures. - dcPawns1 = move_pawns(pawns & dc & ~file_bb(ksq)) & emptySquares & ~TRank8BB; - dcPawns2 = move_pawns(dcPawns1 & TRank3BB) & emptySquares; - } + template + MoveStack* generate_discovered_checks(const Position& pos, MoveStack* mlist, Square from) { - // Single pawn pushes - b1 = move_pawns(pawns) & emptySquares & ~TRank8BB; - b2 = GenerateChecks ? (b1 & pos.attacks_from(ksq, Them)) | dcPawns1 : b1; - SERIALIZE_MOVES_D(b2, -TDELTA_N); + assert(Piece != QUEEN); - // Double pawn pushes - b1 = move_pawns(b1 & TRank3BB) & emptySquares; - b2 = GenerateChecks ? (b1 & pos.attacks_from(ksq, Them)) | dcPawns2 : b1; - SERIALIZE_MOVES_D(b2, -TDELTA_N -TDELTA_N); + 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_piece_checks(const Position& pos, MoveStack* mlist, Color us, + MoveStack* generate_direct_checks(const Position& pos, MoveStack* mlist, Color us, Bitboard dc, Square ksq) { + assert(Piece != KING); - Bitboard target = pos.pieces(Piece, us); - - // Discovered checks - Bitboard b = target & dc; - while (b) - { - Square from = pop_1st_bit(&b); - Bitboard bb = pos.attacks_from(from) & pos.empty_squares(); - if (Piece == KING) - bb &= ~QueenPseudoAttacks[ksq]; - - SERIALIZE_MOVES(bb); - } + Bitboard checkSqs, b; + Square from; + const Square* ptr = pos.piece_list_begin(us, Piece); - // Direct checks - b = target & ~dc; - Bitboard checkSqs = pos.attacks_from(ksq) & pos.empty_squares(); - if (Piece == KING || !checkSqs) + if ((from = *ptr++) == SQ_NONE) return mlist; - while (b) + checkSqs = pos.attacks_from(ksq) & pos.empty_squares(); + + do { - Square from = pop_1st_bit(&b); if ( (Piece == QUEEN && !(QueenPseudoAttacks[from] & checkSqs)) || (Piece == ROOK && !(RookPseudoAttacks[from] & checkSqs)) || (Piece == BISHOP && !(BishopPseudoAttacks[from] & checkSqs))) continue; - Bitboard bb = pos.attacks_from(from) & checkSqs; - SERIALIZE_MOVES(bb); - } - return mlist; - } - - template - MoveStack* generate_pawn_blocking_evasions(const Position& pos, Bitboard pinned, - Bitboard blockSquares, MoveStack* mlist) { - - // Calculate our parametrized parameters at compile time - const Rank TRANK_8 = (Us == WHITE ? RANK_8 : RANK_1); - const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB); - const SquareDelta TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S); - - Square to; - - // Find non-pinned pawns and push them one square - Bitboard b1 = move_pawns(pos.pieces(PAWN, Us) & ~pinned); - - // We don't have to AND with empty squares here, - // because the blocking squares will always be empty. - Bitboard b2 = b1 & blockSquares; - while (b2) - { - to = pop_1st_bit(&b2); - - assert(pos.piece_on(to) == EMPTY); - - if (square_rank(to) == TRANK_8) - { - (*mlist++).move = make_promotion_move(to - TDELTA_N, to, QUEEN); - (*mlist++).move = make_promotion_move(to - TDELTA_N, to, ROOK); - (*mlist++).move = make_promotion_move(to - TDELTA_N, to, BISHOP); - (*mlist++).move = make_promotion_move(to - TDELTA_N, to, KNIGHT); - } else - (*mlist++).move = make_move(to - TDELTA_N, to); - } + if (dc && bit_is_set(dc, from)) + continue; - // Double pawn pushes - b2 = b1 & pos.empty_squares() & TRank3BB; - b2 = move_pawns(b2) & blockSquares; - while (b2) - { - to = pop_1st_bit(&b2); + b = pos.attacks_from(from) & checkSqs; + SERIALIZE_MOVES(b); - assert(pos.piece_on(to) == EMPTY); - assert(Us != WHITE || square_rank(to) == RANK_4); - assert(Us != BLACK || square_rank(to) == RANK_5); + } while ((from = *ptr++) != SQ_NONE); - (*mlist++).move = make_move(to - TDELTA_N - TDELTA_N, to); - } return mlist; } @@ -915,17 +690,4 @@ namespace { } return mlist; } - - bool castling_is_check(const Position& pos, CastlingSide side) { - - // After castling opponent king is attacked by the castled rook? - File rookFile = (side == QUEEN_SIDE ? FILE_D : FILE_F); - Color us = pos.side_to_move(); - Square ksq = pos.king_square(us); - Bitboard occ = pos.occupied_squares(); - - clear_bit(&occ, ksq); // Remove our king from the board - Square rsq = make_square(rookFile, square_rank(ksq)); - return bit_is_set(rook_attacks_bb(rsq, occ), pos.king_square(opposite_color(us))); - } }