QUEEN_SIDE
};
- const bool CAPTURE = true;
- const bool NON_CAPTURE = false;
+ enum MoveType {
+ CAPTURE,
+ NON_CAPTURE
+ };
// Functions
bool castling_is_check(const Position&, CastlingSide);
}
- // Template generate_piece_moves() with specializations
+ // Template generate_piece_moves() with specializations and overloads
template<PieceType>
MoveStack* generate_piece_moves(const Position&, MoveStack*, Color us, Bitboard);
template<>
- MoveStack* generate_piece_moves<KING>(const Position& pos, MoveStack* mlist, Color us, Bitboard target);
+ MoveStack* generate_piece_moves<KING>(const Position&, MoveStack*, Color, Bitboard);
- template<PieceType Piece, bool Capture>
+ template<PieceType Piece, MoveType Type>
inline MoveStack* generate_piece_moves(const Position& p, MoveStack* m, Color us) {
assert(Piece == PAWN);
- if (Capture)
+ if (Type == CAPTURE)
return (us == WHITE ? generate_pawn_captures<WHITE, BLACK, Rank8BB, DELTA_NE, DELTA_NW, DELTA_N>(p, m)
: generate_pawn_captures<BLACK, WHITE, Rank1BB, DELTA_SE, DELTA_SW, DELTA_S>(p, m));
else
: generate_pawn_noncaptures<BLACK, WHITE, Rank1BB, Rank6BB, DELTA_SE, DELTA_SW, DELTA_S>(p, m));
}
- // Template generate_piece_blocking_evasions() with specializations
template<PieceType>
- MoveStack* generate_piece_blocking_evasions(const Position&, MoveStack*, Color us, Bitboard, Bitboard);
+ MoveStack* generate_piece_moves(const Position&, MoveStack*, Color us, Bitboard, Bitboard);
template<>
- inline MoveStack* generate_piece_blocking_evasions<PAWN>(const Position& p, MoveStack* m, Color us,
- Bitboard pnd, Bitboard bs) {
+ inline MoveStack* generate_piece_moves<PAWN>(const Position& p, MoveStack* m,
+ Color us, Bitboard t, Bitboard pnd) {
if (us == WHITE)
- return generate_pawn_blocking_evasions<WHITE, RANK_8, Rank3BB, DELTA_N>(p, pnd, bs, m);
+ return generate_pawn_blocking_evasions<WHITE, RANK_8, Rank3BB, DELTA_N>(p, pnd, t, m);
else
- return generate_pawn_blocking_evasions<BLACK, RANK_1, Rank6BB, DELTA_S>(p, pnd, bs, m);
+ return generate_pawn_blocking_evasions<BLACK, RANK_1, Rank6BB, DELTA_S>(p, pnd, t, m);
}
}
/// generate_evasions() generates all check evasions when the side to move is
-/// in check. Unlike the other move generation functions, this one generates
-/// only legal moves. It returns the number of generated moves. This
-/// function is very ugly, and needs cleaning up some time later. FIXME
+/// in check. Unlike the other move generation functions, this one generates
+/// only legal moves. It returns the number of generated moves.
int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) {
assert(pos.piece_on(ksq) == king_of_color(us));
// The bitboard of occupied pieces without our king
- Bitboard b2 = pos.occupied_squares();
- clear_bit(&b2, ksq);
+ Bitboard b_noKing = pos.occupied_squares();
+ clear_bit(&b_noKing, ksq);
// Find squares attacked by slider checkers, we will
// remove them from king evasions set so to avoid a couple
while (b)
{
from = pop_1st_bit(&b);
- checkersAttacks |= bishop_attacks_bb(from, b2);
+ checkersAttacks |= bishop_attacks_bb(from, b_noKing);
}
b = checkers & (pos.queens() | pos.rooks());
while (b)
{
from = pop_1st_bit(&b);
- checkersAttacks |= rook_attacks_bb(from, b2);
+ checkersAttacks |= rook_attacks_bb(from, b_noKing);
}
// Generate evasions for king
{
to = pop_1st_bit(&b1);
// Note that we can use square_is_attacked() only because we
- // have already removed sliders checkers.
+ // have already removed slider checkers.
if (!pos.square_is_attacked(to, them))
(*mlist++).move = make_move(ksq, to);
}
assert((pos.occupied_squares() & blockSquares) == EmptyBoardBB);
- // Pieces moves
- mlist = generate_piece_blocking_evasions<PAWN>(pos, mlist, us, pinned, blockSquares);
- mlist = generate_piece_blocking_evasions<KNIGHT>(pos, mlist, us, pinned, blockSquares);
- mlist = generate_piece_blocking_evasions<BISHOP>(pos, mlist, us, pinned, blockSquares);
- mlist = generate_piece_blocking_evasions<ROOK>(pos, mlist, us, pinned, blockSquares);
- mlist = generate_piece_blocking_evasions<QUEEN>(pos, mlist, us, pinned, blockSquares);
- }
+ if (blockSquares != EmptyBoardBB)
+ {
+ mlist = generate_piece_moves<PAWN>(pos, mlist, us, blockSquares, pinned);
+ mlist = generate_piece_moves<KNIGHT>(pos, mlist, us, blockSquares, pinned);
+ mlist = generate_piece_moves<BISHOP>(pos, mlist, us, blockSquares, pinned);
+ mlist = generate_piece_moves<ROOK>(pos, mlist, us, blockSquares, pinned);
+ mlist = generate_piece_moves<QUEEN>(pos, mlist, us, blockSquares, pinned);
+ }
+ }
- // Finally, the ugly special case of en passant captures. An en passant
- // capture can only be a check evasion if the check is not a discovered
- // check. If pos.ep_square() is set, the last move made must have been
- // a double pawn push. If, furthermore, the checking piece is a pawn,
- // an en passant check evasion may be possible.
- if (pos.ep_square() != SQ_NONE && (checkers & pos.pawns(them)))
- {
- to = pos.ep_square();
- b1 = pos.pawn_attacks(them, to) & pos.pawns(us);
+ // Finally, the special case of en passant captures. An en passant
+ // capture can only be a check evasion if the check is not a discovered
+ // check. If pos.ep_square() is set, the last move made must have been
+ // a double pawn push. If, furthermore, the checking piece is a pawn,
+ // an en passant check evasion may be possible.
+ if (pos.ep_square() != SQ_NONE && (checkers & pos.pawns(them)))
+ {
+ to = pos.ep_square();
+ b1 = pos.pawn_attacks(them, to) & pos.pawns(us);
- // The checking pawn cannot be a discovered (bishop) check candidate
- // otherwise we were in check also before last double push move.
- assert(!bit_is_set(pos.discovered_check_candidates(them), checksq));
- assert(count_1s(b1) == 1 || count_1s(b1) == 2);
+ // The checking pawn cannot be a discovered (bishop) check candidate
+ // otherwise we were in check also before last double push move.
+ assert(!bit_is_set(pos.discovered_check_candidates(them), checksq));
+ assert(count_1s(b1) == 1 || count_1s(b1) == 2);
- b1 &= ~pinned;
- while (b1)
- {
- from = pop_1st_bit(&b1);
- // Move is always legal because checking pawn is not a discovered
- // check candidate and our capturing pawn has been already tested
- // against pinned pieces.
- (*mlist++).move = make_ep_move(from, to);
- }
- }
+ b1 &= ~pinned;
+ while (b1)
+ {
+ from = pop_1st_bit(&b1);
+ // Move is always legal because checking pawn is not a discovered
+ // check candidate and our capturing pawn has been already tested
+ // against pinned pieces.
+ (*mlist++).move = make_ep_move(from, to);
+ }
+ }
}
return int(mlist - mlist_start);
}
illegal = true;
if ( square_file(to) == FILE_B
- && ( pos.piece_on(to + DELTA_W) == rook_of_color(them)
- || pos.piece_on(to + DELTA_W) == queen_of_color(them)))
+ && ( pos.piece_on(to + DELTA_W) == piece_of_color_and_type(them, ROOK)
+ || pos.piece_on(to + DELTA_W) == piece_of_color_and_type(them, QUEEN)))
illegal = true;
return !illegal;
return mlist;
}
- template<>
- MoveStack* generate_piece_moves<KING>(const Position& pos, MoveStack* mlist, Color us, Bitboard target) {
-
- Bitboard b;
- Square from = pos.king_square(us);
-
- b = pos.piece_attacks<KING>(from) & target;
- SERIALIZE_MOVES(b);
- return mlist;
- }
-
template<PieceType Piece>
- MoveStack* generate_piece_blocking_evasions(const Position& pos, MoveStack* mlist, Color us,
- Bitboard pinned, Bitboard blockSquares) {
+ MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist,
+ Color us, Bitboard target, Bitboard pinned) {
Square from;
Bitboard b;
if (pinned && bit_is_set(pinned, from))
continue;
- b = pos.piece_attacks<Piece>(from) & blockSquares;
+ b = pos.piece_attacks<Piece>(from) & target;
SERIALIZE_MOVES(b);
}
return mlist;
}
+ template<>
+ MoveStack* generate_piece_moves<KING>(const Position& pos, MoveStack* mlist, Color us, Bitboard target) {
+
+ Bitboard b;
+ Square from = pos.king_square(us);
+
+ b = pos.piece_attacks<KING>(from) & target;
+ SERIALIZE_MOVES(b);
+ return mlist;
+ }
+
template<Color Us, Color Them, Bitboard TRank8BB, SquareDelta TDELTA_NE,
SquareDelta TDELTA_NW, SquareDelta TDELTA_N
>
if ( Side == QUEEN_SIDE
&& square_file(rsq) == FILE_B
- && ( pos.piece_on(relative_square(us, SQ_A1)) == rook_of_color(them)
- || pos.piece_on(relative_square(us, SQ_A1)) == queen_of_color(them)))
+ && ( pos.piece_on(relative_square(us, SQ_A1)) == piece_of_color_and_type(them, ROOK)
+ || pos.piece_on(relative_square(us, SQ_A1)) == piece_of_color_and_type(them, QUEEN)))
illegal = true;
if (!illegal)
projects / stockfish / blobdiff