MoveStack* do_generate_pawn_blocking_evasions(const Position& pos, Bitboard not_pinned,
Bitboard blockSquares, MoveStack* mlist);
template<Color>
- inline MoveStack* generate_pawn_blocking_evasions(const Position& p, Bitboard np, Bitboard bs, MoveStack* m) {
+ inline MoveStack* generate_pawn_blocking_evasions(const Position& p, MoveStack* m, Bitboard np, Bitboard bs) {
return do_generate_pawn_blocking_evasions<WHITE, RANK_8, Rank3BB, DELTA_N>(p, np, bs, m);
}
template<>
- inline MoveStack* generate_pawn_blocking_evasions<BLACK>(const Position& p, Bitboard np, Bitboard bs, MoveStack* m) {
+ inline MoveStack* generate_pawn_blocking_evasions<BLACK>(const Position& p, MoveStack* m, Bitboard np, Bitboard bs) {
return do_generate_pawn_blocking_evasions<BLACK, RANK_1, Rank6BB, DELTA_S>(p, np, bs, m);
}
MoveStack* do_generate_pawn_checks(const Position&, Bitboard, Square, MoveStack*);
template<Color>
- inline MoveStack* generate_pawn_checks(const Position& p, Bitboard dc, Square ksq, MoveStack* m) {
+ inline MoveStack* generate_pawn_checks(const Position& p, MoveStack* m, Bitboard dc, Square ksq) {
return do_generate_pawn_checks<WHITE, BLACK, Rank8BB, Rank3BB, DELTA_N>(p, dc, ksq, m);
}
template<>
- inline MoveStack* generate_pawn_checks<BLACK>(const Position& p, Bitboard dc, Square ksq, MoveStack* m) {
+ inline MoveStack* generate_pawn_checks<BLACK>(const Position& p, MoveStack* m, Bitboard dc, Square ksq) {
return do_generate_pawn_checks<BLACK, WHITE, Rank1BB, Rank6BB, DELTA_S>(p, dc, ksq, m);
}
MoveStack* generate_piece_moves<KING>(const Position& pos, MoveStack* mlist, Color us, Bitboard target);
template<PieceType>
- MoveStack* generate_piece_checks(const Position&, Bitboard, Bitboard, Square, MoveStack*);
- MoveStack* generate_piece_checks_king(const Position&, Square, Bitboard, Square, MoveStack*);
+ MoveStack* generate_piece_checks(const Position&, MoveStack*, Color us, Bitboard, Square);
template<PieceType>
- MoveStack* generate_piece_blocking_evasions(const Position&, Bitboard, Bitboard, MoveStack*);
+ MoveStack* generate_piece_blocking_evasions(const Position&, MoveStack*, Bitboard, Bitboard);
}
/// generate_noncaptures() generates all pseudo-legal non-captures and
-/// underpromotions. The return value is the number of moves generated.
+/// underpromotions. The return value is the number of moves generated.
int generate_noncaptures(const Position& pos, MoveStack* mlist) {
assert(pos.piece_on(ksq) == king_of_color(opposite_color(us)));
- dc = pos.discovered_check_candidates(us);
-
// Pawn moves
if (us == WHITE)
- mlist = generate_pawn_checks<WHITE>(pos, dc, ksq, mlist);
+ mlist = generate_pawn_checks<WHITE>(pos, mlist, dc, ksq);
else
- mlist = generate_pawn_checks<BLACK>(pos, dc, ksq, mlist);
+ mlist = generate_pawn_checks<BLACK>(pos, mlist, dc, ksq);
// Pieces moves
- Bitboard b = pos.knights(us);
- if (b)
- mlist = generate_piece_checks<KNIGHT>(pos, b, dc, ksq, mlist);
-
- b = pos.bishops(us);
- if (b)
- mlist = generate_piece_checks<BISHOP>(pos, b, dc, ksq, mlist);
-
- b = pos.rooks(us);
- if (b)
- mlist = generate_piece_checks<ROOK>(pos, b, dc, ksq, mlist);
-
- b = pos.queens(us);
- if (b)
- mlist = generate_piece_checks<QUEEN>(pos, b, dc, ksq, mlist);
-
- // Hopefully we always have a king ;-)
- mlist = generate_piece_checks_king(pos, pos.king_square(us), dc, ksq, mlist);
+ mlist = generate_piece_checks<KNIGHT>(pos, mlist, us, dc, ksq);
+ mlist = generate_piece_checks<BISHOP>(pos, mlist, us, dc, ksq);
+ mlist = generate_piece_checks<ROOK>(pos, mlist, us, dc, ksq);
+ mlist = generate_piece_checks<QUEEN>(pos, mlist, us, dc, ksq);
+ mlist = generate_piece_checks<KING>(pos, mlist, us, dc, ksq);
// Castling moves that give check. Very rare but nice to have!
if ( pos.can_castle_queenside(us)
// Pawn moves. Because a blocking evasion can never be a capture, we
// only generate pawn pushes.
if (us == WHITE)
- mlist = generate_pawn_blocking_evasions<WHITE>(pos, not_pinned, blockSquares, mlist);
+ mlist = generate_pawn_blocking_evasions<WHITE>(pos, mlist, not_pinned, blockSquares);
else
- mlist = generate_pawn_blocking_evasions<BLACK>(pos, not_pinned, blockSquares, mlist);
+ mlist = generate_pawn_blocking_evasions<BLACK>(pos, mlist, not_pinned, blockSquares);
// Pieces moves
b1 = pos.knights(us) & not_pinned;
if (b1)
- mlist = generate_piece_blocking_evasions<KNIGHT>(pos, b1, blockSquares, mlist);
+ mlist = generate_piece_blocking_evasions<KNIGHT>(pos, mlist, b1, blockSquares);
b1 = pos.bishops(us) & not_pinned;
if (b1)
- mlist = generate_piece_blocking_evasions<BISHOP>(pos, b1, blockSquares, mlist);
+ mlist = generate_piece_blocking_evasions<BISHOP>(pos, mlist, b1, blockSquares);
b1 = pos.rooks(us) & not_pinned;
if (b1)
- mlist = generate_piece_blocking_evasions<ROOK>(pos, b1, blockSquares, mlist);
+ mlist = generate_piece_blocking_evasions<ROOK>(pos, mlist, b1, blockSquares);
b1 = pos.queens(us) & not_pinned;
if (b1)
- mlist = generate_piece_blocking_evasions<QUEEN>(pos, b1, blockSquares, mlist);
+ mlist = generate_piece_blocking_evasions<QUEEN>(pos, mlist, b1, blockSquares);
}
// Finally, the ugly special case of en passant captures. An en passant
}
template<PieceType Piece>
- MoveStack* generate_piece_blocking_evasions(const Position& pos, Bitboard b,
- Bitboard blockSquares, MoveStack* mlist) {
+ MoveStack* generate_piece_blocking_evasions(const Position& pos, MoveStack* mlist,
+ Bitboard b, Bitboard blockSquares) {
while (b)
{
Square from = pop_1st_bit(&b);
template<Color Us, Color Them, Bitboard TRank8BB, Bitboard TRank3BB, SquareDelta TDELTA_N>
MoveStack* do_generate_pawn_checks(const Position& pos, Bitboard dc, Square ksq, MoveStack* mlist)
{
- // Pawn moves which give 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.
- Bitboard empty = pos.empty_squares();
-
// Find all friendly pawns not on the enemy king's file
- Bitboard b1 = pos.pawns(Us) & ~file_bb(ksq), b2, b3;
+ Bitboard b1, b2, b3;
+ Bitboard empty = pos.empty_squares();
- // Discovered checks, single pawn pushes, no promotions
- b2 = b3 = (Us == WHITE ? (b1 & dc) << 8 : (b1 & dc) >> 8) & empty & ~TRank8BB;
- while (b3)
+ if (dc != EmptyBoardBB)
{
- Square to = pop_1st_bit(&b3);
- (*mlist++).move = make_move(to - TDELTA_N, to);
- }
+ // 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 = pos.pawns(Us) & ~file_bb(ksq);
+
+ // Discovered checks, single pawn pushes, no promotions
+ b2 = b3 = (Us == WHITE ? (b1 & dc) << 8 : (b1 & dc) >> 8) & empty & ~TRank8BB;
+ while (b3)
+ {
+ Square to = pop_1st_bit(&b3);
+ (*mlist++).move = make_move(to - TDELTA_N, to);
+ }
- // Discovered checks, double pawn pushes
- b3 = (Us == WHITE ? (b2 & TRank3BB) << 8 : (b2 & TRank3BB) >> 8) & empty;
- while (b3)
- {
- Square to = pop_1st_bit(&b3);
- (*mlist++).move = make_move(to - TDELTA_N - TDELTA_N, to);
+ // Discovered checks, double pawn pushes
+ b3 = (Us == WHITE ? (b2 & TRank3BB) << 8 : (b2 & TRank3BB) >> 8) & empty;
+ while (b3)
+ {
+ Square to = pop_1st_bit(&b3);
+ (*mlist++).move = make_move(to - TDELTA_N - TDELTA_N, to);
+ }
}
// Direct checks. These are possible only for pawns on neighboring files
- // of the enemy king
- b1 &= (~dc & neighboring_files_bb(ksq));
+ // of the enemy king.
+ b1 = pos.pawns(Us) & neighboring_files_bb(ksq) & ~dc;
// Direct checks, single pawn pushes
b2 = (Us == WHITE ? b1 << 8 : b1 >> 8) & empty;
b3 = (Us == WHITE ? (b2 & TRank3BB) << 8 : (b2 & TRank3BB) >> 8)
& empty
& pos.pawn_attacks(Them, ksq);
-
while (b3)
{
Square to = pop_1st_bit(&b3);
}
template<PieceType Piece>
- MoveStack* generate_piece_checks(const Position& pos, Bitboard target, Bitboard dc,
- Square ksq, MoveStack* mlist) {
+ MoveStack* generate_piece_checks(const Position& pos, MoveStack* mlist, Color us,
+ Bitboard dc, Square ksq) {
+
+ Bitboard target = pos.pieces_of_color_and_type(us, Piece);
+
// Discovered checks
Bitboard b = target & dc;
while (b)
{
Square from = pop_1st_bit(&b);
Bitboard bb = pos.piece_attacks<Piece>(from) & pos.empty_squares();
+ if (Piece == KING)
+ bb &= ~QueenPseudoAttacks[ksq];
+
SERIALIZE_MOVES(bb);
}
+
// Direct checks
b = target & ~dc;
+ if (Piece == KING || !b)
+ return mlist;
+
Bitboard checkSqs = pos.piece_attacks<Piece>(ksq) & pos.empty_squares();
while (b)
{
return mlist;
}
- MoveStack* generate_piece_checks_king(const Position& pos, Square from, Bitboard dc,
- Square ksq, MoveStack* mlist) {
- if (bit_is_set(dc, from))
- {
- Bitboard b = pos.piece_attacks<KING>(from)
- & pos.empty_squares()
- & ~QueenPseudoAttacks[ksq];
- SERIALIZE_MOVES(b);
- }
- return mlist;
- }
-
-
template<Color Us, Rank TRANK_8, Bitboard TRank3BB, SquareDelta TDELTA_N>
MoveStack* do_generate_pawn_blocking_evasions(const Position& pos, Bitboard not_pinned,
Bitboard blockSquares, MoveStack* mlist) {
projects / stockfish / blobdiff