X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=64c44f28a0eba0d4d985854339e3aa50bd2f130f;hp=1820fee2fbcb2af58aeeacae07db46df9e126efb;hb=20621ed3e3588468c44ab2f69a82eedc6f5c0119;hpb=87fc9dcaa30017dcfd886b0f304a76a63dedc35e diff --git a/src/movegen.cpp b/src/movegen.cpp index 1820fee2..64c44f28 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -49,7 +49,7 @@ namespace { Square rfrom = pos.castle_rook_square(CR[us]); Square kto = relative_square(us, Side == KING_SIDE ? SQ_G1 : SQ_C1); Square rto = relative_square(us, Side == KING_SIDE ? SQ_F1 : SQ_D1); - Bitboard enemies = pos.pieces(flip(us)); + Bitboard enemies = pos.pieces(~us); assert(!pos.in_check()); assert(pos.piece_on(kfrom) == make_piece(us, KING)); @@ -141,12 +141,13 @@ namespace { else (void)ksq; // Silence a warning under MSVC } + return mlist; } template - MoveStack* generate_pawn_moves(const Position& pos, MoveStack* mlist, Bitboard target, Square ksq) { + MoveStack* generate_pawn_moves(const Position& pos, MoveStack* mlist, Bitboard target, Square ksq = SQ_NONE) { // Calculate our parametrized parameters at compile time, named according to // the point of view of white side. @@ -247,30 +248,28 @@ 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; Square from; const Square* pl = pos.piece_list(us, Pt); if ((from = *pl++) == SQ_NONE) return mlist; - checkSqs = pos.attacks_from(ksq) & pos.empty_squares(); + Bitboard 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; + Bitboard b = pos.attacks_from(from) & checkSqs; SERIALIZE(b); } while ((from = *pl++) != SQ_NONE); @@ -279,23 +278,6 @@ namespace { } - template<> - FORCE_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); - } - - - template - FORCE_INLINE MoveStack* generate_piece_moves(const Position& p, MoveStack* m, Color us, Bitboard t) { - - assert(Pt == PAWN); - return us == WHITE ? generate_pawn_moves(p, m, t, SQ_NONE) - : generate_pawn_moves(p, m, t, SQ_NONE); - } - - template FORCE_INLINE MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) { @@ -311,6 +293,7 @@ namespace { SERIALIZE(b); } while (*++pl != SQ_NONE); } + return mlist; } @@ -346,15 +329,17 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { Bitboard target; if (Type == MV_CAPTURE) - target = pos.pieces(flip(us)); + target = pos.pieces(~us); else if (Type == MV_NON_CAPTURE) target = pos.empty_squares(); else if (Type == MV_NON_EVASION) - target = pos.pieces(flip(us)) | pos.empty_squares(); + target = pos.pieces(~us) | pos.empty_squares(); + + mlist = (us == WHITE ? generate_pawn_moves(pos, mlist, target) + : generate_pawn_moves(pos, mlist, target)); - 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_piece_moves(pos, mlist, us, target); @@ -383,37 +368,33 @@ 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); - mlist = generate_direct_checks(pos, mlist, us, dc, ksq); + mlist = (us == WHITE ? generate_pawn_moves(pos, mlist, ci.dcCandidates, ci.ksq) + : generate_pawn_moves(pos, mlist, ci.dcCandidates, ci.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); if (pos.can_castle(us)) { @@ -437,37 +418,37 @@ 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 { checkersCnt++; checksq = pop_1st_bit(&b); - assert(color_of(pos.piece_on(checksq)) == flip(us)); + assert(color_of(pos.piece_on(checksq)) == ~us); 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; @@ -483,10 +464,12 @@ 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); + mlist = (us == WHITE ? generate_pawn_moves(pos, mlist, target) + : generate_pawn_moves(pos, mlist, target)); + mlist = generate_piece_moves(pos, mlist, us, target); mlist = generate_piece_moves(pos, mlist, us, target); mlist = generate_piece_moves(pos, mlist, us, target);