X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=6ef4be4f1507de18f40a583ab87d3275798b9026;hp=e61220800a8db5708e4b0c3909f5865fdbfcc859;hb=77fa960f8923ca83ba0391835d50f4230ac6a345;hpb=5cf9e0b254262094efb2bdb9f81d213c515b102e diff --git a/src/movegen.cpp b/src/movegen.cpp index e6122080..6ef4be4f 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -1,7 +1,8 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, 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 @@ -25,16 +26,16 @@ namespace { template - ExtMove* generate_castling(const Position& pos, ExtMove* mlist, Color us, const CheckInfo* ci) { + ExtMove* generate_castling(const Position& pos, ExtMove* moveList, Color us, const CheckInfo* ci) { static const bool KingSide = (Cr == WHITE_OO || Cr == BLACK_OO); if (pos.castling_impeded(Cr) || !pos.can_castle(Cr)) - return mlist; + return moveList; // After castling, the rook and king final positions are the same in Chess960 // as they would be in standard chess. - Square kfrom = pos.king_square(us); + Square kfrom = pos.square(us); Square rfrom = pos.castling_rook_square(Cr); Square kto = relative_square(us, KingSide ? SQ_G1 : SQ_C1); Bitboard enemies = pos.pieces(~us); @@ -46,59 +47,52 @@ namespace { for (Square s = kto; s != kfrom; s += K) if (pos.attackers_to(s) & enemies) - return mlist; + return moveList; // 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 (Chess960 && (attacks_bb(kto, pos.pieces() ^ rfrom) & pos.pieces(~us, ROOK, QUEEN))) - return mlist; + return moveList; Move m = make(kfrom, rfrom); if (Checks && !pos.gives_check(m, *ci)) - return mlist; + return moveList; + else + (void)ci; // Silence a warning under MSVC - (mlist++)->move = m; - - return mlist; + *moveList++ = m; + return moveList; } template - inline ExtMove* generate_promotions(ExtMove* mlist, Bitboard pawnsOn7, - Bitboard target, const CheckInfo* ci) { + ExtMove* make_promotions(ExtMove* moveList, Square to, const CheckInfo* ci) { - Bitboard b = shift_bb(pawnsOn7) & target; + if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS) + *moveList++ = make(to - Delta, to, QUEEN); - while (b) + if (Type == QUIETS || Type == EVASIONS || Type == NON_EVASIONS) { - Square to = pop_lsb(&b); - - if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS) - (mlist++)->move = make(to - Delta, to, QUEEN); - - if (Type == QUIETS || Type == EVASIONS || Type == NON_EVASIONS) - { - (mlist++)->move = make(to - Delta, to, ROOK); - (mlist++)->move = make(to - Delta, to, BISHOP); - (mlist++)->move = make(to - Delta, to, KNIGHT); - } - - // Knight promotion is the only promotion that can give a direct check - // that's not already included in the queen promotion. - if (Type == QUIET_CHECKS && (StepAttacksBB[W_KNIGHT][to] & ci->ksq)) - (mlist++)->move = make(to - Delta, to, KNIGHT); - else - (void)ci; // Silence a warning under MSVC + *moveList++ = make(to - Delta, to, ROOK); + *moveList++ = make(to - Delta, to, BISHOP); + *moveList++ = make(to - Delta, to, KNIGHT); } - return mlist; + // Knight promotion is the only promotion that can give a direct check + // that's not already included in the queen promotion. + if (Type == QUIET_CHECKS && (StepAttacksBB[W_KNIGHT][to] & ci->ksq)) + *moveList++ = make(to - Delta, to, KNIGHT); + else + (void)ci; // Silence a warning under MSVC + + return moveList; } template - ExtMove* generate_pawn_moves(const Position& pos, ExtMove* mlist, + ExtMove* generate_pawn_moves(const Position& pos, ExtMove* moveList, Bitboard target, const CheckInfo* ci) { // Compute our parametrized parameters at compile time, named according to @@ -111,7 +105,7 @@ namespace { const Square Right = (Us == WHITE ? DELTA_NE : DELTA_SW); const Square Left = (Us == WHITE ? DELTA_NW : DELTA_SE); - Bitboard b1, b2, dc1, dc2, emptySquares; + Bitboard emptySquares; Bitboard pawnsOn7 = pos.pieces(Us, PAWN) & TRank7BB; Bitboard pawnsNotOn7 = pos.pieces(Us, PAWN) & ~TRank7BB; @@ -124,8 +118,8 @@ namespace { { emptySquares = (Type == QUIETS || Type == QUIET_CHECKS ? target : ~pos.pieces()); - b1 = shift_bb(pawnsNotOn7) & emptySquares; - b2 = shift_bb(b1 & TRank3BB) & emptySquares; + Bitboard b1 = shift_bb(pawnsNotOn7) & emptySquares; + Bitboard b2 = shift_bb(b1 & TRank3BB) & emptySquares; if (Type == EVASIONS) // Consider only blocking squares { @@ -144,8 +138,8 @@ namespace { // promotion has been already generated amongst the captures. if (pawnsNotOn7 & ci->dcCandidates) { - dc1 = shift_bb(pawnsNotOn7 & ci->dcCandidates) & emptySquares & ~file_bb(ci->ksq); - dc2 = shift_bb(dc1 & TRank3BB) & emptySquares; + Bitboard dc1 = shift_bb(pawnsNotOn7 & ci->dcCandidates) & emptySquares & ~file_bb(ci->ksq); + Bitboard dc2 = shift_bb(dc1 & TRank3BB) & emptySquares; b1 |= dc1; b2 |= dc2; @@ -155,13 +149,13 @@ namespace { while (b1) { Square to = pop_lsb(&b1); - (mlist++)->move = make_move(to - Up, to); + *moveList++ = make_move(to - Up, to); } while (b2) { Square to = pop_lsb(&b2); - (mlist++)->move = make_move(to - Up - Up, to); + *moveList++ = make_move(to - Up - Up, to); } } @@ -174,27 +168,36 @@ namespace { if (Type == EVASIONS) emptySquares &= target; - mlist = generate_promotions(mlist, pawnsOn7, enemies, ci); - mlist = generate_promotions(mlist, pawnsOn7, enemies, ci); - mlist = generate_promotions(mlist, pawnsOn7, emptySquares, ci); + Bitboard b1 = shift_bb(pawnsOn7) & enemies; + Bitboard b2 = shift_bb(pawnsOn7) & enemies; + Bitboard b3 = shift_bb(pawnsOn7) & emptySquares; + + while (b1) + moveList = make_promotions(moveList, pop_lsb(&b1), ci); + + while (b2) + moveList = make_promotions(moveList, pop_lsb(&b2), ci); + + while (b3) + moveList = make_promotions(moveList, pop_lsb(&b3), ci); } // Standard and en-passant captures if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS) { - b1 = shift_bb(pawnsNotOn7) & enemies; - b2 = shift_bb(pawnsNotOn7) & enemies; + Bitboard b1 = shift_bb(pawnsNotOn7) & enemies; + Bitboard b2 = shift_bb(pawnsNotOn7) & enemies; while (b1) { Square to = pop_lsb(&b1); - (mlist++)->move = make_move(to - Right, to); + *moveList++ = make_move(to - Right, to); } while (b2) { Square to = pop_lsb(&b2); - (mlist++)->move = make_move(to - Left, to); + *moveList++ = make_move(to - Left, to); } if (pos.ep_square() != SQ_NONE) @@ -205,92 +208,91 @@ namespace { // 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))) - return mlist; + return moveList; b1 = pawnsNotOn7 & pos.attacks_from(pos.ep_square(), Them); assert(b1); while (b1) - (mlist++)->move = make(pop_lsb(&b1), pos.ep_square()); + *moveList++ = make(pop_lsb(&b1), pos.ep_square()); } } - return mlist; + return moveList; } - template FORCE_INLINE - ExtMove* generate_moves(const Position& pos, ExtMove* mlist, Color us, + template + ExtMove* generate_moves(const Position& pos, ExtMove* moveList, Color us, Bitboard target, const CheckInfo* ci) { assert(Pt != KING && Pt != PAWN); - const Square* pl = pos.list(us); + const Square* pl = pos.squares(us); for (Square from = *pl; from != SQ_NONE; from = *++pl) { if (Checks) { if ( (Pt == BISHOP || Pt == ROOK || Pt == QUEEN) - && !(PseudoAttacks[Pt][from] & target & ci->checkSq[Pt])) + && !(PseudoAttacks[Pt][from] & target & ci->checkSquares[Pt])) continue; - if (unlikely(ci->dcCandidates) && (ci->dcCandidates & from)) + if (ci->dcCandidates && (ci->dcCandidates & from)) continue; } Bitboard b = pos.attacks_from(from) & target; if (Checks) - b &= ci->checkSq[Pt]; + b &= ci->checkSquares[Pt]; while (b) - (mlist++)->move = make_move(from, pop_lsb(&b)); + *moveList++ = make_move(from, pop_lsb(&b)); } - return mlist; + return moveList; } - template FORCE_INLINE - ExtMove* generate_all(const Position& pos, ExtMove* mlist, Bitboard target, - const CheckInfo* ci = NULL) { + template + ExtMove* generate_all(const Position& pos, ExtMove* moveList, Bitboard target, + const CheckInfo* ci = nullptr) { const bool Checks = Type == QUIET_CHECKS; - mlist = 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< ROOK, Checks>(pos, mlist, Us, target, ci); - mlist = generate_moves< QUEEN, Checks>(pos, mlist, Us, target, ci); + moveList = generate_pawn_moves(pos, moveList, target, ci); + moveList = generate_moves(pos, moveList, Us, target, ci); + moveList = generate_moves(pos, moveList, Us, target, ci); + moveList = generate_moves< ROOK, Checks>(pos, moveList, Us, target, ci); + moveList = generate_moves< QUEEN, Checks>(pos, moveList, Us, target, ci); if (Type != QUIET_CHECKS && Type != EVASIONS) { - Square ksq = pos.king_square(Us); + Square ksq = pos.square(Us); Bitboard b = pos.attacks_from(ksq) & target; while (b) - (mlist++)->move = make_move(ksq, pop_lsb(&b)); + *moveList++ = make_move(ksq, pop_lsb(&b)); } if (Type != CAPTURES && Type != EVASIONS && pos.can_castle(Us)) { if (pos.is_chess960()) { - mlist = generate_castling::right, Checks, true>(pos, mlist, Us, ci); - mlist = generate_castling::right, Checks, true>(pos, mlist, Us, ci); + moveList = generate_castling::right, Checks, true>(pos, moveList, Us, ci); + moveList = generate_castling::right, Checks, true>(pos, moveList, Us, ci); } else { - mlist = generate_castling::right, Checks, false>(pos, mlist, Us, ci); - mlist = generate_castling::right, Checks, false>(pos, mlist, Us, ci); + moveList = generate_castling::right, Checks, false>(pos, moveList, Us, ci); + moveList = generate_castling::right, Checks, false>(pos, moveList, Us, ci); } } - return mlist; + return moveList; } - } // namespace @@ -304,19 +306,19 @@ namespace { /// non-captures. Returns a pointer to the end of the move list. template -ExtMove* generate(const Position& pos, ExtMove* mlist) { +ExtMove* generate(const Position& pos, ExtMove* moveList) { assert(Type == CAPTURES || Type == QUIETS || Type == NON_EVASIONS); assert(!pos.checkers()); Color us = pos.side_to_move(); - Bitboard target = Type == CAPTURES ? pos.pieces(~us) - : Type == QUIETS ? ~pos.pieces() - : Type == NON_EVASIONS ? ~pos.pieces(us) : 0; + Bitboard target = Type == CAPTURES ? pos.pieces(~us) + : Type == QUIETS ? ~pos.pieces() + : Type == NON_EVASIONS ? ~pos.pieces(us) : 0; - return us == WHITE ? generate_all(pos, mlist, target) - : generate_all(pos, mlist, target); + return us == WHITE ? generate_all(pos, moveList, target) + : generate_all(pos, moveList, target); } // Explicit template instantiations @@ -328,7 +330,7 @@ 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<> -ExtMove* generate(const Position& pos, ExtMove* mlist) { +ExtMove* generate(const Position& pos, ExtMove* moveList) { assert(!pos.checkers()); @@ -350,77 +352,69 @@ ExtMove* generate(const Position& pos, ExtMove* mlist) { b &= ~PseudoAttacks[QUEEN][ci.ksq]; while (b) - (mlist++)->move = make_move(from, pop_lsb(&b)); + *moveList++ = make_move(from, pop_lsb(&b)); } - return us == WHITE ? generate_all(pos, mlist, ~pos.pieces(), &ci) - : generate_all(pos, mlist, ~pos.pieces(), &ci); + return us == WHITE ? generate_all(pos, moveList, ~pos.pieces(), &ci) + : generate_all(pos, moveList, ~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<> -ExtMove* generate(const Position& pos, ExtMove* mlist) { +ExtMove* generate(const Position& pos, ExtMove* moveList) { assert(pos.checkers()); - int checkersCnt = 0; Color us = pos.side_to_move(); - Square ksq = pos.king_square(us), checksq; + Square ksq = pos.square(us); Bitboard sliderAttacks = 0; - Bitboard b = pos.checkers(); - - assert(pos.checkers()); + Bitboard sliders = pos.checkers() & ~pos.pieces(KNIGHT, PAWN); // Find all the squares attacked by slider checkers. We will remove them from // the king evasions in order to skip known illegal moves, which avoids any // useless legality checks later on. - do + while (sliders) { - ++checkersCnt; - checksq = pop_lsb(&b); - - assert(color_of(pos.piece_on(checksq)) == ~us); - - if (type_of(pos.piece_on(checksq)) > KNIGHT) // A slider - sliderAttacks |= LineBB[checksq][ksq] ^ checksq; - - } while (b); + Square checksq = pop_lsb(&sliders); + sliderAttacks |= LineBB[checksq][ksq] ^ checksq; + } // Generate evasions for king, capture and non capture moves - b = pos.attacks_from(ksq) & ~pos.pieces(us) & ~sliderAttacks; + Bitboard b = pos.attacks_from(ksq) & ~pos.pieces(us) & ~sliderAttacks; while (b) - (mlist++)->move = make_move(ksq, pop_lsb(&b)); + *moveList++ = make_move(ksq, pop_lsb(&b)); - if (checkersCnt > 1) - return mlist; // Double check, only a king move can save the day + if (more_than_one(pos.checkers())) + return moveList; // Double check, only a king move can save the day // Generate blocking evasions or captures of the checking piece + Square checksq = lsb(pos.checkers()); Bitboard target = between_bb(checksq, ksq) | checksq; - return us == WHITE ? generate_all(pos, mlist, target) - : generate_all(pos, mlist, target); + return us == WHITE ? generate_all(pos, moveList, target) + : generate_all(pos, moveList, target); } /// generate generates all the legal moves in the given position template<> -ExtMove* generate(const Position& pos, ExtMove* mlist) { +ExtMove* generate(const Position& pos, ExtMove* moveList) { - ExtMove *end, *cur = mlist; Bitboard pinned = pos.pinned_pieces(pos.side_to_move()); - Square ksq = pos.king_square(pos.side_to_move()); - - end = pos.checkers() ? generate(pos, mlist) - : generate(pos, mlist); - while (cur != end) - if ( (pinned || from_sq(cur->move) == ksq || type_of(cur->move) == ENPASSANT) - && !pos.legal(cur->move, pinned)) - cur->move = (--end)->move; + Square ksq = pos.square(pos.side_to_move()); + ExtMove* cur = moveList; + + moveList = pos.checkers() ? generate(pos, moveList) + : generate(pos, moveList); + while (cur != moveList) + if ( (pinned || from_sq(*cur) == ksq || type_of(*cur) == ENPASSANT) + && !pos.legal(*cur, pinned)) + *cur = (--moveList)->move; else ++cur; - return end; + return moveList; }