X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovegen.cpp;h=e9e412749b51ec8493159b37a26d34d6337c0cc1;hb=21850536d54c3f142f1907e31ac0bfab8f4a8862;hp=9cb588a385e6534b0a5db52a5fad5b19230ca768;hpb=84870690583ddbdf0a9bd51dd5d5f821b0fadb63;p=stockfish diff --git a/src/movegen.cpp b/src/movegen.cpp index 9cb588a3..e9e41274 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -55,19 +55,19 @@ namespace { // Helper templates template - MoveStack* generate_castle_moves(const Position& pos, MoveStack* mlist); + MoveStack* generate_castle_moves(const Position&, MoveStack*); template MoveStack* generate_pawn_blocking_evasions(const Position&, Bitboard, Bitboard, MoveStack*); template - MoveStack* generate_pawn_captures(const Position& pos, MoveStack* mlist); + MoveStack* generate_pawn_captures(const Position&, MoveStack*); template - MoveStack* generate_pawn_captures_diagonal(MoveStack* mlist, Bitboard pawns, Bitboard enemyPieces, bool promotion); + MoveStack* generate_pawn_captures_diagonal(MoveStack*, Bitboard, Bitboard, bool); template - MoveStack* generate_pawn_noncaptures(const Position& pos, MoveStack* mlist, Bitboard dc = EmptyBoardBB, Square ksq = SQ_NONE); + MoveStack* generate_pawn_noncaptures(const Position&, MoveStack*, Bitboard = EmptyBoardBB, Square = SQ_NONE); template inline Bitboard move_pawns(Bitboard p) { @@ -95,7 +95,7 @@ namespace { // Template generate_piece_moves() 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); @@ -114,7 +114,7 @@ namespace { } template - MoveStack* generate_piece_moves(const Position&, MoveStack*, Color us, Bitboard, Bitboard); + MoveStack* generate_piece_moves(const Position&, MoveStack*, Color, Bitboard, Bitboard); template<> inline MoveStack* generate_piece_moves(const Position& p, MoveStack* m, @@ -131,7 +131,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) { @@ -173,8 +173,8 @@ 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 +/// 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) { @@ -231,8 +231,8 @@ MoveStack* generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pin 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 + // Find squares attacked by slider checkers, we will remove + // them from the 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); @@ -249,14 +249,14 @@ MoveStack* generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pin 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; + // Generate evasions for king, capture and non capture moves Bitboard enemy = pos.pieces_of_color(them); + Bitboard b1 = pos.attacks_from(ksq) & ~pos.pieces_of_color(us) & ~sliderAttacks; while (b1) { + // Note that we can use attackers_to() only because we have already + // removed from b1 the squares attacked by slider checkers. 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); } @@ -345,9 +345,9 @@ MoveStack* generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pin } -/// generate_moves() computes a complete list of legal or pseudo legal moves in +/// 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 situations where performance is unimportant. +/// only in non time-critical paths. MoveStack* generate_moves(const Position& pos, MoveStack* mlist, bool pseudoLegal) { @@ -377,7 +377,7 @@ MoveStack* generate_moves(const Position& pos, MoveStack* mlist, bool pseudoLega /// 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 for non time-critical paths. +/// and should be used only in non time-critical paths. bool move_is_legal(const Position& pos, const Move m) { @@ -391,8 +391,8 @@ bool move_is_legal(const Position& pos, const Move m) { } -/// Fast version of move_is_legal() that takes a position a move and -/// a pinned pieces bitboard as input, and tests whether the move is legal. +/// 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. /// This version must only be used when the side to move is not in check. bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { @@ -407,7 +407,9 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { return move_is_legal(pos, m); 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); // If the from square is not occupied by a piece belonging to the side to @@ -415,14 +417,11 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { if (color_of_piece(pc) != us) return false; - Color them = opposite_color(us); - Square to = move_to(m); - // 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 @@ -430,15 +429,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: @@ -509,6 +507,17 @@ namespace { return mlist; } + template<> + MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) { + + Bitboard b; + Square from = pos.king_square(us); + + b = pos.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) { @@ -527,17 +536,6 @@ namespace { return mlist; } - template<> - MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) { - - Bitboard b; - Square from = pos.king_square(us); - - b = pos.attacks_from(from) & target; - SERIALIZE_MOVES(b); - return mlist; - } - template MoveStack* generate_pawn_captures_diagonal(MoveStack* mlist, Bitboard pawns, Bitboard enemyPieces, bool promotion) { @@ -673,7 +671,7 @@ namespace { } dcPawns1 = dcPawns2 = EmptyBoardBB; - if (GenerateChecks && (dc & pawns)) + if (GenerateChecks && (pawns & dc)) { // 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 @@ -700,8 +698,11 @@ namespace { Bitboard target = pos.pieces(Piece, us); - // Discovered checks + // Discovered non-capture checks Bitboard b = target & dc; + + assert(Piece != QUEEN || !b); + while (b) { Square from = pop_1st_bit(&b); @@ -712,7 +713,7 @@ namespace { SERIALIZE_MOVES(bb); } - // Direct checks + // Direct non-capture checks b = target & ~dc; Bitboard checkSqs = pos.attacks_from(ksq) & pos.empty_squares(); if (Piece == KING || !checkSqs) @@ -737,47 +738,38 @@ namespace { Bitboard blockSquares, MoveStack* mlist) { // Calculate our parametrized parameters at compile time - const Rank TRANK_8 = (Us == WHITE ? RANK_8 : RANK_1); + 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); + Bitboard b1, b2; Square to; + Bitboard pawns = pos.pieces(PAWN, Us) & ~pinned; + Bitboard emptySquares = pos.empty_squares(); - // 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) + if (pawns & TRank7BB) // There is some promotion candidate ? { - to = pop_1st_bit(&b2); - - assert(pos.piece_on(to) == EMPTY); - - if (square_rank(to) == TRANK_8) + // Note that blockSquares are always empty + b1 = move_pawns(pawns) & blockSquares & TRank8BB; + while (b1) { + to = pop_1st_bit(&b1); (*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); + } } - // Double pawn pushes - b2 = b1 & pos.empty_squares() & TRank3BB; - b2 = move_pawns(b2) & blockSquares; - while (b2) - { - to = pop_1st_bit(&b2); - - assert(pos.piece_on(to) == EMPTY); - assert(Us != WHITE || square_rank(to) == RANK_4); - assert(Us != BLACK || square_rank(to) == RANK_5); + // Single pawn pushes + b1 = move_pawns(pawns) & emptySquares & ~TRank8BB; + b2 = b1 & blockSquares; + SERIALIZE_MOVES_D(b2, -TDELTA_N); - (*mlist++).move = make_move(to - TDELTA_N - TDELTA_N, to); - } + // Double pawn pushes. Note that blockSquares are always empty + b1 = move_pawns(b1 & TRank3BB) & blockSquares; + SERIALIZE_MOVES_D(b1, -TDELTA_N -TDELTA_N); return mlist; }