X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=783fed7854e1376fdad63f771ee35841b3d347c1;hp=4a1903456da8210edbf79a7dc034f73650ed90bb;hb=05e31c5e5f355d9095b2d223ddf98967ef0e7499;hpb=e0bd0f250b861bfd4ee2999fc518eaf9b0a58941 diff --git a/src/movegen.cpp b/src/movegen.cpp index 4a190345..783fed78 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 @@ -31,7 +31,7 @@ (*mlist++).move = make_move(to - (d), to); } namespace { - template + template MoveStack* generate_castle(const Position& pos, MoveStack* mlist, Color us) { if (pos.castle_impeded(us, Side) || !pos.can_castle(make_castle_right(us, Side))) @@ -44,18 +44,20 @@ 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 = kto; s != kfrom; s += (Square)(Side == KING_SIDE ? -1 : 1)) + 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); @@ -66,23 +68,11 @@ namespace { } - 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) { - Bitboard b = move_pawns(pawnsOn7) & target; + Bitboard b = shift_bb(pawnsOn7) & target; while (b) { @@ -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; @@ -137,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 { @@ -157,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 @@ -178,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) { @@ -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); @@ -221,7 +211,7 @@ namespace { 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) { @@ -247,34 +237,39 @@ namespace { } - FORCE_INLINE MoveStack* generate_king_moves(const Position& pos, MoveStack* mlist, - Color us, Bitboard target) { - Square from = pos.king_square(us); - Bitboard b = pos.attacks_from(from) & target; - SERIALIZE(b); - return mlist; - } - - template FORCE_INLINE - MoveStack* generate_all_moves(const Position& pos, MoveStack* mlist, Color us, - Bitboard target, const CheckInfo* ci = NULL) { + MoveStack* generate_all(const Position& pos, MoveStack* 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); + 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) - mlist = generate_king_moves(pos, mlist, us, target); + { + Square from = pos.king_square(us); + Bitboard b = pos.attacks_from(from) & target; + SERIALIZE(b); + } if (Type != CAPTURES && Type != EVASIONS && pos.can_castle(us)) { - mlist = generate_castle(pos, mlist, us); - mlist = generate_castle(pos, mlist, 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; @@ -297,21 +292,15 @@ template MoveStack* generate(const Position& pos, MoveStack* 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); - else if (Type == QUIETS) - target = ~pos.pieces(); + Bitboard target = Type == CAPTURES ? pos.pieces(~us) + : Type == QUIETS ? ~pos.pieces() + : Type == NON_EVASIONS ? ~pos.pieces(us) : 0; - else if (Type == NON_EVASIONS) - target = ~pos.pieces(us); - - return generate_all_moves(pos, mlist, us, target); + return generate_all(pos, mlist, us, target); } // Explicit template instantiations @@ -325,9 +314,8 @@ template MoveStack* generate(const Position&, MoveStack*); template<> MoveStack* generate(const Position& pos, MoveStack* mlist) { - assert(!pos.in_check()); + assert(!pos.checkers()); - Color us = pos.side_to_move(); CheckInfo ci(pos); Bitboard dc = ci.dcCandidates; @@ -347,7 +335,7 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { SERIALIZE(b); } - return generate_all_moves(pos, mlist, us, ~pos.pieces(), &ci); + return generate_all(pos, mlist, pos.side_to_move(), ~pos.pieces(), &ci); } @@ -356,7 +344,7 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { template<> MoveStack* generate(const Position& pos, MoveStack* mlist) { - assert(pos.in_check()); + assert(pos.checkers()); Square from, checksq; int checkersCnt = 0; @@ -409,7 +397,7 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { // Generate blocking evasions or captures of the checking piece Bitboard target = between_bb(checksq, ksq) | pos.checkers(); - return generate_all_moves(pos, mlist, us, target); + return generate_all(pos, mlist, us, target); } @@ -422,7 +410,7 @@ MoveStack* generate(const Position& pos, MoveStack* 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 ( (pinned || from_sq(cur->move) == ksq || type_of(cur->move) == ENPASSANT)