namespace {
enum CastlingSide {
- KING_SIDE = 1,
- QUEEN_SIDE = 2
+ KING_SIDE,
+ QUEEN_SIDE
};
- // Functions
- MoveStack* generate_castle_moves(const Position&, MoveStack*, unsigned = (KING_SIDE | QUEEN_SIDE));
- bool castling_is_check(const Position& pos, CastlingSide side);
+ // Function
+ bool castling_is_check(const Position&, CastlingSide);
+
+ // Template
+ template<CastlingSide Side>
+ MoveStack* generate_castle_moves(const Position&, MoveStack*);
// Template generate_pawn_captures() with specializations
template<Color, Color, Bitboard, SquareDelta, SquareDelta, SquareDelta>
mlist = generate_piece_moves<ROOK>(pos, mlist, us, target);
mlist = generate_piece_moves<QUEEN>(pos, mlist, us, target);
mlist = generate_piece_moves<KING>(pos, mlist, us, target);
- mlist = generate_castle_moves(pos, mlist);
+ mlist = generate_castle_moves<KING_SIDE>(pos, mlist);
+ mlist = generate_castle_moves<QUEEN_SIDE>(pos, mlist);
return int(mlist - mlist_start);
}
if ( pos.can_castle_queenside(us)
&& (square_rank(ksq) == square_rank(pos.king_square(us)) || square_file(ksq) == FILE_D)
&& castling_is_check(pos, QUEEN_SIDE))
- mlist = generate_castle_moves(pos, mlist, QUEEN_SIDE);
+ mlist = generate_castle_moves<QUEEN_SIDE>(pos, mlist);
if ( pos.can_castle_kingside(us)
&& (square_rank(ksq) == square_rank(pos.king_square(us)) || square_file(ksq) == FILE_F)
&& castling_is_check(pos, KING_SIDE))
- mlist = generate_castle_moves(pos, mlist, KING_SIDE);
+ mlist = generate_castle_moves<KING_SIDE>(pos, mlist);
return int(mlist - mlist_start);
}
/// 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
+/// only legal moves. It returns the number of generated moves. This
/// function is very ugly, and needs cleaning up some time later. FIXME
int generate_evasions(const Position& pos, MoveStack* mlist) {
/// generate_legal_moves() computes a complete list of legal moves in the
-/// current position. This function is not very fast, and should be used
-/// only in situations where performance is unimportant. It wouldn't be
+/// current position. This function is not very fast, and should be used
+/// only in situations where performance is unimportant. It wouldn't be
/// very hard to write an efficient legal move generator, but for the moment
/// we don't need it.
b2 = b1 & TRank8BB;
while (b2)
{
- to = pop_1st_bit(&b2);
- (*mlist++).move = make_promotion_move(to - TDELTA_N, to, ROOK);
- (*mlist++).move = make_promotion_move(to - TDELTA_N, to, BISHOP);
- (*mlist++).move = make_promotion_move(to - TDELTA_N, to, KNIGHT);
+ to = pop_1st_bit(&b2);
+ (*mlist++).move = make_promotion_move(to - TDELTA_N, to, ROOK);
+ (*mlist++).move = make_promotion_move(to - TDELTA_N, to, BISHOP);
+ (*mlist++).move = make_promotion_move(to - TDELTA_N, to, KNIGHT);
}
b2 = b1 & ~TRank8BB;
while (b2)
b2 = (Us == WHITE ? (b1 & TRank3BB) << 8 : (b1 & TRank3BB) >> 8) & emptySquares;
while (b2)
{
- to = pop_1st_bit(&b2);
- (*mlist++).move = make_move(to - TDELTA_N - TDELTA_N, to);
+ to = pop_1st_bit(&b2);
+ (*mlist++).move = make_move(to - TDELTA_N - TDELTA_N, to);
}
return mlist;
}
// Find all friendly pawns not on the enemy king's file
Bitboard b1 = pos.pawns(Us) & ~file_bb(ksq), b2, b3;
- // Discovered checks, single pawn pushes
- b2 = b3 = (Us == WHITE ? (b1 & dc) << 8 : (b1 & dc) >> 8) & ~TRank8BB & empty;
+ // 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);
// Direct checks. These are possible only for pawns on neighboring files
// of the enemy king
-
- b1 &= (~dc & neighboring_files_bb(ksq)); // FIXME why ~dc ??
+ b1 &= (~dc & neighboring_files_bb(ksq));
// Direct checks, single pawn pushes
b2 = (Us == WHITE ? b1 << 8 : b1 >> 8) & empty;
return mlist;
}
- MoveStack* generate_castle_moves(const Position& pos, MoveStack* mlist, unsigned side) {
+ template<CastlingSide Side>
+ MoveStack* generate_castle_moves(const Position& pos, MoveStack* mlist) {
Color us = pos.side_to_move();
- if (pos.can_castle_kingside(us) && (side & KING_SIDE))
+ if ( (Side == KING_SIDE && pos.can_castle_kingside(us))
+ ||(Side == QUEEN_SIDE && pos.can_castle_queenside(us)))
{
Color them = opposite_color(us);
Square ksq = pos.king_square(us);
assert(pos.piece_on(ksq) == king_of_color(us));
- Square rsq = pos.initial_kr_square(us);
- Square g1 = relative_square(us, SQ_G1);
- Square f1 = relative_square(us, SQ_F1);
+ Square rsq = (Side == KING_SIDE ? pos.initial_kr_square(us) : pos.initial_qr_square(us));
+ Square s1 = relative_square(us, Side == KING_SIDE ? SQ_G1 : SQ_C1);
+ Square s2 = relative_square(us, Side == KING_SIDE ? SQ_F1 : SQ_D1);
Square s;
bool illegal = false;
assert(pos.piece_on(rsq) == rook_of_color(us));
- for (s = Min(ksq, g1); s <= Max(ksq, g1); s++)
+ // 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.square_is_attacked(s, them))
illegal = true;
- for (s = Min(rsq, f1); s <= Max(rsq, f1); s++)
+ for (s = Min(rsq, s2); s <= Max(rsq, s2); s++)
if (s != ksq && s != rsq && pos.square_is_occupied(s))
illegal = true;
+ 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)))
+ illegal = true;
+
if (!illegal)
(*mlist++).move = make_castle_move(ksq, rsq);
}
-
- if (pos.can_castle_queenside(us) && (side & QUEEN_SIDE))
- {
- Color them = opposite_color(us);
- Square ksq = pos.king_square(us);
-
- assert(pos.piece_on(ksq) == king_of_color(us));
-
- Square rsq = pos.initial_qr_square(us);
- Square c1 = relative_square(us, SQ_C1);
- Square d1 = relative_square(us, SQ_D1);
- Square s;
- bool illegal = false;
-
- assert(pos.piece_on(rsq) == rook_of_color(us));
-
- for (s = Min(ksq, c1); s <= Max(ksq, c1); s++)
- if ( (s != ksq && s != rsq && pos.square_is_occupied(s))
- || pos.square_is_attacked(s, them))
- illegal = true;
-
- for (s = Min(rsq, d1); s <= Max(rsq, d1); s++)
- if (s != ksq && s != rsq && pos.square_is_occupied(s))
- illegal = true;
-
- if ( 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)))
- illegal = true;
-
- if (!illegal)
- (*mlist++).move = make_castle_move(ksq, rsq);
- }
return mlist;
}
File rookFile = (side == QUEEN_SIDE ? FILE_D : FILE_F);
Color us = pos.side_to_move();
Square ksq = pos.king_square(us);
- Bitboard occ = pos.occupied_squares(), oppKingBB = EmptyBoardBB;
+ Bitboard occ = pos.occupied_squares();
- set_bit(&oppKingBB, pos.king_square(opposite_color(us)));
clear_bit(&occ, ksq); // Remove our king from the board
Square rsq = make_square(rookFile, square_rank(ksq));
- return (rook_attacks_bb(rsq, occ) & oppKingBB);
+ return bit_is_set(rook_attacks_bb(rsq, occ), pos.king_square(opposite_color(us)));
}
}
projects / stockfish / blobdiff