X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=00e1adf5caa293bcff46b0b263f55196319d2fb7;hp=f83dded7c4bea3d5d15429ba45f08b18fa597bdc;hb=23de3e16f153f91601e0a6a19b793c54a1ba35cd;hpb=48b74142efa52f0da9d4e27f9bbcbe9520499524 diff --git a/src/movegen.cpp b/src/movegen.cpp index f83dded7..00e1adf5 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -52,9 +52,6 @@ namespace { EVASION }; - // Functions - bool castling_is_check(const Position&, CastlingSide); - // Helper templates template MoveStack* generate_castle_moves(const Position&, MoveStack*); @@ -80,12 +77,16 @@ namespace { : generate_pawn_moves(p, m)); } - // Template generate_piece_checks with specializations + // Templates for non-capture checks generation + + template + MoveStack* generate_discovered_checks(const Position& pos, Square from, MoveStack* mlist); + template - MoveStack* generate_piece_checks(const Position&, MoveStack*, Color, Bitboard, Square); + MoveStack* generate_direct_checks(const Position&, MoveStack*, Color, Bitboard, Square); template<> - inline MoveStack* generate_piece_checks(const Position& p, MoveStack* m, Color us, Bitboard dc, Square ksq) { + inline MoveStack* generate_direct_checks(const Position& p, MoveStack* m, Color us, Bitboard dc, Square ksq) { return (us == WHITE ? generate_pawn_moves(p, m, dc, ksq) : generate_pawn_moves(p, m, dc, ksq)); @@ -165,26 +166,28 @@ MoveStack* generate_non_capture_checks(const Position& pos, MoveStack* mlist, Bi assert(pos.piece_on(ksq) == piece_of_color_and_type(opposite_color(us), KING)); - // Pieces moves - mlist = generate_piece_checks(pos, mlist, us, dc, ksq); - mlist = generate_piece_checks(pos, mlist, us, dc, ksq); - mlist = generate_piece_checks(pos, mlist, us, dc, ksq); - mlist = generate_piece_checks(pos, mlist, us, dc, ksq); - mlist = generate_piece_checks(pos, mlist, us, dc, ksq); - mlist = generate_piece_checks(pos, mlist, us, dc, ksq); - - // 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); + // Discovered non-capture checks + Bitboard b = dc; + while (b) + { + Square from = pop_1st_bit(&b); + switch (pos.type_of_piece_on(from)) + { + case PAWN: /* Will be generated togheter with pawns direct checks */ break; + case KNIGHT: mlist = generate_discovered_checks(pos, from, mlist); break; + case BISHOP: mlist = generate_discovered_checks(pos, from, mlist); break; + case ROOK: mlist = generate_discovered_checks(pos, from, mlist); break; + case KING: mlist = generate_discovered_checks(pos, from, mlist); break; + default: assert(false); break; + } + } - return mlist; + // Direct non-capture checks + mlist = generate_direct_checks(pos, mlist, us, dc, ksq); + mlist = generate_direct_checks(pos, mlist, us, dc, ksq); + mlist = generate_direct_checks(pos, mlist, us, dc, ksq); + mlist = generate_direct_checks(pos, mlist, us, dc, ksq); + return generate_direct_checks(pos, mlist, us, dc, ksq); } @@ -653,13 +656,13 @@ namespace { // Single pawn pushes b1 = move_pawns(pawns) & emptySquares & ~TRank8BB; b2 = (Type == CHECK ? (b1 & pos.attacks_from(ksq, Them)) | dcPawns1 : - (Type == EVASION ? b1 & blockSquares : b1)); + (Type == EVASION ? b1 & blockSquares : b1)); SERIALIZE_MOVES_D(b2, -TDELTA_N); // Double pawn pushes b1 = move_pawns(b1 & TRank3BB) & emptySquares; b2 = (Type == CHECK ? (b1 & pos.attacks_from(ksq, Them)) | dcPawns2 : - (Type == EVASION ? b1 & blockSquares : b1)); + (Type == EVASION ? b1 & blockSquares : b1)); SERIALIZE_MOVES_D(b2, -TDELTA_N -TDELTA_N); } else if (pos.ep_square() != SQ_NONE) // En passant captures @@ -680,43 +683,49 @@ namespace { } template - MoveStack* generate_piece_checks(const Position& pos, MoveStack* mlist, Color us, + MoveStack* generate_discovered_checks(const Position& pos, Square from, MoveStack* mlist) { + + assert(Piece != QUEEN); + + Bitboard b = pos.attacks_from(from) & pos.empty_squares(); + if (Piece == KING) + { + Square ksq = pos.king_square(opposite_color(pos.side_to_move())); + b &= ~QueenPseudoAttacks[ksq]; + } + SERIALIZE_MOVES(b); + return mlist; + } + + template + MoveStack* generate_direct_checks(const Position& pos, MoveStack* mlist, Color us, Bitboard dc, Square ksq) { + assert(Piece != KING); - Bitboard target = pos.pieces(Piece, us); + Square from; + Bitboard checkSqs; + const Square* ptr = pos.piece_list_begin(us, Piece); - // Discovered non-capture checks - Bitboard b = target & dc; + if ((from = *ptr++) == SQ_NONE) + return mlist; - assert(Piece != QUEEN || !b); + checkSqs = pos.attacks_from(ksq) & pos.empty_squares(); - while (b) + do { - Square from = pop_1st_bit(&b); - Bitboard bb = pos.attacks_from(from) & pos.empty_squares(); - if (Piece == KING) - bb &= ~QueenPseudoAttacks[ksq]; + if ( (Piece == QUEEN && !(QueenPseudoAttacks[from] & checkSqs)) + || (Piece == ROOK && !(RookPseudoAttacks[from] & checkSqs)) + || (Piece == BISHOP && !(BishopPseudoAttacks[from] & checkSqs))) + continue; + + if (dc && bit_is_set(dc, from)) + continue; + Bitboard bb = pos.attacks_from(from) & checkSqs; SERIALIZE_MOVES(bb); - } - // Direct non-capture checks - b = target & ~dc; - Bitboard checkSqs = pos.attacks_from(ksq) & pos.empty_squares(); - if (Piece != KING && checkSqs) - { - 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.attacks_from(from) & checkSqs; - SERIALIZE_MOVES(bb); - } - } + } while ((from = *ptr++) != SQ_NONE); + return mlist; } @@ -762,17 +771,4 @@ namespace { } 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(); - - clear_bit(&occ, ksq); // Remove our king from the board - Square rsq = make_square(rookFile, square_rank(ksq)); - return bit_is_set(rook_attacks_bb(rsq, occ), pos.king_square(opposite_color(us))); - } }