X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=ee138b912687febc3a8030d53a8e0831b251b50d;hp=e5824d547d0273d82b65da905bdd0ed49dbb7b9a;hb=f99cb3dc27719021e126690b7fd5aa5f43663ed8;hpb=bd87ab9ff508e826f7e8b62accc9ea4ddf477367 diff --git a/src/movegen.cpp b/src/movegen.cpp index e5824d54..ee138b91 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 @@ -24,23 +24,23 @@ /// Simple macro to wrap a very common while loop, no facny, no flexibility, /// hardcoded names 'mlist' and 'from'. -#define SERIALIZE(b) while (b) (*mlist++).move = make_move(from, pop_lsb(&b)) +#define SERIALIZE(b) while (b) (mlist++)->move = make_move(from, pop_lsb(&b)) /// Version used for pawns, where the 'from' square is given as a delta from the 'to' square #define SERIALIZE_PAWNS(b, d) while (b) { Square to = pop_lsb(&b); \ - (*mlist++).move = make_move(to - (d), to); } + (mlist++)->move = make_move(to - (d), to); } namespace { template - MoveStack* generate_castle(const Position& pos, MoveStack* mlist, Color us) { + ExtMove* generate_castling(const Position& pos, ExtMove* mlist, Color us) { - if (pos.castle_impeded(us, Side) || !pos.can_castle(make_castle_right(us, Side))) + if (pos.castling_impeded(us, Side) || !pos.can_castle(make_castling_flag(us, Side))) return mlist; // 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 rfrom = pos.castle_rook_square(us, Side); + Square rfrom = pos.castling_rook_square(us, Side); Square kto = relative_square(us, Side == KING_SIDE ? SQ_G1 : SQ_C1); Bitboard enemies = pos.pieces(~us); @@ -56,54 +56,42 @@ namespace { // 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 && (pos.attackers_to(kto, pos.pieces() ^ rfrom) & enemies)) + if (Chess960 && (attacks_bb(kto, pos.pieces() ^ rfrom) & pos.pieces(~us, ROOK, QUEEN))) return mlist; - (*mlist++).move = make(kfrom, rfrom); + (mlist++)->move = make(kfrom, rfrom); - if (Checks && !pos.move_gives_check((mlist - 1)->move, CheckInfo(pos))) - mlist--; + if (Checks && !pos.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, const CheckInfo* ci) { + 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) { Square to = pop_lsb(&b); if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS) - (*mlist++).move = make(to - Delta, to, QUEEN); + (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); + (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 one that can give a direct check not // already included in the queen-promotion. if (Type == QUIET_CHECKS && (StepAttacksBB[W_KNIGHT][to] & ci->ksq)) - (*mlist++).move = make(to - Delta, to, KNIGHT); + (mlist++)->move = make(to - Delta, to, KNIGHT); else (void)ci; // Silence a warning under MSVC } @@ -113,8 +101,8 @@ namespace { template - MoveStack* generate_pawn_moves(const Position& pos, MoveStack* mlist, - Bitboard target, const CheckInfo* ci) { + 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. @@ -122,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; @@ -139,8 +127,8 @@ namespace { { 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 { @@ -159,16 +147,16 @@ namespace { // promotion has been already generated among captures. if (pawnsNotOn7 & ci->dcCandidates) { - dc1 = move_pawns(pawnsNotOn7 & ci->dcCandidates) & emptySquares & ~file_bb(ci->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 @@ -180,19 +168,19 @@ 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); + 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) { @@ -201,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); @@ -209,7 +197,7 @@ namespace { assert(b1); while (b1) - (*mlist++).move = make(pop_lsb(&b1), pos.ep_square()); + (mlist++)->move = make(pop_lsb(&b1), pos.ep_square()); } } @@ -218,12 +206,12 @@ namespace { template FORCE_INLINE - MoveStack* generate_moves(const Position& pos, MoveStack* mlist, Color us, - Bitboard target, const CheckInfo* ci) { + 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) { @@ -233,7 +221,7 @@ namespace { && !(PseudoAttacks[Pt][from] & target & ci->checkSq[Pt])) continue; - if (ci->dcCandidates && (ci->dcCandidates & from)) + if (unlikely(ci->dcCandidates) && (ci->dcCandidates & from)) continue; } @@ -249,38 +237,36 @@ namespace { } - template FORCE_INLINE - MoveStack* generate_all(const Position& pos, MoveStack* mlist, Color us, - Bitboard target, const CheckInfo* ci = NULL) { + template FORCE_INLINE + ExtMove* generate_all(const Position& pos, ExtMove* mlist, 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); + 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); if (Type != QUIET_CHECKS && Type != EVASIONS) { - Square from = pos.king_square(us); + 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 (Type != CAPTURES && Type != EVASIONS && pos.can_castle(Us)) { if (pos.is_chess960()) { - mlist = generate_castle(pos, mlist, us); - mlist = generate_castle(pos, mlist, us); + mlist = generate_castling< KING_SIDE, Checks, true>(pos, mlist, Us); + mlist = generate_castling(pos, mlist, Us); } else { - mlist = generate_castle(pos, mlist, us); - mlist = generate_castle(pos, mlist, us); + mlist = generate_castling< KING_SIDE, Checks, false>(pos, mlist, Us); + mlist = generate_castling(pos, mlist, Us); } } @@ -301,7 +287,7 @@ 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.checkers()); @@ -312,22 +298,24 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { : Type == QUIETS ? ~pos.pieces() : Type == NON_EVASIONS ? ~pos.pieces(us) : 0; - return generate_all(pos, mlist, us, target); + return us == WHITE ? generate_all(pos, mlist, target) + : generate_all(pos, mlist, target); } // Explicit template instantiations -template MoveStack* generate(const Position&, MoveStack*); -template MoveStack* generate(const Position&, MoveStack*); -template MoveStack* generate(const Position&, MoveStack*); +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.checkers()); + Color us = pos.side_to_move(); CheckInfo ci(pos); Bitboard dc = ci.dcCandidates; @@ -347,21 +335,21 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { SERIALIZE(b); } - return generate_all(pos, mlist, pos.side_to_move(), ~pos.pieces(), &ci); + return us == WHITE ? generate_all(pos, mlist, ~pos.pieces(), &ci) + : generate_all(pos, mlist, ~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.checkers()); - Square from, checksq; int checkersCnt = 0; Color us = pos.side_to_move(); - Square ksq = pos.king_square(us); + Square ksq = pos.king_square(us), from = ksq /* For SERIALIZE */, checksq; Bitboard sliderAttacks = 0; Bitboard b = pos.checkers(); @@ -371,65 +359,48 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { // evasions so to skip known illegal moves avoiding useless legality check later. do { - checkersCnt++; + ++checkersCnt; checksq = pop_lsb(&b); assert(color_of(pos.piece_on(checksq)) == ~us); - switch (type_of(pos.piece_on(checksq))) - { - case BISHOP: sliderAttacks |= PseudoAttacks[BISHOP][checksq]; break; - case ROOK: sliderAttacks |= PseudoAttacks[ROOK][checksq]; break; - case QUEEN: - // If queen and king are far or not on a diagonal line we can safely - // remove all the squares attacked in the other direction becuase are - // not reachable by the king anyway. - if (between_bb(ksq, checksq) || !(PseudoAttacks[BISHOP][checksq] & ksq)) - sliderAttacks |= PseudoAttacks[QUEEN][checksq]; - - // Otherwise we need to use real rook attacks to check if king is safe - // to move in the other direction. For example: king in B2, queen in A1 - // a knight in B1, and we can safely move to C1. - else - sliderAttacks |= PseudoAttacks[BISHOP][checksq] | pos.attacks_from(checksq); - - default: - break; - } + if (type_of(pos.piece_on(checksq)) > KNIGHT) // A slider + sliderAttacks |= LineBB[checksq][ksq] ^ checksq; + } while (b); // Generate evasions for king, capture and non capture moves b = pos.attacks_from(ksq) & ~pos.pieces(us) & ~sliderAttacks; - from = ksq; SERIALIZE(b); if (checkersCnt > 1) return mlist; // Double check, only a king move can save the day // Generate blocking evasions or captures of the checking piece - Bitboard target = between_bb(checksq, ksq) | pos.checkers(); + Bitboard target = between_bb(checksq, ksq) | checksq; - return generate_all(pos, mlist, us, target); + return us == WHITE ? generate_all(pos, mlist, target) + : generate_all(pos, mlist, 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; - Bitboard pinned = pos.pinned_pieces(); + 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.pl_move_is_legal(cur->move, pinned)) + && !pos.legal(cur->move, pinned)) cur->move = (--end)->move; else - cur++; + ++cur; return end; }