X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=0b052e5bb105dd822e771c4ba3f098164ae84bd4;hp=d4024b1145a36de890f7f9040decf0819124bdcc;hb=9f28d8a854d05c6c6edcd6f8911b352477f82c91;hpb=20ed03fc0b7b3d81172766f2f3f49efa39e8bcad diff --git a/src/movegen.cpp b/src/movegen.cpp index d4024b11..0b052e5b 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -31,6 +31,9 @@ // hardcoded list name 'mlist' and from square 'from'. #define SERIALIZE_MOVES(b) while (b) (*mlist++).move = make_move(from, pop_1st_bit(&b)) +// 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 //// @@ -134,36 +137,33 @@ namespace { /// generate_captures generates() all pseudo-legal captures and queen /// promotions. The return value is the number of moves generated. -int generate_captures(const Position& pos, MoveStack* mlist) { +MoveStack* generate_captures(const Position& pos, MoveStack* mlist) { assert(pos.is_ok()); assert(!pos.is_check()); Color us = pos.side_to_move(); Bitboard target = pos.pieces_of_color(opposite_color(us)); - MoveStack* mlist_start = mlist; 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); - mlist = generate_piece_moves(pos, mlist, us, target); - return int(mlist - mlist_start); + return generate_piece_moves(pos, mlist, us, target); } /// generate_noncaptures() generates all pseudo-legal non-captures and /// underpromotions. The return value is the number of moves generated. -int generate_noncaptures(const Position& pos, MoveStack* mlist) { +MoveStack* generate_noncaptures(const Position& pos, MoveStack* mlist) { assert(pos.is_ok()); assert(!pos.is_check()); Color us = pos.side_to_move(); Bitboard target = pos.empty_squares(); - MoveStack* mlist_start = mlist; mlist = generate_piece_moves(pos, mlist, us); mlist = generate_piece_moves(pos, mlist, us, target); @@ -172,22 +172,20 @@ int generate_noncaptures(const Position& pos, MoveStack* mlist) { mlist = generate_piece_moves(pos, mlist, us, target); mlist = generate_piece_moves(pos, mlist, us, target); mlist = generate_castle_moves(pos, mlist); - mlist = generate_castle_moves(pos, mlist); - return int(mlist - mlist_start); + return generate_castle_moves(pos, mlist); } /// generate_non_capture_checks() generates all pseudo-legal non-capturing, /// non-promoting checks. It returns the number of generated moves. -int generate_non_capture_checks(const Position& pos, MoveStack* mlist, Bitboard dc) { +MoveStack* generate_non_capture_checks(const Position& pos, MoveStack* mlist, Bitboard dc) { assert(pos.is_ok()); assert(!pos.is_check()); Color us = pos.side_to_move(); Square ksq = pos.king_square(opposite_color(us)); - MoveStack* mlist_start = mlist; assert(pos.piece_on(ksq) == piece_of_color_and_type(opposite_color(us), KING)); @@ -210,7 +208,7 @@ int generate_non_capture_checks(const Position& pos, MoveStack* mlist, Bitboard && castling_is_check(pos, KING_SIDE)) mlist = generate_castle_moves(pos, mlist); - return int(mlist - mlist_start); + return mlist; } @@ -218,7 +216,7 @@ int generate_non_capture_checks(const Position& pos, MoveStack* mlist, Bitboard /// in check. Unlike the other move generation functions, this one generates /// only legal moves. It returns the number of generated moves. -int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { +MoveStack* generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { assert(pos.is_ok()); assert(pos.is_check()); @@ -227,7 +225,6 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { Color us = pos.side_to_move(); Color them = opposite_color(us); Square ksq = pos.king_square(us); - MoveStack* mlist_start = mlist; assert(pos.piece_on(ksq) == piece_of_color_and_type(us, KING)); @@ -241,14 +238,14 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { // and to be able to use square_is_attacked(). Bitboard checkers = pos.checkers(); Bitboard checkersAttacks = EmptyBoardBB; - Bitboard b = checkers & (pos.queens() | pos.bishops()); + Bitboard b = checkers & pos.pieces(BISHOP, QUEEN); while (b) { from = pop_1st_bit(&b); checkersAttacks |= bishop_attacks_bb(from, b_noKing); } - b = checkers & (pos.queens() | pos.rooks()); + b = checkers & pos.pieces(ROOK, QUEEN); while (b) { from = pop_1st_bit(&b); @@ -278,7 +275,7 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { // Generate captures of the checking piece // Pawn captures - b1 = pos.pawn_attacks(them, checksq) & pos.pawns(us) & ~pinned; + b1 = pos.pawn_attacks(them, checksq) & pos.pieces(PAWN, us) & ~pinned; while (b1) { from = pop_1st_bit(&b1); @@ -293,9 +290,9 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { } // Pieces captures - b1 = ( (pos.piece_attacks(checksq) & pos.knights(us)) - | (pos.piece_attacks(checksq) & pos.bishops_and_queens(us)) - | (pos.piece_attacks(checksq) & pos.rooks_and_queens(us)) ) & ~pinned; + b1 = ( (pos.piece_attacks(checksq) & pos.pieces(KNIGHT, us)) + | (pos.piece_attacks(checksq) & pos.pieces(BISHOP, QUEEN, us)) + | (pos.piece_attacks(checksq) & pos.pieces(ROOK, QUEEN, us)) ) & ~pinned; while (b1) { @@ -305,7 +302,7 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { // Blocking check evasions are possible only if the checking piece is // a slider. - if (checkers & pos.sliders()) + if (checkers & (pos.pieces(BISHOP) | pos.pieces(ROOK) | pos.pieces(QUEEN))) { Bitboard blockSquares = squares_between(checksq, ksq); @@ -326,10 +323,10 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { // check. If pos.ep_square() is set, the last move made must have been // a double pawn push. If, furthermore, the checking piece is a pawn, // an en passant check evasion may be possible. - if (pos.ep_square() != SQ_NONE && (checkers & pos.pawns(them))) + if (pos.ep_square() != SQ_NONE && (checkers & pos.pieces(PAWN, them))) { to = pos.ep_square(); - b1 = pos.pawn_attacks(them, to) & pos.pawns(us); + b1 = pos.pawn_attacks(them, to) & pos.pieces(PAWN, us); // The checking pawn cannot be a discovered (bishop) check candidate // otherwise we were in check also before last double push move. @@ -347,7 +344,7 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { } } } - return int(mlist - mlist_start); + return mlist; } @@ -357,7 +354,7 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { /// very hard to write an efficient legal move generator, but for the moment /// we don't need it. -int generate_legal_moves(const Position& pos, MoveStack* mlist) { +MoveStack* generate_legal_moves(const Position& pos, MoveStack* mlist) { assert(pos.is_ok()); @@ -367,15 +364,17 @@ int generate_legal_moves(const Position& pos, MoveStack* mlist) { return generate_evasions(pos, mlist, pinned); // Generate pseudo-legal moves - int n = generate_captures(pos, mlist); - n += generate_noncaptures(pos, mlist + n); + MoveStack* last = generate_captures(pos, mlist); + last = generate_noncaptures(pos, last); // Remove illegal moves from the list - for (int i = 0; i < n; i++) - if (!pos.pl_move_is_legal(mlist[i].move, pinned)) - mlist[i--].move = mlist[--n].move; - - return n; + for (MoveStack* cur = mlist; cur != last; cur++) + if (!pos.pl_move_is_legal(cur->move, pinned)) + { + cur->move = (--last)->move; + cur--; + } + return last; } @@ -564,6 +563,30 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { } +/// Another version of move_is_legal(), which takes only a position and a move +/// as input. This function does not require that the side to move is not in +/// check. It is not optimized for speed, and is only used for verifying move +/// legality when building a PV from the transposition table. + +bool move_is_legal(const Position& pos, const Move m) { + + Bitboard pinned = pos.pinned_pieces(pos.side_to_move()); + if (!pos.is_check()) + return move_is_legal(pos, m, pinned); + else + { + Position p(pos); + MoveStack mlist[64]; + MoveStack* last = generate_evasions(p, mlist, pinned); + for (MoveStack* cur = mlist; cur != last; cur++) + if (cur->move == m) + return true; + + return false; + } +} + + namespace { template @@ -638,11 +661,7 @@ namespace { } // Capturing non-promotions - while (b1) - { - to = pop_1st_bit(&b1); - (*mlist++).move = make_move(to - TTDELTA_NE, to); - } + SERIALIZE_MOVES_D(b1, -TTDELTA_NE); return mlist; } @@ -656,7 +675,7 @@ namespace { const SquareDelta TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S); Square to; - Bitboard pawns = pos.pawns(Us); + Bitboard pawns = pos.pieces(PAWN, Us); Bitboard enemyPieces = pos.pieces_of_color(opposite_color(Us)); bool possiblePromotion = (pawns & TRank7BB); @@ -706,7 +725,7 @@ namespace { Bitboard b1, b2; Square to; - Bitboard pawns = pos.pawns(Us); + Bitboard pawns = pos.pieces(PAWN, Us); Bitboard emptySquares = pos.empty_squares(); if (pawns & TRank7BB) // There is some promotion candidate ? @@ -746,19 +765,11 @@ namespace { // Single pawn pushes b2 = b1 = move_pawns(pawns) & emptySquares & ~TRank8BB; - while (b2) - { - to = pop_1st_bit(&b2); - (*mlist++).move = make_move(to - TDELTA_N, to); - } + SERIALIZE_MOVES_D(b2, -TDELTA_N); // Double pawn pushes b2 = move_pawns(b1 & TRank3BB) & emptySquares; - while (b2) - { - to = pop_1st_bit(&b2); - (*mlist++).move = make_move(to - TDELTA_N - TDELTA_N, to); - } + SERIALIZE_MOVES_D(b2, -TDELTA_N -TDELTA_N); return mlist; } @@ -773,8 +784,9 @@ namespace { const SquareDelta TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S); const SquareDelta TDELTA_S = (Us == WHITE ? DELTA_S : DELTA_N); + Square to; Bitboard b1, b2, b3; - Bitboard pawns = pos.pawns(Us); + Bitboard pawns = pos.pieces(PAWN, Us); if (dc & pawns) { @@ -787,19 +799,11 @@ namespace { // Discovered checks, single pawn pushes, no promotions b2 = b3 = move_pawns(b1 & dc) & empty & ~TRank8BB; - while (b3) - { - Square to = pop_1st_bit(&b3); - (*mlist++).move = make_move(to - TDELTA_N, to); - } + SERIALIZE_MOVES_D(b3, -TDELTA_N); // Discovered checks, double pawn pushes b3 = move_pawns(b2 & TRank3BB) & empty; - while (b3) - { - Square to = pop_1st_bit(&b3); - (*mlist++).move = make_move(to - TDELTA_N - TDELTA_N, to); - } + SERIALIZE_MOVES_D(b3, -TDELTA_N -TDELTA_N); } // Direct checks. These are possible only for pawns on neighboring files @@ -816,19 +820,11 @@ namespace { Bitboard empty = pos.empty_squares(); b2 = move_pawns(b1) & empty; b3 = b2 & pos.pawn_attacks(Them, ksq); - while (b3) - { - Square to = pop_1st_bit(&b3); - (*mlist++).move = make_move(to - TDELTA_N, to); - } + SERIALIZE_MOVES_D(b3, -TDELTA_N); // Direct checks, double pawn pushes b3 = move_pawns(b2 & TRank3BB) & empty & pos.pawn_attacks(Them, ksq); - while (b3) - { - Square to = pop_1st_bit(&b3); - (*mlist++).move = make_move(to - TDELTA_N - TDELTA_N, to); - } + SERIALIZE_MOVES_D(b3, -TDELTA_N -TDELTA_N); return mlist; } @@ -836,7 +832,7 @@ namespace { MoveStack* generate_piece_checks(const Position& pos, MoveStack* mlist, Color us, Bitboard dc, Square ksq) { - Bitboard target = pos.pieces_of_color_and_type(us, Piece); + Bitboard target = pos.pieces(Piece, us); // Discovered checks Bitboard b = target & dc; @@ -885,7 +881,7 @@ namespace { Square to; // Find non-pinned pawns and push them one square - Bitboard b1 = move_pawns(pos.pawns(Us) & ~pinned); + Bitboard b1 = move_pawns(pos.pieces(PAWN, Us) & ~pinned); // We don't have to AND with empty squares here, // because the blocking squares will always be empty.