template<Color Us, SquareDelta Diagonal>
MoveStack* generate_pawn_captures_diagonal(MoveStack* mlist, Bitboard pawns, Bitboard enemyPieces, bool promotion);
- template<Color Us>
- MoveStack* generate_pawn_noncaptures(const Position& pos, MoveStack* mlist);
-
- template<Color Us>
- MoveStack* generate_pawn_checks(const Position&, Bitboard, Square, MoveStack*);
+ template<Color Us, bool Checks>
+ MoveStack* generate_pawn_noncaptures(const Position& pos, MoveStack* mlist, Bitboard dc = EmptyBoardBB, Square ksq = SQ_NONE);
template<Color Us, SquareDelta Direction>
inline Bitboard move_pawns(Bitboard p) {
template<>
inline MoveStack* generate_piece_checks<PAWN>(const Position& p, MoveStack* m, Color us, Bitboard dc, Square ksq) {
- return (us == WHITE ? generate_pawn_checks<WHITE>(p, dc, ksq, m)
- : generate_pawn_checks<BLACK>(p, dc, ksq, m));
+ return (us == WHITE ? generate_pawn_noncaptures<WHITE, true>(p, m, dc, ksq)
+ : generate_pawn_noncaptures<BLACK, true>(p, m, dc, ksq));
}
// Template generate_piece_moves() with specializations and overloads
return (us == WHITE ? generate_pawn_captures<WHITE>(p, m)
: generate_pawn_captures<BLACK>(p, m));
else
- return (us == WHITE ? generate_pawn_noncaptures<WHITE>(p, m)
- : generate_pawn_noncaptures<BLACK>(p, m));
+ return (us == WHITE ? generate_pawn_noncaptures<WHITE, false>(p, m)
+ : generate_pawn_noncaptures<BLACK, false>(p, m));
}
template<PieceType>
Color us = pos.side_to_move();
Color them = opposite_color(us);
Square ksq = pos.king_square(us);
+ Bitboard sliderAttacks = EmptyBoardBB;
+ Bitboard checkers = pos.checkers();
assert(pos.piece_on(ksq) == piece_of_color_and_type(us, KING));
// Find squares attacked by slider checkers, we will
// remove them from king evasions set so to avoid a couple
// of cycles in the slow king evasions legality check loop
- // and to be able to use attacks_to().
- Bitboard checkers = pos.checkers();
- Bitboard checkersAttacks = EmptyBoardBB;
+ // and to be able to use attackers_to().
Bitboard b = checkers & pos.pieces(BISHOP, QUEEN);
while (b)
{
from = pop_1st_bit(&b);
- checkersAttacks |= bishop_attacks_bb(from, b_noKing);
+ sliderAttacks |= bishop_attacks_bb(from, b_noKing);
}
b = checkers & pos.pieces(ROOK, QUEEN);
while (b)
{
from = pop_1st_bit(&b);
- checkersAttacks |= rook_attacks_bb(from, b_noKing);
+ sliderAttacks |= rook_attacks_bb(from, b_noKing);
}
- // Generate evasions for king
- Bitboard b1 = pos.piece_attacks<KING>(ksq) & ~pos.pieces_of_color(us) & ~checkersAttacks;
+ // Generate evasions for king, both captures and non captures
+ Bitboard b1 = pos.attacks_from<KING>(ksq) & ~pos.pieces_of_color(us) & ~sliderAttacks;
+ Bitboard enemy = pos.pieces_of_color(them);
while (b1)
{
to = pop_1st_bit(&b1);
- // Note that we can use attacks_to() only because we
- // have already removed slider checkers.
- if (!pos.attacks_to(to, them))
+ // Note that we can use attackers_to() only because we
+ // have already removed slider checkers attacked squares.
+ if (!(pos.attackers_to(to) & enemy))
(*mlist++).move = make_move(ksq, to);
}
// Generate captures of the checking piece
// Pawn captures
- b1 = pos.pawn_attacks(them, checksq) & pos.pieces(PAWN, us) & ~pinned;
+ b1 = pos.attacks_from<PAWN>(checksq, them) & pos.pieces(PAWN, us) & ~pinned;
while (b1)
{
from = pop_1st_bit(&b1);
}
// Pieces captures
- b1 = ( (pos.piece_attacks<KNIGHT>(checksq) & pos.pieces(KNIGHT, us))
- | (pos.piece_attacks<BISHOP>(checksq) & pos.pieces(BISHOP, QUEEN, us))
- | (pos.piece_attacks<ROOK>(checksq) & pos.pieces(ROOK, QUEEN, us)) ) & ~pinned;
+ b1 = ( (pos.attacks_from<KNIGHT>(checksq) & pos.pieces(KNIGHT, us))
+ | (pos.attacks_from<BISHOP>(checksq) & pos.pieces(BISHOP, QUEEN, us))
+ | (pos.attacks_from<ROOK>(checksq) & pos.pieces(ROOK, QUEEN, us)) ) & ~pinned;
while (b1)
{
(*mlist++).move = make_move(from, checksq);
}
- // Blocking check evasions are possible only if the checking piece is
- // a slider.
- if (checkers & (pos.pieces(BISHOP) | pos.pieces(ROOK) | pos.pieces(QUEEN)))
+ // Blocking check evasions are possible only if the checking piece is a slider
+ if (sliderAttacks)
{
Bitboard blockSquares = squares_between(checksq, ksq);
assert((pos.occupied_squares() & blockSquares) == EmptyBoardBB);
- if (blockSquares != EmptyBoardBB)
+ if (blockSquares)
{
mlist = generate_piece_moves<PAWN>(pos, mlist, us, blockSquares, pinned);
mlist = generate_piece_moves<KNIGHT>(pos, mlist, us, blockSquares, pinned);
if (pos.ep_square() != SQ_NONE && (checkers & pos.pieces(PAWN, them)))
{
to = pos.ep_square();
- b1 = pos.pawn_attacks(them, to) & pos.pieces(PAWN, us);
+ b1 = pos.attacks_from<PAWN>(to, them) & pos.pieces(PAWN, us);
// The checking pawn cannot be a discovered (bishop) check candidate
// otherwise we were in check also before last double push move.
// is occupied or under attack.
for (s = Min(from, g1); s <= Max(from, g1); s++)
if ( (s != from && s != to && !pos.square_is_empty(s))
- || pos.attacks_to(s, them))
+ ||(pos.attackers_to(s) & pos.pieces_of_color(them)))
illegal = true;
// Check if any of the squares between king and rook
for (s = Min(from, c1); s <= Max(from, c1); s++)
if( (s != from && s != to && !pos.square_is_empty(s))
- || pos.attacks_to(s, them))
+ ||(pos.attackers_to(s) & pos.pieces_of_color(them)))
illegal = true;
for (s = Min(to, d1); s <= Max(to, d1); s++)
}
// Luckly we can handle all the other pieces in one go
- return ( pos.piece_attacks_square(pos.piece_on(from), from, to)
+ return ( bit_is_set(pos.attacks_from(pc, from), to)
&& pos.pl_move_is_legal(m, pinned)
&& !move_is_promotion(m));
}
for (int i = 0, e = pos.piece_count(us, Piece); i < e; i++)
{
from = pos.piece_list(us, Piece, i);
- b = pos.
piece_attacks<Piece>(from) & target;
+ b = pos.
attacks_from<Piece>(from) & target;
SERIALIZE_MOVES(b);
}
return mlist;
if (pinned && bit_is_set(pinned, from))
continue;
- b = pos.
piece_attacks<Piece>(from) & target;
+ b = pos.
attacks_from<Piece>(from) & target;
SERIALIZE_MOVES(b);
}
return mlist;
Bitboard b;
Square from = pos.king_square(us);
- b = pos.piece_attacks<KING>(from) & target;
+ b = pos.attacks_from<KING>(from) & target;
SERIALIZE_MOVES(b);
return mlist;
}
assert(Us != WHITE || square_rank(pos.ep_square()) == RANK_6);
assert(Us != BLACK || square_rank(pos.ep_square()) == RANK_3);
- Bitboard b1 = pawns & pos.pawn_attacks(Them, pos.ep_square());
+ Bitboard b1 = pawns & pos.attacks_from<PAWN>(pos.ep_square(), Them);
assert(b1 != EmptyBoardBB);
while (b1)
return mlist;
}
- template<Color Us>
- MoveStack* generate_pawn_noncaptures(const Position& pos, MoveStack* mlist) {
+ template<Color Us, bool GenerateChecks>
+ MoveStack* generate_pawn_noncaptures(const Position& pos, MoveStack* mlist, Bitboard dc, Square ksq) {
// Calculate our parametrized parameters at compile time
+ 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 SquareDelta TDELTA_NW = (Us == WHITE ? DELTA_NW : DELTA_SW);
const SquareDelta TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S);
- Bitboard b1, b2;
+ Bitboard b1, b2, dcPawns1, dcPawns2;
Square to;
Bitboard pawns = pos.pieces(PAWN, Us);
Bitboard emptySquares = pos.empty_squares();
if (pawns & TRank7BB) // There is some promotion candidate ?
{
- Bitboard enemyPieces = pos.pieces_of_color(opposite_color(Us));
+ // When generating checks consider under-promotion moves (both captures
+ // and non captures) only if can give a discovery check.
+ Bitboard pp = GenerateChecks ? pawns & dc : pawns;
+ Bitboard enemyPieces = pos.pieces_of_color(opposite_color(Us));
// Underpromotion captures in the a1-h8 (a8-h1 for black) direction
- b1 = move_pawns<Us, DELTA_NE>(pawns) & ~FileABB & enemyPieces & TRank8BB;
+ b1 = move_pawns<Us, DELTA_NE>(pp) & ~FileABB & enemyPieces & TRank8BB;
while (b1)
{
to = pop_1st_bit(&b1);
}
// Underpromotion captures in the h1-a8 (h8-a1 for black) direction
- b1 = move_pawns<Us, DELTA_NW>(pawns) & ~FileHBB & enemyPieces & TRank8BB;
+ b1 = move_pawns<Us, DELTA_NW>(pp) & ~FileHBB & enemyPieces & TRank8BB;
while (b1)
{
to = pop_1st_bit(&b1);
}
// Underpromotion pawn pushes
- b1 = move_pawns<Us, DELTA_N>(pawns) & emptySquares & TRank8BB;
+ b1 = move_pawns<Us, DELTA_N>(pp) & emptySquares & TRank8BB;
while (b1)
{
to = pop_1st_bit(&b1);
}
}
- // Single pawn pushes
- b2 = b1 = move_pawns<Us, DELTA_N>(pawns) & emptySquares & ~TRank8BB;
- SERIALIZE_MOVES_D(b2, -TDELTA_N);
-
- // Double pawn pushes
- b2 = move_pawns<Us, DELTA_N>(b1 & TRank3BB) & emptySquares;
- SERIALIZE_MOVES_D(b2, -TDELTA_N -TDELTA_N);
- return mlist;
- }
-
-
- template<Color Us>
- MoveStack* generate_pawn_checks(const Position& pos, Bitboard dc, Square ksq, MoveStack* mlist)
- {
- // Calculate our parametrized parameters at compile time
- const Color Them = (Us == WHITE ? BLACK : WHITE);
- const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB);
- const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB);
- const SquareDelta TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S);
- const SquareDelta TDELTA_S = (Us == WHITE ? DELTA_S : DELTA_N);
-
- Square to;
- Bitboard b1, b2, b3;
- Bitboard pawns = pos.pieces(PAWN, Us);
-
- if (dc & pawns)
+ dcPawns1 = dcPawns2 = EmptyBoardBB;
+ if (GenerateChecks && (dc & pawns))
{
- Bitboard empty = pos.empty_squares();
-
// Pawn moves which gives discovered check. This is possible only if the
// pawn is not on the same file as the enemy king, because we don't
// generate captures.
- b1 = pawns & ~file_bb(ksq);
-
- // Discovered checks, single pawn pushes, no promotions
- b2 = b3 = move_pawns<Us, DELTA_N>(b1 & dc) & empty & ~TRank8BB;
- SERIALIZE_MOVES_D(b3, -TDELTA_N);
-
- // Discovered checks, double pawn pushes
- b3 = move_pawns<Us, DELTA_N>(b2 & TRank3BB) & empty;
- SERIALIZE_MOVES_D(b3, -TDELTA_N -TDELTA_N);
+ dcPawns1 = move_pawns<Us, DELTA_N>(pawns & dc & ~file_bb(ksq)) & emptySquares & ~TRank8BB;
+ dcPawns2 = move_pawns<Us, DELTA_N>(dcPawns1 & TRank3BB) & emptySquares;
}
- // Direct checks. These are possible only for pawns on neighboring files
- // and in the two ranks that, after the push, are in front of the enemy king.
- b1 = pawns & neighboring_files_bb(ksq) & ~dc;
-
- // We can get false positives if (ksq + x) is not in [0,63] range but
- // is not a problem, they will be filtered out later.
- b2 = b1 & (rank_bb(ksq + 2 * TDELTA_S) | rank_bb(ksq + 3 * TDELTA_S));
- if (!b2)
- return mlist;
-
- // Direct checks, single pawn pushes
- Bitboard empty = pos.empty_squares();
- b2 = move_pawns<Us, DELTA_N>(b1) & empty;
- b3 = b2 & pos.pawn_attacks(Them, ksq);
- SERIALIZE_MOVES_D(b3, -TDELTA_N);
+ // Single pawn pushes
+ b1 = move_pawns<Us, DELTA_N>(pawns) & emptySquares & ~TRank8BB;
+ b2 = GenerateChecks ? (b1 & pos.attacks_from<PAWN>(ksq, Them)) | dcPawns1 : b1;
+ SERIALIZE_MOVES_D(b2, -TDELTA_N);
- // Direct checks, double pawn pushes
- b3 = move_pawns<Us, DELTA_N>(b2 & TRank3BB) & empty & pos.pawn_attacks(Them, ksq);
- SERIALIZE_MOVES_D(b3, -TDELTA_N -TDELTA_N);
+ // Double pawn pushes
+ b1 = move_pawns<Us, DELTA_N>(b1 & TRank3BB) & emptySquares;
+ b2 = GenerateChecks ? (b1 & pos.attacks_from<PAWN>(ksq, Them)) | dcPawns2 : b1;
+ SERIALIZE_MOVES_D(b2, -TDELTA_N -TDELTA_N);
return mlist;
}
while (b)
{
Square from = pop_1st_bit(&b);
- Bitboard bb = pos.
piece_attacks<Piece>(from) & pos.empty_squares();
+ Bitboard bb = pos.
attacks_from<Piece>(from) & pos.empty_squares();
if (Piece == KING)
bb &= ~QueenPseudoAttacks[ksq];
// Direct checks
b = target & ~dc;
- if (Piece != KING || b)
+ Bitboard checkSqs = pos.attacks_from<Piece>(ksq) & pos.empty_squares();
+ if (Piece == KING || !checkSqs)
+ return mlist;
+
+ while (b)
{
- Bitboard checkSqs = pos.piece_attacks<Piece>(ksq) & pos.empty_squares();
- if (!checkSqs)
- return mlist;
+ Square from = pop_1st_bit(&b);
+ if ( (Piece == QUEEN && !(QueenPseudoAttacks[from] & checkSqs))
+ || (Piece == ROOK && !(RookPseudoAttacks[from] & checkSqs))
+ || (Piece == BISHOP && !(BishopPseudoAttacks[from] & checkSqs)))
+ continue;
- while (b)
- {
- Square from = pop_1st_bit(&b);
- if ( (Piece == QUEEN && !(QueenPseudoAttacks[from] & checkSqs))
- || (Piece == ROOK && !(RookPseudoAttacks[from] & checkSqs))
- || (Piece == BISHOP && !(BishopPseudoAttacks[from] & checkSqs)))
- continue;
-
- Bitboard bb = pos.piece_attacks<Piece>(from) & checkSqs;
- SERIALIZE_MOVES(bb);
- }
+ Bitboard bb = pos.attacks_from<Piece>(from) & checkSqs;
+ SERIALIZE_MOVES(bb);
}
return mlist;
}
// It is a bit complicated to correctly handle Chess960
for (s = Min(ksq, s1); s <= Max(ksq, s1); s++)
if ( (s != ksq && s != rsq && pos.square_is_occupied(s))
- || pos.attacks_to(s, them))
+ ||(pos.attackers_to(s) & pos.pieces_of_color(them)))
illegal = true;
for (s = Min(rsq, s2); s <= Max(rsq, s2); s++)
projects / stockfish / blobdiff