X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=c7c29a4ec5f61bab915c67c1937cc513308e5999;hp=272807b9aa4b4444adf81250dba2c90c2d9459bf;hb=b05fbb3733df535a3fdf99e8d832001e57929699;hpb=83f3ea7ab465c1b8ca0f1a46d245c043e2d14494 diff --git a/src/movegen.cpp b/src/movegen.cpp index 272807b9..c7c29a4e 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -34,7 +34,7 @@ namespace { enum CastlingSide { KING_SIDE, QUEEN_SIDE }; - template + template MoveStack* generate_castle_moves(const Position& pos, MoveStack* mlist, Color us) { const CastleRight CR[] = { Side ? WHITE_OOO : WHITE_OO, @@ -81,6 +81,9 @@ namespace { (*mlist++).move = make_castle(kfrom, rfrom); + if (OnlyChecks && !pos.move_gives_check((mlist - 1)->move, CheckInfo(pos))) + mlist--; + return mlist; } @@ -244,8 +247,8 @@ namespace { template - inline MoveStack* generate_direct_checks(const Position& pos, MoveStack* mlist, Color us, - Bitboard dc, Square ksq) { + inline MoveStack* generate_direct_checks(const Position& pos, MoveStack* mlist, + Color us, const CheckInfo& ci) { assert(Pt != KING && Pt != PAWN); Bitboard checkSqs, b; @@ -255,16 +258,15 @@ namespace { if ((from = *pl++) == SQ_NONE) return mlist; - checkSqs = pos.attacks_from(ksq) & pos.empty_squares(); + checkSqs = ci.checkSq[Pt] & pos.empty_squares(); do { - if ( (Pt == QUEEN && !(QueenPseudoAttacks[from] & checkSqs)) - || (Pt == ROOK && !(RookPseudoAttacks[from] & checkSqs)) - || (Pt == BISHOP && !(BishopPseudoAttacks[from] & checkSqs))) + if ( (Pt == BISHOP || Pt == ROOK || Pt == QUEEN) + && !(PseudoAttacks[Pt][from] & checkSqs)) continue; - if (dc && bit_is_set(dc, from)) + if (ci.dcCandidates && bit_is_set(ci.dcCandidates, from)) continue; b = pos.attacks_from(from) & checkSqs; @@ -277,10 +279,11 @@ namespace { template<> - FORCE_INLINE MoveStack* generate_direct_checks(const Position& p, MoveStack* m, Color us, Bitboard dc, Square ksq) { + FORCE_INLINE MoveStack* generate_direct_checks(const Position& p, MoveStack* m, + Color us, const CheckInfo& ci) { - return us == WHITE ? generate_pawn_moves(p, m, dc, ksq) - : generate_pawn_moves(p, m, dc, ksq); + return us == WHITE ? generate_pawn_moves(p, m, ci.dcCandidates, ci.ksq) + : generate_pawn_moves(p, m, ci.dcCandidates, ci.ksq); } @@ -360,8 +363,8 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { if (Type != MV_CAPTURE && pos.can_castle(us)) { - mlist = generate_castle_moves(pos, mlist, us); - mlist = generate_castle_moves(pos, mlist, us); + mlist = generate_castle_moves(pos, mlist, us); + mlist = generate_castle_moves(pos, mlist, us); } return mlist; @@ -380,37 +383,39 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) assert(!pos.in_check()); - Bitboard b, dc; - Square from; - PieceType pt; Color us = pos.side_to_move(); - Square ksq = pos.king_square(flip(us)); - - assert(pos.piece_on(ksq) == make_piece(flip(us), KING)); - - b = dc = pos.discovered_check_candidates(); + CheckInfo ci(pos); + Bitboard dc = ci.dcCandidates; - while (b) + while (dc) { - from = pop_1st_bit(&b); - pt = type_of(pos.piece_on(from)); + Square from = pop_1st_bit(&dc); + PieceType pt = type_of(pos.piece_on(from)); if (pt == PAWN) continue; // Will be generated togheter with direct checks - b = pos.attacks_from(Piece(pt), from) & pos.empty_squares(); + Bitboard b = pos.attacks_from(Piece(pt), from) & pos.empty_squares(); if (pt == KING) - b &= ~QueenPseudoAttacks[ksq]; + b &= ~PseudoAttacks[QUEEN][ci.ksq]; SERIALIZE(b); } - 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); + mlist = generate_direct_checks(pos, mlist, us, ci); + mlist = generate_direct_checks(pos, mlist, us, ci); + mlist = generate_direct_checks(pos, mlist, us, ci); + mlist = generate_direct_checks(pos, mlist, us, ci); + mlist = generate_direct_checks(pos, mlist, us, ci); + + if (pos.can_castle(us)) + { + mlist = generate_castle_moves(pos, mlist, us); + mlist = generate_castle_moves(pos, mlist, us); + } + + return mlist; } @@ -426,14 +431,13 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { int checkersCnt = 0; Color us = pos.side_to_move(); Square ksq = pos.king_square(us); - Bitboard checkers = pos.checkers(); Bitboard sliderAttacks = 0; + Bitboard checkers = pos.checkers(); - assert(pos.piece_on(ksq) == make_piece(us, KING)); assert(checkers); // Find squares attacked by slider checkers, we will remove them from the king - // evasions set so to skip known illegal moves and avoid to do legality check later. + // evasions so to skip known illegal moves avoiding useless legality check later. b = checkers; do { @@ -444,19 +448,20 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { switch (type_of(pos.piece_on(checksq))) { - case BISHOP: sliderAttacks |= BishopPseudoAttacks[checksq]; break; - case ROOK: sliderAttacks |= RookPseudoAttacks[checksq]; break; + case BISHOP: sliderAttacks |= PseudoAttacks[BISHOP][checksq]; break; + case ROOK: sliderAttacks |= PseudoAttacks[ROOK][checksq]; break; case QUEEN: - // If queen and king are far we can safely remove all the squares attacked - // in the other direction becuase are not reachable by the king anyway. - if (squares_between(ksq, checksq) || (RookPseudoAttacks[checksq] & (1ULL << ksq))) - sliderAttacks |= QueenPseudoAttacks[checksq]; - - // Otherwise, if king and queen are adjacent and on a diagonal line, we need to - // use real rook attacks to check if king is safe to move in the other direction. - // For example: king in B2, queen in A1 a knight in B1, and we can safely move to C1. + // If queen and king are far or not on a diagonal line we can safely + // remove all the squares attacked in the other direction becuase are + // not reachable by the king anyway. + if (squares_between(ksq, checksq) || !bit_is_set(PseudoAttacks[BISHOP][checksq], ksq)) + sliderAttacks |= PseudoAttacks[QUEEN][checksq]; + + // Otherwise we need to use real rook attacks to check if king is safe + // to move in the other direction. For example: king in B2, queen in A1 + // a knight in B1, and we can safely move to C1. else - sliderAttacks |= BishopPseudoAttacks[checksq] | pos.attacks_from(checksq); + sliderAttacks |= PseudoAttacks[BISHOP][checksq] | pos.attacks_from(checksq); default: break; @@ -472,7 +477,7 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { if (checkersCnt > 1) return mlist; - // Target for blocking evasions or captures of the checking piece + // Blocking evasions or captures of the checking piece target = squares_between(checksq, ksq) | checkers; mlist = generate_piece_moves(pos, mlist, us, target);