X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=ed204672378fa81edeaacf417494982c1ac36b6a;hp=caf2bfe675b77edc05e54e4ba16d0cdd97ffd4b5;hb=e56342ed002b2d567fbecd2e4432b881f1b244bc;hpb=972dec454c6da25879bcaeae4392907d3ad577e0 diff --git a/src/movegen.cpp b/src/movegen.cpp index caf2bfe6..ed204672 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -29,55 +29,37 @@ /// Version used for pawns, where the 'from' square is given as a delta from the 'to' square #define SERIALIZE_PAWNS(b, d) while (b) { Square to = pop_1st_bit(&b); \ - (*mlist++).move = make_move(to + (d), to); } + (*mlist++).move = make_move(to - (d), to); } namespace { - enum CastlingSide { KING_SIDE, QUEEN_SIDE }; - template - MoveStack* generate_castle_moves(const Position& pos, MoveStack* mlist, Color us) { + MoveStack* generate_castle(const Position& pos, MoveStack* mlist, Color us) { - const CastleRight CR[] = { Side ? WHITE_OOO : WHITE_OO, - Side ? BLACK_OOO : BLACK_OO }; + CastleRight cr = CastleRight((Side == KING_SIDE ? WHITE_OO : WHITE_OOO) << us); - if (!pos.can_castle(CR[us])) + if (pos.castle_impeded(us, Side) || !pos.can_castle(cr)) return mlist; // After castling, the rook and king final positions are the same in Chess960 // as they would be in standard chess. Square kfrom = pos.king_square(us); - 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); + Square rfrom = pos.castle_rook_square(us, Side); Bitboard enemies = pos.pieces(~us); assert(!pos.in_check()); - assert(pos.piece_on(kfrom) == make_piece(us, KING)); - assert(pos.piece_on(rfrom) == make_piece(us, ROOK)); - - // Unimpeded rule: All the squares between the king's initial and final squares - // (including the final square), and all the squares between the rook's initial - // and final squares (including the final square), must be vacant except for - // the king and castling rook. - for (Square s = std::min(rfrom, rto), e = std::max(rfrom, rto); s <= e; s++) - if (s != kfrom && s != rfrom && !pos.square_is_empty(s)) - return mlist; for (Square s = std::min(kfrom, kto), e = std::max(kfrom, kto); s <= e; s++) - if ( (s != kfrom && s != rfrom && !pos.square_is_empty(s)) - ||(pos.attackers_to(s) & enemies)) + if ( s != kfrom // We are not in check + && (pos.attackers_to(s) & enemies)) return mlist; // Because we generate only legal castling moves we need to verify that // when moving the castling rook we do not discover some hidden checker. // For instance an enemy queen in SQ_A1 when castling rook is in SQ_B1. - if (pos.is_chess960()) - { - Bitboard occ = pos.occupied_squares(); - clear_bit(&occ, rfrom); - if (pos.attackers_to(kto, occ) & enemies) + if ( pos.is_chess960() + && (pos.attackers_to(kto, pos.pieces() ^ rfrom) & enemies)) return mlist; - } (*mlist++).move = make_castle(kfrom, rfrom); @@ -96,7 +78,7 @@ namespace { : Delta == DELTA_NE ? (p & ~FileHBB) << 9 : Delta == DELTA_SE ? (p & ~FileHBB) >> 7 : Delta == DELTA_NW ? (p & ~FileABB) << 7 - : Delta == DELTA_SW ? (p & ~FileABB) >> 9 : p; + : Delta == DELTA_SW ? (p & ~FileABB) >> 9 : 0; } @@ -112,16 +94,16 @@ namespace { if (Type == MV_CAPTURE || Type == MV_EVASION || Type == MV_NON_EVASION) (*mlist++).move = make_promotion(to - Delta, to, QUEEN); - if (Type == MV_NON_CAPTURE || Type == MV_EVASION || Type == MV_NON_EVASION) + if (Type == MV_QUIET || Type == MV_EVASION || Type == MV_NON_EVASION) { (*mlist++).move = make_promotion(to - Delta, to, ROOK); (*mlist++).move = make_promotion(to - Delta, to, BISHOP); (*mlist++).move = make_promotion(to - Delta, to, KNIGHT); } - // Knight-promotion is the only one that can give a check (direct or - // discovered) not already included in the queen-promotion. - if (Type == MV_NON_CAPTURE_CHECK && bit_is_set(StepAttacksBB[W_KNIGHT][to], ksq)) + // Knight-promotion is the only one that can give a direct check not + // already included in the queen-promotion. + if (Type == MV_QUIET_CHECK && (StepAttacksBB[W_KNIGHT][to] & ksq)) (*mlist++).move = make_promotion(to - Delta, to, KNIGHT); else (void)ksq; // Silence a warning under MSVC @@ -134,7 +116,7 @@ namespace { template 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 + // Compute our parametrized parameters at compile time, named according to // the point of view of white side. const Color Them = (Us == WHITE ? BLACK : WHITE); const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB); @@ -155,7 +137,7 @@ namespace { // Single and double pawn pushes, no promotions if (Type != MV_CAPTURE) { - emptySquares = (Type == MV_NON_CAPTURE ? target : pos.empty_squares()); + emptySquares = (Type == MV_QUIET ? target : ~pos.pieces()); b1 = move_pawns(pawnsNotOn7) & emptySquares; b2 = move_pawns(b1 & TRank3BB) & emptySquares; @@ -166,7 +148,7 @@ namespace { b2 &= target; } - if (Type == MV_NON_CAPTURE_CHECK) + if (Type == MV_QUIET_CHECK) { b1 &= pos.attacks_from(ksq, Them); b2 &= pos.attacks_from(ksq, Them); @@ -185,15 +167,15 @@ namespace { } } - SERIALIZE_PAWNS(b1, -UP); - SERIALIZE_PAWNS(b2, -UP -UP); + SERIALIZE_PAWNS(b1, UP); + SERIALIZE_PAWNS(b2, UP + UP); } // Promotions and underpromotions if (pawnsOn7 && (Type != MV_EVASION || (target & TRank8BB))) { if (Type == MV_CAPTURE) - emptySquares = pos.empty_squares(); + emptySquares = ~pos.pieces(); if (Type == MV_EVASION) emptySquares &= target; @@ -209,8 +191,8 @@ namespace { b1 = move_pawns(pawnsNotOn7) & enemies; b2 = move_pawns(pawnsNotOn7) & enemies; - SERIALIZE_PAWNS(b1, -RIGHT); - SERIALIZE_PAWNS(b2, -LEFT); + SERIALIZE_PAWNS(b1, RIGHT); + SERIALIZE_PAWNS(b2, LEFT); if (pos.ep_square() != SQ_NONE) { @@ -219,7 +201,7 @@ namespace { // An en passant capture can be an evasion only if the checking piece // is the double pushed pawn and so is in the target. Otherwise this // is a discovery check and we are forced to do otherwise. - if (Type == MV_EVASION && !bit_is_set(target, pos.ep_square() - UP)) + if (Type == MV_EVASION && !(target & (pos.ep_square() - UP))) return mlist; b1 = pawnsNotOn7 & pos.attacks_from(pos.ep_square(), Them); @@ -240,55 +222,56 @@ namespace { Color us, const CheckInfo& ci) { assert(Pt != KING && Pt != PAWN); + Bitboard b, target; Square from; const Square* pl = pos.piece_list(us, Pt); - if ((from = *pl++) == SQ_NONE) - return mlist; - - Bitboard checkSqs = ci.checkSq[Pt] & pos.empty_squares(); - - do + if (*pl != SQ_NONE) { - if ( (Pt == BISHOP || Pt == ROOK || Pt == QUEEN) - && !(PseudoAttacks[Pt][from] & checkSqs)) - continue; + target = ci.checkSq[Pt] & ~pos.pieces(); // Non capture checks only - if (ci.dcCandidates && bit_is_set(ci.dcCandidates, from)) - continue; + do { + from = *pl; - Bitboard b = pos.attacks_from(from) & checkSqs; - SERIALIZE(b); + if ( (Pt == BISHOP || Pt == ROOK || Pt == QUEEN) + && !(PseudoAttacks[Pt][from] & target)) + continue; - } while ((from = *pl++) != SQ_NONE); + if (ci.dcCandidates && (ci.dcCandidates & from)) + continue; + + b = pos.attacks_from(from) & target; + SERIALIZE(b); + } while (*++pl != SQ_NONE); + } return mlist; } template - FORCE_INLINE MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) { + FORCE_INLINE MoveStack* generate_moves(const Position& pos, MoveStack* mlist, + Color us, Bitboard target) { + assert(Pt != KING && Pt != PAWN); Bitboard b; Square from; const Square* pl = pos.piece_list(us, Pt); if (*pl != SQ_NONE) - { do { from = *pl; b = pos.attacks_from(from) & target; SERIALIZE(b); } while (*++pl != SQ_NONE); - } return mlist; } template<> - FORCE_INLINE MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) { - + FORCE_INLINE MoveStack* generate_moves(const Position& pos, MoveStack* mlist, + Color us, Bitboard target) { Square from = pos.king_square(us); Bitboard b = pos.attacks_from(from) & target; SERIALIZE(b); @@ -301,7 +284,7 @@ namespace { /// generate generates all pseudo-legal captures and queen /// promotions. Returns a pointer to the end of the move list. /// -/// generate generates all pseudo-legal non-captures and +/// generate generates all pseudo-legal non-captures and /// underpromotions. Returns a pointer to the end of the move list. /// /// generate generates all pseudo-legal captures and @@ -310,7 +293,7 @@ namespace { template MoveStack* generate(const Position& pos, MoveStack* mlist) { - assert(Type == MV_CAPTURE || Type == MV_NON_CAPTURE || Type == MV_NON_EVASION); + assert(Type == MV_CAPTURE || Type == MV_QUIET || Type == MV_NON_EVASION); assert(!pos.in_check()); Color us = pos.side_to_move(); @@ -319,25 +302,25 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { if (Type == MV_CAPTURE) target = pos.pieces(~us); - else if (Type == MV_NON_CAPTURE) - target = pos.empty_squares(); + else if (Type == MV_QUIET) + target = ~pos.pieces(); else if (Type == MV_NON_EVASION) - target = pos.pieces(~us) | pos.empty_squares(); + target = ~pos.pieces(us); 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); - mlist = generate_piece_moves(pos, mlist, us, target); + mlist = generate_moves(pos, mlist, us, target); + mlist = generate_moves(pos, mlist, us, target); + mlist = generate_moves(pos, mlist, us, target); + mlist = generate_moves(pos, mlist, us, target); + mlist = generate_moves(pos, mlist, us, target); 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(pos, mlist, us); + mlist = generate_castle(pos, mlist, us); } return mlist; @@ -345,14 +328,14 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { // Explicit template instantiations template MoveStack* generate(const Position& pos, MoveStack* mlist); -template MoveStack* generate(const Position& pos, MoveStack* mlist); +template MoveStack* generate(const Position& pos, MoveStack* mlist); template MoveStack* generate(const Position& pos, MoveStack* mlist); -/// generate generates all pseudo-legal non-captures and knight +/// generate generates all pseudo-legal non-captures and knight /// underpromotions that give check. Returns a pointer to the end of the move list. template<> -MoveStack* generate(const Position& pos, MoveStack* mlist) { +MoveStack* generate(const Position& pos, MoveStack* mlist) { assert(!pos.in_check()); @@ -368,7 +351,7 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) if (pt == PAWN) continue; // Will be generated togheter with direct checks - Bitboard b = pos.attacks_from(Piece(pt), from) & pos.empty_squares(); + Bitboard b = pos.attacks_from(Piece(pt), from) & ~pos.pieces(); if (pt == KING) b &= ~PseudoAttacks[QUEEN][ci.ksq]; @@ -376,8 +359,8 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) SERIALIZE(b); } - mlist = (us == WHITE ? generate_pawn_moves(pos, mlist, ci.dcCandidates, ci.ksq) - : generate_pawn_moves(pos, mlist, ci.dcCandidates, ci.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); @@ -386,8 +369,8 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) if (pos.can_castle(us)) { - mlist = generate_castle_moves(pos, mlist, us); - mlist = generate_castle_moves(pos, mlist, us); + mlist = generate_castle(pos, mlist, us); + mlist = generate_castle(pos, mlist, us); } return mlist; @@ -429,7 +412,7 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { // 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)) + if (squares_between(ksq, checksq) || !(PseudoAttacks[BISHOP][checksq] & ksq)) sliderAttacks |= PseudoAttacks[QUEEN][checksq]; // Otherwise we need to use real rook attacks to check if king is safe @@ -458,10 +441,10 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { 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); - return generate_piece_moves(pos, mlist, us, target); + mlist = generate_moves(pos, mlist, us, target); + mlist = generate_moves(pos, mlist, us, target); + mlist = generate_moves(pos, mlist, us, target); + return generate_moves(pos, mlist, us, target); }