X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=f38d42261ccfbdf827cdc5d9ad1c813f812a4aff;hp=6f932cd05de6befd53b89737c5e0aadae1cdb516;hb=b1929960f9b73cb8fcc86fdbdf7a8d2d1de4fc53;hpb=b3545737fa573dec230e5395f36b86a4c1de0510 diff --git a/src/movegen.cpp b/src/movegen.cpp index 6f932cd0..f38d4226 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -17,16 +17,10 @@ along with this program. If not, see . */ - -//// -//// Includes -//// - #include #include "bitcount.h" #include "movegen.h" -#include "types.h" // Simple macro to wrap a very common while loop, no facny, no flexibility, // hardcoded list name 'mlist' and from square 'from'. @@ -35,10 +29,6 @@ // Version used for pawns, where the 'from' square is given as a delta from the 'to' square #define SERIALIZE_MOVES_D(b, d) while (b) { to = pop_1st_bit(&b); (*mlist++).move = make_move(to + (d), to); } -//// -//// Local definitions -//// - namespace { enum CastlingSide { @@ -46,19 +36,19 @@ namespace { QUEEN_SIDE }; - template + template MoveStack* generate_castle_moves(const Position&, MoveStack*, Color us); - template + template MoveStack* generate_pawn_moves(const Position&, MoveStack*, Bitboard, Square); - template + template inline MoveStack* generate_discovered_checks(const Position& pos, MoveStack* mlist, Square from) { - assert(Piece != QUEEN); + assert(Pt != QUEEN); - Bitboard b = pos.attacks_from(from) & pos.empty_squares(); - if (Piece == KING) + Bitboard b = pos.attacks_from(from) & pos.empty_squares(); + if (Pt == KING) { Square ksq = pos.king_square(opposite_color(pos.side_to_move())); b &= ~QueenPseudoAttacks[ksq]; @@ -67,31 +57,31 @@ namespace { return mlist; } - template + template inline MoveStack* generate_direct_checks(const Position& pos, MoveStack* mlist, Color us, Bitboard dc, Square ksq) { - assert(Piece != KING); + assert(Pt != KING); Bitboard checkSqs, b; Square from; - const Square* ptr = pos.piece_list_begin(us, Piece); + const Square* ptr = pos.piece_list_begin(us, Pt); if ((from = *ptr++) == SQ_NONE) return mlist; - checkSqs = pos.attacks_from(ksq) & pos.empty_squares(); + checkSqs = pos.attacks_from(ksq) & pos.empty_squares(); do { - if ( (Piece == QUEEN && !(QueenPseudoAttacks[from] & checkSqs)) - || (Piece == ROOK && !(RookPseudoAttacks[from] & checkSqs)) - || (Piece == BISHOP && !(BishopPseudoAttacks[from] & checkSqs))) + if ( (Pt == QUEEN && !(QueenPseudoAttacks[from] & checkSqs)) + || (Pt == ROOK && !(RookPseudoAttacks[from] & checkSqs)) + || (Pt == BISHOP && !(BishopPseudoAttacks[from] & checkSqs))) continue; if (dc && bit_is_set(dc, from)) continue; - b = pos.attacks_from(from) & checkSqs; + b = pos.attacks_from(from) & checkSqs; SERIALIZE_MOVES(b); } while ((from = *ptr++) != SQ_NONE); @@ -106,28 +96,28 @@ namespace { : generate_pawn_moves(p, m, dc, ksq)); } - template + template FORCE_INLINE MoveStack* generate_piece_moves(const Position& p, MoveStack* m, Color us, Bitboard t) { - assert(Piece == PAWN); + assert(Pt == PAWN); assert(Type == MV_CAPTURE || Type == MV_NON_CAPTURE || Type == MV_EVASION); return (us == WHITE ? generate_pawn_moves(p, m, t, SQ_NONE) : generate_pawn_moves(p, m, t, SQ_NONE)); } - template + template FORCE_INLINE MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) { Bitboard b; Square from; - const Square* ptr = pos.piece_list_begin(us, Piece); + const Square* ptr = pos.piece_list_begin(us, Pt); if (*ptr != SQ_NONE) { do { from = *ptr; - b = pos.attacks_from(from) & target; + b = pos.attacks_from(from) & target; SERIALIZE_MOVES(b); } while (*++ptr != SQ_NONE); } @@ -147,10 +137,6 @@ namespace { } -//// -//// Functions -//// - /// generate generates all pseudo-legal captures and queen /// promotions. Returns a pointer to the end of the move list. @@ -165,7 +151,7 @@ template MoveStack* generate(const Position& pos, MoveStack* mlist) { assert(pos.is_ok()); - assert(!pos.is_check()); + assert(!pos.in_check()); Color us = pos.side_to_move(); Bitboard target; @@ -204,7 +190,7 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { return mlist; } -// Explicit template instantiation +// 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); @@ -216,14 +202,14 @@ template<> MoveStack* generate(const Position& pos, MoveStack* mlist) { assert(pos.is_ok()); - assert(!pos.is_check()); + assert(!pos.in_check()); Bitboard b, dc; Square from; Color us = pos.side_to_move(); Square ksq = pos.king_square(opposite_color(us)); - assert(pos.piece_on(ksq) == piece_of_color_and_type(opposite_color(us), KING)); + assert(pos.piece_on(ksq) == make_piece(opposite_color(us), KING)); // Discovered non-capture checks b = dc = pos.discovered_check_candidates(us); @@ -257,7 +243,7 @@ template<> MoveStack* generate(const Position& pos, MoveStack* mlist) { assert(pos.is_ok()); - assert(pos.is_check()); + assert(pos.in_check()); Bitboard b, target; Square from, checksq; @@ -267,7 +253,7 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { Bitboard checkers = pos.checkers(); Bitboard sliderAttacks = EmptyBoardBB; - assert(pos.piece_on(ksq) == piece_of_color_and_type(us, KING)); + assert(pos.piece_on(ksq) == make_piece(us, KING)); assert(checkers); // Find squares attacked by slider checkers, we will remove @@ -321,11 +307,11 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { /// generate computes a complete list of legal /// or pseudo-legal moves in the current position. template<> -inline MoveStack* generate(const Position& pos, MoveStack* mlist) { +MoveStack* generate(const Position& pos, MoveStack* mlist) { assert(pos.is_ok()); - return pos.is_check() ? generate(pos, mlist) + return pos.in_check() ? generate(pos, mlist) : generate(pos, mlist); } @@ -341,128 +327,18 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { // Remove illegal moves from the list while (cur != last) - if (pos.pl_move_is_legal(cur->move, pinned)) - cur++; - else + if (!pos.pl_move_is_legal(cur->move, pinned)) cur->move = (--last)->move; + else + cur++; return last; } -/// move_is_legal() takes a position and a (not necessarily pseudo-legal) -/// move and tests whether the move is legal. This version is not very fast -/// and should be used only in non time-critical paths. - -bool move_is_legal(const Position& pos, const Move m) { - - MoveStack mlist[MOVES_MAX]; - MoveStack *cur, *last = generate(pos, mlist); - - for (cur = mlist; cur != last; cur++) - if (cur->move == m) - return pos.pl_move_is_legal(m, pos.pinned_pieces(pos.side_to_move())); - - return false; -} - - -/// Fast version of move_is_legal() that takes a position a move and a -/// bitboard of pinned pieces as input, and tests whether the move is legal. - -bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { - - assert(pos.is_ok()); - assert(pinned == pos.pinned_pieces(pos.side_to_move())); - - Color us = pos.side_to_move(); - Color them = opposite_color(us); - Square from = move_from(m); - Square to = move_to(m); - Piece pc = pos.piece_on(from); - - // Use a slower but simpler function for uncommon cases - if (move_is_special(m)) - return move_is_legal(pos, m); - - // If the from square is not occupied by a piece belonging to the side to - // move, the move is obviously not legal. - if (color_of_piece(pc) != us) - return false; - - // The destination square cannot be occupied by a friendly piece - if (pos.color_of_piece_on(to) == us) - return false; - - // Handle the special case of a pawn move - if (type_of_piece(pc) == PAWN) - { - // Move direction must be compatible with pawn color - int direction = to - from; - if ((us == WHITE) != (direction > 0)) - return false; - - // We have already handled promotion moves, so destination - // cannot be on the 8/1th rank. - if (square_rank(to) == RANK_8 || square_rank(to) == RANK_1) - return false; - - // Proceed according to the square delta between the origin and - // destination squares. - switch (direction) - { - case DELTA_NW: - case DELTA_NE: - case DELTA_SW: - case DELTA_SE: - // Capture. The destination square must be occupied by an enemy - // piece (en passant captures was handled earlier). - if (pos.color_of_piece_on(to) != them) - return false; - break; - - case DELTA_N: - case DELTA_S: - // Pawn push. The destination square must be empty. - if (!pos.square_is_empty(to)) - return false; - break; - - case DELTA_NN: - // Double white pawn push. The destination square must be on the fourth - // rank, and both the destination square and the square between the - // source and destination squares must be empty. - if ( square_rank(to) != RANK_4 - || !pos.square_is_empty(to) - || !pos.square_is_empty(from + DELTA_N)) - return false; - break; - - case DELTA_SS: - // Double black pawn push. The destination square must be on the fifth - // rank, and both the destination square and the square between the - // source and destination squares must be empty. - if ( square_rank(to) != RANK_5 - || !pos.square_is_empty(to) - || !pos.square_is_empty(from + DELTA_S)) - return false; - break; - - default: - return false; - } - } - else if (!bit_is_set(pos.attacks_from(pc, from), to)) - return false; - - // The move is pseudo-legal, check if it is also legal - return pos.is_check() ? pos.pl_move_is_evasion(m, pinned) : pos.pl_move_is_legal(m, pinned); -} - - namespace { - template + template inline Bitboard move_pawns(Bitboard p) { return Delta == DELTA_N ? p << 8 : Delta == DELTA_S ? p >> 8 : @@ -470,7 +346,7 @@ namespace { Delta == DELTA_NW ? p << 7 : Delta == DELTA_SW ? p >> 9 : p; } - template + template inline MoveStack* generate_pawn_captures(MoveStack* mlist, Bitboard pawns, Bitboard target) { const Bitboard TFileABB = (Delta == DELTA_NE || Delta == DELTA_SE ? FileABB : FileHBB); @@ -484,7 +360,7 @@ namespace { return mlist; } - template + template inline MoveStack* generate_promotions(const Position& pos, MoveStack* mlist, Bitboard pawnsOn7, Bitboard target) { const Bitboard TFileABB = (Delta == DELTA_NE || Delta == DELTA_SE ? FileABB : FileHBB); @@ -527,12 +403,12 @@ namespace { // Calculate 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 TRank7BB = (Us == WHITE ? Rank7BB : Rank2BB); - const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB); - const SquareDelta TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S); - const SquareDelta TDELTA_NE = (Us == WHITE ? DELTA_NE : DELTA_SE); - const SquareDelta TDELTA_NW = (Us == WHITE ? DELTA_NW : DELTA_SW); + const Color Them = (Us == WHITE ? BLACK : WHITE); + const Bitboard TRank7BB = (Us == WHITE ? Rank7BB : Rank2BB); + const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB); + const Square TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S); + const Square TDELTA_NE = (Us == WHITE ? DELTA_NE : DELTA_SE); + const Square TDELTA_NW = (Us == WHITE ? DELTA_NW : DELTA_SW); Square to; Bitboard b1, b2, dc1, dc2, pawnPushes, emptySquares; @@ -631,7 +507,7 @@ namespace { Color them = opposite_color(us); Square ksq = pos.king_square(us); - assert(pos.piece_on(ksq) == piece_of_color_and_type(us, KING)); + assert(pos.piece_on(ksq) == make_piece(us, KING)); 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); @@ -639,7 +515,7 @@ namespace { Square s; bool illegal = false; - assert(pos.piece_on(rsq) == piece_of_color_and_type(us, ROOK)); + assert(pos.piece_on(rsq) == make_piece(us, ROOK)); // It is a bit complicated to correctly handle Chess960 for (s = Min(ksq, s1); s <= Max(ksq, s1); s++) @@ -653,8 +529,8 @@ namespace { if ( Side == QUEEN_SIDE && square_file(rsq) == FILE_B - && ( pos.piece_on(relative_square(us, SQ_A1)) == piece_of_color_and_type(them, ROOK) - || pos.piece_on(relative_square(us, SQ_A1)) == piece_of_color_and_type(them, QUEEN))) + && ( pos.piece_on(relative_square(us, SQ_A1)) == make_piece(them, ROOK) + || pos.piece_on(relative_square(us, SQ_A1)) == make_piece(them, QUEEN))) illegal = true; if (!illegal)