X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=bfc8858aba912539e8c016ada7b2636d3d507120;hp=98c5419af815c1d45e8b4ed883a089fb1e5397ee;hb=950c8436edc50857b83eb3e0cbaca06407764655;hpb=fbb53524efd94c4b227c72c725c628a4aa5f9f72 diff --git a/src/movegen.cpp b/src/movegen.cpp index 98c5419a..bfc8858a 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-2014 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2015 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 @@ -66,33 +66,25 @@ namespace { template - inline ExtMove* generate_promotions(ExtMove* moveList, Bitboard pawnsOn7, - Bitboard target, const CheckInfo* ci) { + inline 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++)->move = 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) - (moveList++)->move = make(to - Delta, to, QUEEN); - - if (Type == QUIETS || Type == EVASIONS || Type == NON_EVASIONS) - { - (moveList++)->move = make(to - Delta, to, ROOK); - (moveList++)->move = make(to - Delta, to, BISHOP); - (moveList++)->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)) - (moveList++)->move = make(to - Delta, to, KNIGHT); - else - (void)ci; // Silence a warning under MSVC + (moveList++)->move = make(to - Delta, to, ROOK); + (moveList++)->move = make(to - Delta, to, BISHOP); + (moveList++)->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)) + (moveList++)->move = make(to - Delta, to, KNIGHT); + else + (void)ci; // Silence a warning under MSVC + return moveList; } @@ -111,7 +103,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 +116,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 +136,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; @@ -174,16 +166,25 @@ namespace { if (Type == EVASIONS) emptySquares &= target; - moveList = generate_promotions(moveList, pawnsOn7, enemies, ci); - moveList = generate_promotions(moveList, pawnsOn7, enemies, ci); - moveList = generate_promotions(moveList, 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) { @@ -236,7 +237,7 @@ namespace { && !(PseudoAttacks[Pt][from] & target & ci->checkSq[Pt])) continue; - if (unlikely(ci->dcCandidates) && (ci->dcCandidates & from)) + if (ci->dcCandidates && (ci->dcCandidates & from)) continue; } @@ -290,7 +291,6 @@ namespace { return moveList; } - } // namespace @@ -311,9 +311,9 @@ ExtMove* generate(const Position& pos, ExtMove* moveList) { 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, moveList, target) : generate_all(pos, moveList, target); @@ -401,18 +401,18 @@ ExtMove* generate(const Position& pos, ExtMove* moveList) { template<> ExtMove* generate(const Position& pos, ExtMove* moveList) { - ExtMove *end, *cur = moveList; Bitboard pinned = pos.pinned_pieces(pos.side_to_move()); Square ksq = pos.king_square(pos.side_to_move()); + ExtMove* cur = moveList; - end = pos.checkers() ? generate(pos, moveList) - : generate(pos, moveList); - while (cur != end) + moveList = pos.checkers() ? generate(pos, moveList) + : generate(pos, moveList); + while (cur != moveList) if ( (pinned || from_sq(cur->move) == ksq || type_of(cur->move) == ENPASSANT) && !pos.legal(cur->move, pinned)) - cur->move = (--end)->move; + cur->move = (--moveList)->move; else ++cur; - return end; + return moveList; }