X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=4532fba582c74d83f67b7c5d6f4e5408ab43943a;hp=3a69f8ab998885e18277b25960bf90e31cd5ed0b;hb=542a2b39ed811a3795cdce2416896ffaf2a485cf;hpb=805afcbf3d5db39c85b759232cfb99ab0a250311 diff --git a/src/movegen.cpp b/src/movegen.cpp index 3a69f8ab..4532fba5 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -2,7 +2,7 @@ Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad - Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad + Copyright (C) 2015-2018 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,34 +25,35 @@ namespace { - template - ExtMove* generate_castling(const Position& pos, ExtMove* moveList, Color us) { + template + ExtMove* generate_castling(const Position& pos, ExtMove* moveList) { - static const bool KingSide = (Cr == WHITE_OO || Cr == BLACK_OO); + constexpr CastlingRight Cr = Us | Cs; + constexpr bool KingSide = (Cr == WHITE_OO || Cr == BLACK_OO); if (pos.castling_impeded(Cr) || !pos.can_castle(Cr)) 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.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); + Square kto = relative_square(Us, KingSide ? SQ_G1 : SQ_C1); + Bitboard enemies = pos.pieces(~Us); assert(!pos.checkers()); - const Square K = Chess960 ? kto > kfrom ? DELTA_W : DELTA_E - : KingSide ? DELTA_W : DELTA_E; + const Direction step = Chess960 ? kto > kfrom ? WEST : EAST + : KingSide ? WEST : EAST; - for (Square s = kto; s != kfrom; s += K) + for (Square s = kto; s != kfrom; s += step) if (pos.attackers_to(s) & enemies) 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))) + if (Chess960 && (attacks_bb(kto, pos.pieces() ^ rfrom) & pos.pieces(~Us, ROOK, QUEEN))) return moveList; Move m = make(kfrom, rfrom); @@ -65,23 +66,25 @@ namespace { } - template + template ExtMove* make_promotions(ExtMove* moveList, Square to, Square ksq) { if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS) - *moveList++ = make(to - Delta, to, QUEEN); + *moveList++ = make(to - D, to, QUEEN); if (Type == QUIETS || Type == EVASIONS || Type == NON_EVASIONS) { - *moveList++ = make(to - Delta, to, ROOK); - *moveList++ = make(to - Delta, to, BISHOP); - *moveList++ = make(to - Delta, to, KNIGHT); + *moveList++ = make(to - D, to, ROOK); + *moveList++ = make(to - D, to, BISHOP); + *moveList++ = make(to - D, 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] & ksq)) - *moveList++ = make(to - Delta, to, KNIGHT); + if (Type == QUIET_CHECKS && (PseudoAttacks[KNIGHT][to] & ksq)) + *moveList++ = make(to - D, to, KNIGHT); + else + (void)ksq; // Silence a warning under MSVC return moveList; } @@ -92,13 +95,13 @@ namespace { // Compute our parametrized parameters at compile time, named according to // the point of view of white side. - const Color Them = (Us == WHITE ? BLACK : WHITE); - 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); + constexpr Color Them = (Us == WHITE ? BLACK : WHITE); + constexpr Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB); + constexpr Bitboard TRank7BB = (Us == WHITE ? Rank7BB : Rank2BB); + constexpr Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB); + constexpr Direction Up = (Us == WHITE ? NORTH : SOUTH); + constexpr Direction UpRight = (Us == WHITE ? NORTH_EAST : SOUTH_WEST); + constexpr Direction UpLeft = (Us == WHITE ? NORTH_WEST : SOUTH_EAST); Bitboard emptySquares; @@ -113,8 +116,8 @@ namespace { { emptySquares = (Type == QUIETS || Type == QUIET_CHECKS ? target : ~pos.pieces()); - Bitboard b1 = shift_bb(pawnsNotOn7) & emptySquares; - Bitboard b2 = shift_bb(b1 & TRank3BB) & emptySquares; + Bitboard b1 = shift(pawnsNotOn7) & emptySquares; + Bitboard b2 = shift(b1 & TRank3BB) & emptySquares; if (Type == EVASIONS) // Consider only blocking squares { @@ -133,11 +136,11 @@ namespace { // if the pawn is not on the same file as the enemy king, because we // don't generate captures. Note that a possible discovery check // promotion has been already generated amongst the captures. - Bitboard dcCandidates = pos.discovered_check_candidates(); + Bitboard dcCandidates = pos.blockers_for_king(Them); if (pawnsNotOn7 & dcCandidates) { - Bitboard dc1 = shift_bb(pawnsNotOn7 & dcCandidates) & emptySquares & ~file_bb(ksq); - Bitboard dc2 = shift_bb(dc1 & TRank3BB) & emptySquares; + Bitboard dc1 = shift(pawnsNotOn7 & dcCandidates) & emptySquares & ~file_bb(ksq); + Bitboard dc2 = shift(dc1 & TRank3BB) & emptySquares; b1 |= dc1; b2 |= dc2; @@ -166,38 +169,38 @@ namespace { if (Type == EVASIONS) emptySquares &= target; - Bitboard b1 = shift_bb(pawnsOn7) & enemies; - Bitboard b2 = shift_bb(pawnsOn7) & enemies; - Bitboard b3 = shift_bb(pawnsOn7) & emptySquares; + Bitboard b1 = shift(pawnsOn7) & enemies; + Bitboard b2 = shift(pawnsOn7) & enemies; + Bitboard b3 = shift(pawnsOn7) & emptySquares; Square ksq = pos.square(Them); while (b1) - moveList = make_promotions(moveList, pop_lsb(&b1), ksq); + moveList = make_promotions(moveList, pop_lsb(&b1), ksq); while (b2) - moveList = make_promotions(moveList, pop_lsb(&b2), ksq); + moveList = make_promotions(moveList, pop_lsb(&b2), ksq); while (b3) - moveList = make_promotions(moveList, pop_lsb(&b3), ksq); + moveList = make_promotions(moveList, pop_lsb(&b3), ksq); } // Standard and en-passant captures if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS) { - Bitboard b1 = shift_bb(pawnsNotOn7) & enemies; - Bitboard b2 = shift_bb(pawnsNotOn7) & enemies; + Bitboard b1 = shift(pawnsNotOn7) & enemies; + Bitboard b2 = shift(pawnsNotOn7) & enemies; while (b1) { Square to = pop_lsb(&b1); - *moveList++ = make_move(to - Right, to); + *moveList++ = make_move(to - UpRight, to); } while (b2) { Square to = pop_lsb(&b2); - *moveList++ = make_move(to - Left, to); + *moveList++ = make_move(to - UpLeft, to); } if (pos.ep_square() != SQ_NONE) @@ -236,17 +239,17 @@ namespace { if (Checks) { if ( (Pt == BISHOP || Pt == ROOK || Pt == QUEEN) - && !(PseudoAttacks[Pt][from] & target & pos.check_info().checkSquares[Pt])) + && !(PseudoAttacks[Pt][from] & target & pos.check_squares(Pt))) continue; - if (pos.discovered_check_candidates() & from) + if (pos.blockers_for_king(~us) & from) continue; } Bitboard b = pos.attacks_from(from) & target; if (Checks) - b &= pos.check_info().checkSquares[Pt]; + b &= pos.check_squares(Pt); while (b) *moveList++ = make_move(from, pop_lsb(&b)); @@ -259,7 +262,7 @@ namespace { template ExtMove* generate_all(const Position& pos, ExtMove* moveList, Bitboard target) { - const bool Checks = Type == QUIET_CHECKS; + constexpr bool Checks = Type == QUIET_CHECKS; moveList = generate_pawn_moves(pos, moveList, target); moveList = generate_moves(pos, moveList, Us, target); @@ -279,13 +282,13 @@ namespace { { if (pos.is_chess960()) { - moveList = generate_castling::right, Checks, true>(pos, moveList, Us); - moveList = generate_castling::right, Checks, true>(pos, moveList, Us); + moveList = generate_castling(pos, moveList); + moveList = generate_castling(pos, moveList); } else { - moveList = generate_castling::right, Checks, false>(pos, moveList, Us); - moveList = generate_castling::right, Checks, false>(pos, moveList, Us); + moveList = generate_castling(pos, moveList); + moveList = generate_castling(pos, moveList); } } @@ -334,7 +337,7 @@ ExtMove* generate(const Position& pos, ExtMove* moveList) { assert(!pos.checkers()); Color us = pos.side_to_move(); - Bitboard dc = pos.discovered_check_candidates(); + Bitboard dc = pos.blockers_for_king(~us) & pos.pieces(us); while (dc) { @@ -344,7 +347,7 @@ ExtMove* generate(const Position& pos, ExtMove* moveList) { if (pt == PAWN) continue; // Will be generated together with direct checks - Bitboard b = pos.attacks_from(Piece(pt), from) & ~pos.pieces(); + Bitboard b = pos.attacks_from(pt, from) & ~pos.pieces(); if (pt == KING) b &= ~PseudoAttacks[QUEEN][pos.square(~us)]; @@ -401,8 +404,9 @@ ExtMove* generate(const Position& pos, ExtMove* moveList) { template<> ExtMove* generate(const Position& pos, ExtMove* moveList) { - Bitboard pinned = pos.pinned_pieces(pos.side_to_move()); - Square ksq = pos.square(pos.side_to_move()); + Color us = pos.side_to_move(); + Bitboard pinned = pos.blockers_for_king(us) & pos.pieces(us); + Square ksq = pos.square(us); ExtMove* cur = moveList; moveList = pos.checkers() ? generate(pos, moveList)