X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=3622f18e84217b14b56a506bf4bdf2d91fc0754e;hp=98c5419af815c1d45e8b4ed883a089fb1e5397ee;hb=ca14345ba26fc40e1039029659f57028f510502f;hpb=fbb53524efd94c4b227c72c725c628a4aa5f9f72 diff --git a/src/movegen.cpp b/src/movegen.cpp index 98c5419a..3622f18e 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 @@ -34,7 +35,7 @@ namespace { // 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); @@ -58,41 +59,34 @@ namespace { if (Checks && !pos.gives_check(m, *ci)) return moveList; + else + (void)ci; // Silence a warning under MSVC - (moveList++)->move = m; - + *moveList++ = m; return moveList; } template - inline ExtMove* generate_promotions(ExtMove* moveList, 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) - (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++ = make(to - Delta, to, ROOK); + *moveList++ = make(to - Delta, to, BISHOP); + *moveList++ = 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++ = make(to - Delta, to, KNIGHT); + else + (void)ci; // Silence a warning under MSVC + return moveList; } @@ -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); - (moveList++)->move = make_move(to - Up, to); + *moveList++ = make_move(to - Up, to); } while (b2) { Square to = pop_lsb(&b2); - (moveList++)->move = make_move(to - Up - Up, to); + *moveList++ = make_move(to - Up - Up, to); } } @@ -174,27 +168,36 @@ 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) { Square to = pop_lsb(&b1); - (moveList++)->move = make_move(to - Right, to); + *moveList++ = make_move(to - Right, to); } while (b2) { Square to = pop_lsb(&b2); - (moveList++)->move = make_move(to - Left, to); + *moveList++ = make_move(to - Left, to); } if (pos.ep_square() != SQ_NONE) @@ -212,7 +215,7 @@ namespace { assert(b1); while (b1) - (moveList++)->move = make(pop_lsb(&b1), pos.ep_square()); + *moveList++ = make(pop_lsb(&b1), pos.ep_square()); } } @@ -220,42 +223,42 @@ namespace { } - template FORCE_INLINE + 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 & from) continue; } Bitboard b = pos.attacks_from(from) & target; if (Checks) - b &= ci->checkSq[Pt]; + b &= ci->checkSquares[Pt]; while (b) - (moveList++)->move = make_move(from, pop_lsb(&b)); + *moveList++ = make_move(from, pop_lsb(&b)); } return moveList; } - template FORCE_INLINE + template ExtMove* generate_all(const Position& pos, ExtMove* moveList, Bitboard target, - const CheckInfo* ci = NULL) { + const CheckInfo* ci = nullptr) { const bool Checks = Type == QUIET_CHECKS; @@ -267,10 +270,10 @@ namespace { 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) - (moveList++)->move = make_move(ksq, pop_lsb(&b)); + *moveList++ = make_move(ksq, pop_lsb(&b)); } if (Type != CAPTURES && Type != EVASIONS && pos.can_castle(Us)) @@ -290,7 +293,6 @@ namespace { return moveList; } - } // namespace @@ -311,9 +313,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); @@ -350,7 +352,7 @@ ExtMove* generate(const Position& pos, ExtMove* moveList) { b &= ~PseudoAttacks[QUEEN][ci.ksq]; while (b) - (moveList++)->move = make_move(from, pop_lsb(&b)); + *moveList++ = make_move(from, pop_lsb(&b)); } return us == WHITE ? generate_all(pos, moveList, ~pos.pieces(), &ci) @@ -366,7 +368,7 @@ ExtMove* generate(const Position& pos, ExtMove* moveList) { assert(pos.checkers()); Color us = pos.side_to_move(); - Square ksq = pos.king_square(us); + Square ksq = pos.square(us); Bitboard sliderAttacks = 0; Bitboard sliders = pos.checkers() & ~pos.pieces(KNIGHT, PAWN); @@ -382,7 +384,7 @@ ExtMove* generate(const Position& pos, ExtMove* moveList) { // Generate evasions for king, capture and non capture moves Bitboard b = pos.attacks_from(ksq) & ~pos.pieces(us) & ~sliderAttacks; while (b) - (moveList++)->move = make_move(ksq, pop_lsb(&b)); + *moveList++ = make_move(ksq, pop_lsb(&b)); if (more_than_one(pos.checkers())) return moveList; // Double check, only a king move can save the day @@ -401,18 +403,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()); - - end = pos.checkers() ? generate(pos, moveList) - : generate(pos, moveList); - 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; }