X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=9c405defab4b75e9845e18ec809fc1310843669d;hp=7273ca9ad6ebbf50a1aca42734381446a8e948e5;hb=76381cbd6903f8be571cbc0d644a0f78026134bc;hpb=8a0dd93c56f63de467190145116ed6c5cfd54bc1 diff --git a/src/movegen.cpp b/src/movegen.cpp index 7273ca9a..9c405def 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -35,7 +35,16 @@ namespace { + enum CastlingSide { + KING_SIDE, + QUEEN_SIDE + }; + // Function + bool castling_is_check(const Position&, CastlingSide); + + // Template + template MoveStack* generate_castle_moves(const Position&, MoveStack*); // Template generate_pawn_captures() with specializations @@ -159,14 +168,14 @@ int generate_noncaptures(const Position& pos, MoveStack* mlist) { mlist = generate_piece_moves(pos, mlist, us, target); mlist = generate_piece_moves(pos, mlist, us, target); mlist = generate_piece_moves(pos, mlist, us, target); - mlist = generate_castle_moves(pos, mlist); + mlist = generate_castle_moves(pos, mlist); + mlist = generate_castle_moves(pos, mlist); return int(mlist - mlist_start); } /// generate_checks() generates all pseudo-legal non-capturing, non-promoting -/// checks, except castling moves (will add this later). It returns the -/// number of generated moves. +/// checks. It returns the number of generated moves. int generate_checks(const Position& pos, MoveStack* mlist, Bitboard dc) { @@ -207,7 +216,16 @@ int generate_checks(const Position& pos, MoveStack* mlist, Bitboard dc) { // Hopefully we always have a king ;-) mlist = generate_piece_checks_king(pos, pos.king_square(us), dc, ksq, mlist); - // TODO: Castling moves! + // Castling moves that give check. Very rare but nice to have! + 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); + + 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); return int(mlist - mlist_start); } @@ -215,7 +233,7 @@ int generate_checks(const Position& pos, MoveStack* mlist, Bitboard dc) { /// 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) { @@ -366,8 +384,8 @@ 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. @@ -723,10 +741,10 @@ namespace { 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) @@ -739,8 +757,8 @@ namespace { 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; } @@ -757,8 +775,8 @@ namespace { // 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); @@ -775,8 +793,7 @@ namespace { // 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; @@ -879,70 +896,60 @@ namespace { return mlist; } - + template MoveStack* generate_castle_moves(const Position& pos, MoveStack* mlist) { Color us = pos.side_to_move(); - if (pos.can_castle(us)) + 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)); - if (pos.can_castle_kingside(us)) - { - Square rsq = pos.initial_kr_square(us); - Square g1 = relative_square(us, SQ_G1); - Square f1 = relative_square(us, SQ_F1); - Square s; - bool illegal = false; + 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)); + assert(pos.piece_on(rsq) == rook_of_color(us)); - for (s = Min(ksq, g1); s <= Max(ksq, g1); s++) - if ( (s != ksq && s != rsq && pos.square_is_occupied(s)) - || pos.square_is_attacked(s, them)) - illegal = true; + // 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++) - if (s != ksq && s != rsq && pos.square_is_occupied(s)) - illegal = true; - - if (!illegal) - (*mlist++).move = make_castle_move(ksq, rsq); - } + for (s = Min(rsq, s2); s <= Max(rsq, s2); s++) + if (s != ksq && s != rsq && pos.square_is_occupied(s)) + illegal = true; - if (pos.can_castle_queenside(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 + 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); - } } return mlist; } + bool castling_is_check(const Position& pos, CastlingSide side) { + + // After castling opponent king is attacked by the castled rook? + 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; + + 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); + } }