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-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2015-2019 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
namespace {
- template<CastlingRight Cr, bool Checks, bool Chess960>
- ExtMove* generate_castling(const Position& pos, ExtMove* moveList, Color us) {
+ template<Color Us, CastlingSide Cs, bool Checks, bool Chess960>
+ 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 = (Cs == KING_SIDE);
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<KING>(us);
+ Square kfrom = pos.square<KING>(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 ? WEST : EAST
- : KingSide ? WEST : EAST;
+ 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<ROOK>(kto, pos.pieces() ^ rfrom) & pos.pieces(~us, ROOK, QUEEN)))
+ if (Chess960 && (attacks_bb<ROOK>(kto, pos.pieces() ^ rfrom) & pos.pieces(~Us, ROOK, QUEEN)))
return moveList;
Move m = make<CASTLING>(kfrom, rfrom);
}
- template<GenType Type, Square D>
+ template<GenType Type, Direction D>
ExtMove* make_promotions(ExtMove* moveList, Square to, Square ksq) {
if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS)
// 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))
+ if (Type == QUIET_CHECKS && (PseudoAttacks[KNIGHT][to] & ksq))
*moveList++ = make<PROMOTION>(to - D, to, KNIGHT);
else
(void)ksq; // Silence a warning under MSVC
// 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 ? NORTH : SOUTH);
- const Square Right = (Us == WHITE ? NORTH_EAST : SOUTH_WEST);
- const Square Left = (Us == WHITE ? NORTH_WEST : SOUTH_EAST);
+ constexpr Color Them = (Us == WHITE ? BLACK : WHITE);
+ 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;
// 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<Up>(pawnsNotOn7 & dcCandidates) & emptySquares & ~file_bb(ksq);
}
// Promotions and underpromotions
- if (pawnsOn7 && (Type != EVASIONS || (target & TRank8BB)))
+ if (pawnsOn7)
{
if (Type == CAPTURES)
emptySquares = ~pos.pieces();
if (Type == EVASIONS)
emptySquares &= target;
- Bitboard b1 = shift<Right>(pawnsOn7) & enemies;
- Bitboard b2 = shift<Left >(pawnsOn7) & enemies;
- Bitboard b3 = shift<Up >(pawnsOn7) & emptySquares;
+ Bitboard b1 = shift<UpRight>(pawnsOn7) & enemies;
+ Bitboard b2 = shift<UpLeft >(pawnsOn7) & enemies;
+ Bitboard b3 = shift<Up >(pawnsOn7) & emptySquares;
Square ksq = pos.square<KING>(Them);
while (b1)
- moveList = make_promotions<Type, Right>(moveList, pop_lsb(&b1), ksq);
+ moveList = make_promotions<Type, UpRight>(moveList, pop_lsb(&b1), ksq);
while (b2)
- moveList = make_promotions<Type, Left >(moveList, pop_lsb(&b2), ksq);
+ moveList = make_promotions<Type, UpLeft >(moveList, pop_lsb(&b2), ksq);
while (b3)
- moveList = make_promotions<Type, Up >(moveList, pop_lsb(&b3), ksq);
+ moveList = make_promotions<Type, Up >(moveList, pop_lsb(&b3), ksq);
}
// Standard and en-passant captures
if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS)
{
- Bitboard b1 = shift<Right>(pawnsNotOn7) & enemies;
- Bitboard b2 = shift<Left >(pawnsNotOn7) & enemies;
+ Bitboard b1 = shift<UpRight>(pawnsNotOn7) & enemies;
+ Bitboard b2 = shift<UpLeft >(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)
&& !(PseudoAttacks[Pt][from] & target & pos.check_squares(Pt)))
continue;
- if (pos.discovered_check_candidates() & from)
+ if (pos.blockers_for_king(~us) & from)
continue;
}
template<Color Us, GenType Type>
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<Us, Type>(pos, moveList, target);
moveList = generate_moves<KNIGHT, Checks>(pos, moveList, Us, target);
*moveList++ = make_move(ksq, pop_lsb(&b));
}
- if (Type != CAPTURES && Type != EVASIONS && pos.can_castle(Us))
+ if (Type != CAPTURES && Type != EVASIONS && pos.castling_rights(Us))
{
if (pos.is_chess960())
{
- moveList = generate_castling<MakeCastling<Us, KING_SIDE>::right, Checks, true>(pos, moveList, Us);
- moveList = generate_castling<MakeCastling<Us, QUEEN_SIDE>::right, Checks, true>(pos, moveList, Us);
+ moveList = generate_castling<Us, KING_SIDE, Checks, true>(pos, moveList);
+ moveList = generate_castling<Us, QUEEN_SIDE, Checks, true>(pos, moveList);
}
else
{
- moveList = generate_castling<MakeCastling<Us, KING_SIDE>::right, Checks, false>(pos, moveList, Us);
- moveList = generate_castling<MakeCastling<Us, QUEEN_SIDE>::right, Checks, false>(pos, moveList, Us);
+ moveList = generate_castling<Us, KING_SIDE, Checks, false>(pos, moveList);
+ moveList = generate_castling<Us, QUEEN_SIDE, Checks, false>(pos, 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)
{
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<KING>(~us)];
template<>
ExtMove* generate<LEGAL>(const Position& pos, ExtMove* moveList) {
- Bitboard pinned = pos.pinned_pieces(pos.side_to_move());
- Square ksq = pos.square<KING>(pos.side_to_move());
+ Color us = pos.side_to_move();
+ Bitboard pinned = pos.blockers_for_king(us) & pos.pieces(us);
+ Square ksq = pos.square<KING>(us);
ExtMove* cur = moveList;
moveList = pos.checkers() ? generate<EVASIONS >(pos, moveList)
projects / stockfish / blobdiff