X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovegen.cpp;h=390305726026b86e3c2a9df3852ec8fd7840cf0b;hb=c6630abe0d6f229af7d6ae788643a0e8fa1737f7;hp=bc56548da09f75fd27d4a9c8167f5de83bae100d;hpb=8365f8ac1ee7f62db18fca8498b3fdb1640674d9;p=stockfish diff --git a/src/movegen.cpp b/src/movegen.cpp index bc56548d..39030572 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -166,16 +166,17 @@ int generate_noncaptures(const Position& pos, MoveStack* mlist) { /// generate_checks() generates all pseudo-legal non-capturing, non-promoting /// checks. It returns the number of generated moves. -int generate_checks(const Position& pos, MoveStack* mlist, Bitboard dc) { +int generate_checks(const Position& pos, MoveStack* mlist) { assert(pos.is_ok()); assert(!pos.is_check()); Color us = pos.side_to_move(); Square ksq = pos.king_square(opposite_color(us)); + Bitboard dc = pos.discovered_check_candidates(us); MoveStack* mlist_start = mlist; - assert(pos.piece_on(ksq) == king_of_color(opposite_color(us))); + assert(pos.piece_on(ksq) == piece_of_color_and_type(opposite_color(us), KING)); // Pieces moves mlist = generate_piece_checks(pos, mlist, us, dc, ksq); @@ -204,7 +205,7 @@ int generate_checks(const Position& pos, MoveStack* mlist, Bitboard dc) { /// 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) { +int generate_evasions(const Position& pos, MoveStack* mlist) { assert(pos.is_ok()); assert(pos.is_check()); @@ -215,7 +216,7 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { Square ksq = pos.king_square(us); MoveStack* mlist_start = mlist; - assert(pos.piece_on(ksq) == king_of_color(us)); + assert(pos.piece_on(ksq) == piece_of_color_and_type(us, KING)); // The bitboard of occupied pieces without our king Bitboard b_noKing = pos.occupied_squares(); @@ -258,6 +259,7 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { if (!(checkers & (checkers - 1))) // Only one bit set? { Square checksq = first_1(checkers); + Bitboard pinned = pos.pinned_pieces(us); assert(pos.color_of_piece_on(checksq) == them); @@ -350,7 +352,7 @@ int generate_legal_moves(const Position& pos, MoveStack* mlist) { Bitboard pinned = pos.pinned_pieces(pos.side_to_move()); if (pos.is_check()) - return generate_evasions(pos, mlist, pinned); + return generate_evasions(pos, mlist); // Generate pseudo-legal moves int n = generate_captures(pos, mlist); @@ -358,7 +360,7 @@ int generate_legal_moves(const Position& pos, MoveStack* mlist) { // Remove illegal moves from the list for (int i = 0; i < n; i++) - if (!pos.pl_move_is_legal(mlist[i].move, pinned)) + if (!pos.pl_move_is_legal(mlist[i].move)) mlist[i--].move = mlist[--n].move; return n; @@ -371,17 +373,17 @@ int generate_legal_moves(const Position& pos, MoveStack* mlist) { /// returned. If not, the function returns false. This function must /// only be used when the side to move is not in check. -bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { +bool move_is_legal(const Position& pos, const Move m) { assert(pos.is_ok()); assert(!pos.is_check()); assert(move_is_ok(m)); - 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); Piece pc = pos.piece_on(from); + Bitboard pinned = pos.pinned_pieces(us); // If the from square is not occupied by a piece belonging to the side to // move, the move is obviously not legal. @@ -400,10 +402,10 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { return false; assert(pos.square_is_empty(to)); - assert(pos.piece_on(to - pawn_push(us)) == pawn_of_color(them)); + assert(pos.piece_on(to - pawn_push(us)) == piece_of_color_and_type(them, PAWN)); // The move is pseudo-legal, check if it is also legal - return pos.pl_move_is_legal(m, pinned); + return pos.pl_move_is_legal(m); } // Castling moves @@ -417,7 +419,7 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { assert(from == pos.king_square(us)); assert(to == pos.initial_kr_square(us)); - assert(pos.piece_on(to) == rook_of_color(us)); + assert(pos.piece_on(to) == piece_of_color_and_type(us, ROOK)); Square g1 = relative_square(us, SQ_G1); Square f1 = relative_square(us, SQ_F1); @@ -450,7 +452,7 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { assert(from == pos.king_square(us)); assert(to == pos.initial_qr_square(us)); - assert(pos.piece_on(to) == rook_of_color(us)); + assert(pos.piece_on(to) == piece_of_color_and_type(us, ROOK)); Square c1 = relative_square(us, SQ_C1); Square d1 = relative_square(us, SQ_D1); @@ -467,8 +469,8 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { illegal = true; if ( square_file(to) == FILE_B - && ( pos.piece_on(to + DELTA_W) == rook_of_color(them) - || pos.piece_on(to + DELTA_W) == queen_of_color(them))) + && ( pos.piece_on(to + DELTA_W) == piece_of_color_and_type(them, ROOK) + || pos.piece_on(to + DELTA_W) == piece_of_color_and_type(them, QUEEN))) illegal = true; return !illegal; @@ -535,12 +537,12 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) { return false; } // The move is pseudo-legal, check if it is also legal - return pos.pl_move_is_legal(m, pinned); + return pos.pl_move_is_legal(m); } // Luckly we can handle all the other pieces in one go - return ( pos.piece_attacks_square(from, to) - && pos.pl_move_is_legal(m, pinned) + return ( pos.piece_attacks_square(pos.piece_on(from), from, to) + && pos.pl_move_is_legal(m) && !move_promotion(m)); } @@ -866,7 +868,7 @@ namespace { Color them = opposite_color(us); Square ksq = pos.king_square(us); - assert(pos.piece_on(ksq) == king_of_color(us)); + assert(pos.piece_on(ksq) == piece_of_color_and_type(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); @@ -874,7 +876,7 @@ namespace { Square s; bool illegal = false; - assert(pos.piece_on(rsq) == rook_of_color(us)); + assert(pos.piece_on(rsq) == piece_of_color_and_type(us, ROOK)); // It is a bit complicated to correctly handle Chess960 for (s = Min(ksq, s1); s <= Max(ksq, s1); s++) @@ -888,8 +890,8 @@ namespace { if ( Side == QUEEN_SIDE && square_file(rsq) == FILE_B - && ( pos.piece_on(relative_square(us, SQ_A1)) == rook_of_color(them) - || pos.piece_on(relative_square(us, SQ_A1)) == queen_of_color(them))) + && ( 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))) illegal = true; if (!illegal)