X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=a0c06aa8dc6404f1c4b4df109a7fefa6ae0ef67f;hp=8c4712dfeb4340ca696b1f4a68f0c558155e03d2;hb=99e547f4cb190e462d0c582b731a0fcf25ce1545;hpb=834bd9edd79d11566ec3556945a858d2d84a726b diff --git a/src/movegen.cpp b/src/movegen.cpp index 8c4712df..a0c06aa8 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,6 @@ along with this program. If not, see . */ -#include #include #include "movegen.h" @@ -32,8 +31,8 @@ (*mlist++).move = make_move(to - (d), to); } namespace { - template - MoveStack* generate_castle(const Position& pos, MoveStack* mlist, Color us) { + template + ExtMove* generate_castle(const Position& pos, ExtMove* mlist, Color us) { if (pos.castle_impeded(us, Side) || !pos.can_castle(make_castle_right(us, Side))) return mlist; @@ -45,45 +44,35 @@ namespace { Square kto = relative_square(us, Side == KING_SIDE ? SQ_G1 : SQ_C1); Bitboard enemies = pos.pieces(~us); - assert(!pos.in_check()); + assert(!pos.checkers()); - for (Square s = std::min(kfrom, kto), e = std::max(kfrom, kto); s <= e; s++) - if ( s != kfrom // We are not in check - && (pos.attackers_to(s) & enemies)) + const int K = Chess960 ? kto > kfrom ? -1 : 1 + : Side == KING_SIDE ? -1 : 1; + + for (Square s = kto; s != kfrom; s += (Square)K) + if (pos.attackers_to(s) & enemies) return mlist; // 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() - && (pos.attackers_to(kto, pos.pieces() ^ rfrom) & enemies)) - return mlist; + if (Chess960 && (pos.attackers_to(kto, pos.pieces() ^ rfrom) & enemies)) + return mlist; (*mlist++).move = make(kfrom, rfrom); - if (OnlyChecks && !pos.move_gives_check((mlist - 1)->move, CheckInfo(pos))) + if (Checks && !pos.move_gives_check((mlist - 1)->move, CheckInfo(pos))) mlist--; return mlist; } - template - inline Bitboard move_pawns(Bitboard p) { - - return Delta == DELTA_N ? p << 8 - : Delta == DELTA_S ? p >> 8 - : Delta == DELTA_NE ? (p & ~FileHBB) << 9 - : Delta == DELTA_SE ? (p & ~FileHBB) >> 7 - : Delta == DELTA_NW ? (p & ~FileABB) << 7 - : Delta == DELTA_SW ? (p & ~FileABB) >> 9 : 0; - } - - template - inline MoveStack* generate_promotions(MoveStack* mlist, Bitboard pawnsOn7, Bitboard target, Square ksq) { + inline ExtMove* generate_promotions(ExtMove* mlist, Bitboard pawnsOn7, + Bitboard target, const CheckInfo* ci) { - Bitboard b = move_pawns(pawnsOn7) & target; + Bitboard b = shift_bb(pawnsOn7) & target; while (b) { @@ -101,10 +90,10 @@ namespace { // Knight-promotion is the only one that can give a direct check not // already included in the queen-promotion. - if (Type == QUIET_CHECKS && (StepAttacksBB[W_KNIGHT][to] & ksq)) + if (Type == QUIET_CHECKS && (StepAttacksBB[W_KNIGHT][to] & ci->ksq)) (*mlist++).move = make(to - Delta, to, KNIGHT); else - (void)ksq; // Silence a warning under MSVC + (void)ci; // Silence a warning under MSVC } return mlist; @@ -112,7 +101,8 @@ namespace { template - MoveStack* generate_pawn_moves(const Position& pos, MoveStack* mlist, Bitboard target, Square ksq = SQ_NONE) { + ExtMove* generate_pawn_moves(const Position& pos, ExtMove* mlist, + Bitboard target, const CheckInfo* ci) { // Compute our parametrized parameters at compile time, named according to // the point of view of white side. @@ -120,9 +110,9 @@ namespace { const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB); 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 = (Us == WHITE ? DELTA_NE : DELTA_SW); - const Square LEFT = (Us == WHITE ? DELTA_NW : DELTA_SE); + const Square Up = (Us == WHITE ? DELTA_N : DELTA_S); + const Square Right = (Us == WHITE ? DELTA_NE : DELTA_SW); + const Square Left = (Us == WHITE ? DELTA_NW : DELTA_SE); Bitboard b1, b2, dc1, dc2, emptySquares; @@ -135,10 +125,10 @@ namespace { // Single and double pawn pushes, no promotions if (Type != CAPTURES) { - emptySquares = (Type == QUIETS ? target : ~pos.pieces()); + emptySquares = (Type == QUIETS || Type == QUIET_CHECKS ? target : ~pos.pieces()); - b1 = move_pawns(pawnsNotOn7) & emptySquares; - b2 = move_pawns(b1 & TRank3BB) & emptySquares; + b1 = shift_bb(pawnsNotOn7) & emptySquares; + b2 = shift_bb(b1 & TRank3BB) & emptySquares; if (Type == EVASIONS) // Consider only blocking squares { @@ -148,25 +138,25 @@ namespace { if (Type == QUIET_CHECKS) { - b1 &= pos.attacks_from(ksq, Them); - b2 &= pos.attacks_from(ksq, Them); + b1 &= pos.attacks_from(ci->ksq, Them); + b2 &= pos.attacks_from(ci->ksq, Them); // Add pawn pushes which give 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. Note that a possible discovery check // promotion has been already generated among captures. - if (pawnsNotOn7 & target) // Target is dc bitboard + if (pawnsNotOn7 & ci->dcCandidates) { - dc1 = move_pawns(pawnsNotOn7 & target) & emptySquares & ~file_bb(ksq); - dc2 = move_pawns(dc1 & TRank3BB) & emptySquares; + dc1 = shift_bb(pawnsNotOn7 & ci->dcCandidates) & emptySquares & ~file_bb(ci->ksq); + dc2 = shift_bb(dc1 & TRank3BB) & emptySquares; b1 |= dc1; b2 |= dc2; } } - SERIALIZE_PAWNS(b1, UP); - SERIALIZE_PAWNS(b2, UP + UP); + SERIALIZE_PAWNS(b1, Up); + SERIALIZE_PAWNS(b2, Up + Up); } // Promotions and underpromotions @@ -178,19 +168,19 @@ namespace { if (Type == EVASIONS) emptySquares &= target; - mlist = generate_promotions(mlist, pawnsOn7, enemies, ksq); - mlist = generate_promotions(mlist, pawnsOn7, enemies, ksq); - mlist = generate_promotions(mlist, pawnsOn7, emptySquares, ksq); + mlist = generate_promotions(mlist, pawnsOn7, enemies, ci); + mlist = generate_promotions(mlist, pawnsOn7, enemies, ci); + mlist = generate_promotions(mlist, pawnsOn7, emptySquares, ci); } // Standard and en-passant captures if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS) { - b1 = move_pawns(pawnsNotOn7) & enemies; - b2 = move_pawns(pawnsNotOn7) & enemies; + b1 = shift_bb(pawnsNotOn7) & enemies; + b2 = shift_bb(pawnsNotOn7) & enemies; - SERIALIZE_PAWNS(b1, RIGHT); - SERIALIZE_PAWNS(b2, LEFT); + SERIALIZE_PAWNS(b1, Right); + SERIALIZE_PAWNS(b2, Left); if (pos.ep_square() != SQ_NONE) { @@ -199,7 +189,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 == EVASIONS && !(target & (pos.ep_square() - UP))) + if (Type == EVASIONS && !(target & (pos.ep_square() - Up))) return mlist; b1 = pawnsNotOn7 & pos.attacks_from(pos.ep_square(), Them); @@ -215,17 +205,17 @@ namespace { } - template FORCE_INLINE - MoveStack* generate_moves(const Position& pos, MoveStack* mlist, Color us, - Bitboard target, const CheckInfo* ci = NULL) { + template FORCE_INLINE + ExtMove* generate_moves(const Position& pos, ExtMove* mlist, Color us, + Bitboard target, const CheckInfo* ci) { assert(Pt != KING && Pt != PAWN); - const Square* pl = pos.piece_list(us, Pt); + const Square* pl = pos.list(us); for (Square from = *pl; from != SQ_NONE; from = *++pl) { - if (OnlyChecks) + if (Checks) { if ( (Pt == BISHOP || Pt == ROOK || Pt == QUEEN) && !(PseudoAttacks[Pt][from] & target & ci->checkSq[Pt])) @@ -237,7 +227,7 @@ namespace { Bitboard b = pos.attacks_from(from) & target; - if (OnlyChecks) + if (Checks) b &= ci->checkSq[Pt]; SERIALIZE(b); @@ -246,15 +236,46 @@ namespace { return mlist; } - template<> FORCE_INLINE - MoveStack* generate_moves(const Position& pos, MoveStack* mlist, Color us, - Bitboard target, const CheckInfo*) { - Square from = pos.king_square(us); - Bitboard b = pos.attacks_from(from) & target; - SERIALIZE(b); + + template FORCE_INLINE + ExtMove* generate_all(const Position& pos, ExtMove* mlist, Color us, + Bitboard target, const CheckInfo* ci = NULL) { + + const bool Checks = Type == QUIET_CHECKS; + + mlist = (us == WHITE ? generate_pawn_moves(pos, mlist, target, ci) + : generate_pawn_moves(pos, mlist, target, ci)); + + mlist = generate_moves(pos, mlist, us, target, ci); + mlist = generate_moves(pos, mlist, us, target, ci); + mlist = generate_moves(pos, mlist, us, target, ci); + mlist = generate_moves(pos, mlist, us, target, ci); + + if (Type != QUIET_CHECKS && Type != EVASIONS) + { + Square from = pos.king_square(us); + Bitboard b = pos.attacks_from(from) & target; + SERIALIZE(b); + } + + if (Type != CAPTURES && Type != EVASIONS && pos.can_castle(us)) + { + if (pos.is_chess960()) + { + mlist = generate_castle(pos, mlist, us); + mlist = generate_castle(pos, mlist, us); + } + else + { + mlist = generate_castle(pos, mlist, us); + mlist = generate_castle(pos, mlist, us); + } + } + return mlist; } + } // namespace @@ -268,57 +289,34 @@ namespace { /// non-captures. Returns a pointer to the end of the move list. template -MoveStack* generate(const Position& pos, MoveStack* mlist) { +ExtMove* generate(const Position& pos, ExtMove* mlist) { assert(Type == CAPTURES || Type == QUIETS || Type == NON_EVASIONS); - assert(!pos.in_check()); + assert(!pos.checkers()); Color us = pos.side_to_move(); - Bitboard target; - if (Type == CAPTURES) - target = pos.pieces(~us); + Bitboard target = Type == CAPTURES ? pos.pieces(~us) + : Type == QUIETS ? ~pos.pieces() + : Type == NON_EVASIONS ? ~pos.pieces(us) : 0; - else if (Type == QUIETS) - target = ~pos.pieces(); - - else if (Type == NON_EVASIONS) - target = ~pos.pieces(us); - - mlist = (us == WHITE ? generate_pawn_moves(pos, mlist, target) - : generate_pawn_moves(pos, mlist, target)); - - mlist = generate_moves(pos, mlist, us, target); - mlist = generate_moves(pos, mlist, us, target); - mlist = generate_moves(pos, mlist, us, target); - mlist = generate_moves(pos, mlist, us, target); - mlist = generate_moves(pos, mlist, us, target); - - if (Type != CAPTURES && pos.can_castle(us)) - { - mlist = generate_castle(pos, mlist, us); - mlist = generate_castle(pos, mlist, us); - } - - return mlist; + return generate_all(pos, mlist, us, target); } // 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); +template ExtMove* generate(const Position&, ExtMove*); +template ExtMove* generate(const Position&, ExtMove*); +template ExtMove* generate(const Position&, ExtMove*); /// generate 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) { +ExtMove* generate(const Position& pos, ExtMove* mlist) { - assert(!pos.in_check()); + assert(!pos.checkers()); - Color us = pos.side_to_move(); CheckInfo ci(pos); - Bitboard empty = ~pos.pieces(); Bitboard dc = ci.dcCandidates; while (dc) @@ -337,44 +335,28 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { SERIALIZE(b); } - mlist = (us == WHITE ? generate_pawn_moves(pos, mlist, ci.dcCandidates, ci.ksq) - : generate_pawn_moves(pos, mlist, ci.dcCandidates, ci.ksq)); - - mlist = generate_moves(pos, mlist, us, empty, &ci); - mlist = generate_moves(pos, mlist, us, empty, &ci); - mlist = generate_moves(pos, mlist, us, empty, &ci); - mlist = generate_moves(pos, mlist, us, empty, &ci); - - if (pos.can_castle(us)) - { - mlist = generate_castle(pos, mlist, us); - mlist = generate_castle(pos, mlist, us); - } - - return mlist; + return generate_all(pos, mlist, pos.side_to_move(), ~pos.pieces(), &ci); } /// generate 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) { +ExtMove* generate(const Position& pos, ExtMove* mlist) { - assert(pos.in_check()); + assert(pos.checkers()); - Bitboard b, target; Square from, checksq; int checkersCnt = 0; Color us = pos.side_to_move(); Square ksq = pos.king_square(us); Bitboard sliderAttacks = 0; - Bitboard checkers = pos.checkers(); + Bitboard b = pos.checkers(); - assert(checkers); + assert(pos.checkers()); // Find squares attacked by slider checkers, we will remove them from the king // evasions so to skip known illegal moves avoiding useless legality check later. - b = checkers; do { checkersCnt++; @@ -409,35 +391,30 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { from = ksq; SERIALIZE(b); - // Generate evasions for other pieces only if not under a double check if (checkersCnt > 1) - return mlist; - - // Blocking evasions or captures of the checking piece - target = between_bb(checksq, ksq) | checkers; + return mlist; // Double check, only a king move can save the day - mlist = (us == WHITE ? generate_pawn_moves(pos, mlist, target) - : generate_pawn_moves(pos, mlist, target)); + // Generate blocking evasions or captures of the checking piece + Bitboard target = between_bb(checksq, ksq) | pos.checkers(); - mlist = generate_moves(pos, mlist, us, target); - mlist = generate_moves(pos, mlist, us, target); - mlist = generate_moves(pos, mlist, us, target); - return generate_moves(pos, mlist, us, target); + return generate_all(pos, mlist, us, target); } /// generate generates all the legal moves in the given position template<> -MoveStack* generate(const Position& pos, MoveStack* mlist) { +ExtMove* generate(const Position& pos, ExtMove* mlist) { - MoveStack *end, *cur = mlist; + ExtMove *end, *cur = mlist; Bitboard pinned = pos.pinned_pieces(); + Square ksq = pos.king_square(pos.side_to_move()); - end = pos.in_check() ? generate(pos, mlist) + end = pos.checkers() ? generate(pos, mlist) : generate(pos, mlist); while (cur != end) - if (!pos.pl_move_is_legal(cur->move, pinned)) + if ( (pinned || from_sq(cur->move) == ksq || type_of(cur->move) == ENPASSANT) + && !pos.pl_move_is_legal(cur->move, pinned)) cur->move = (--end)->move; else cur++;