X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fposition.cpp;h=d18cf2f88fcf9421cbecb42eb7601c6e67623594;hb=fc3ea7365ad95ec1da05ac559e4e659cf8a7f0f9;hp=2cc384a31e8267a525250e9f69738314c38f0e82;hpb=96eefc4af65204cd2ddad64ac53b8d449f49efa5;p=stockfish diff --git a/src/position.cpp b/src/position.cpp index 2cc384a3..d18cf2f8 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -242,14 +242,27 @@ void Position::from_fen(const string& fenStr, bool isChess960) { /// Position::set_castle_right() is an helper function used to set castling /// rights given the corresponding color and the rook starting square. -void Position::set_castle_right(Color c, Square rsq) { +void Position::set_castle_right(Color c, Square rfrom) { - int f = (rsq < king_square(c) ? WHITE_OOO : WHITE_OO) << c; + Square kfrom = king_square(c); + bool kingSide = kfrom < rfrom; + int cr = (kingSide ? WHITE_OO : WHITE_OOO) << c; - st->castleRights |= f; - castleRightsMask[king_square(c)] |= f; - castleRightsMask[rsq] |= f; - castleRookSquare[f] = rsq; + st->castleRights |= cr; + castleRightsMask[kfrom] |= cr; + castleRightsMask[rfrom] |= cr; + castleRookSquare[cr] = rfrom; + + Square kto = relative_square(c, kingSide ? SQ_G1 : SQ_C1); + Square rto = relative_square(c, kingSide ? SQ_F1 : SQ_D1); + + for (Square s = std::min(rfrom, rto); s <= std::max(rfrom, rto); s++) + if (s != kfrom && s != rfrom) + castlePath[cr] |= s; + + for (Square s = std::min(kfrom, kto); s <= std::max(kfrom, kto); s++) + if (s != kfrom && s != rfrom) + castlePath[cr] |= s; } @@ -364,10 +377,9 @@ Bitboard Position::hidden_checkers() const { while (pinners) { - b = squares_between(ksq, pop_1st_bit(&pinners)) & occupied_squares(); + b = squares_between(ksq, pop_1st_bit(&pinners)) & pieces(); - // Only one bit set and is an our piece? - if (b && !(b & (b - 1)) && (b & pieces(sideToMove))) + if (b && single_bit(b) && (b & pieces(sideToMove))) result |= b; } return result; @@ -425,7 +437,7 @@ bool Position::move_attacks_square(Move m, Square s) const { assert(!square_is_empty(from)); // Update occupancy as if the piece is moving - occ = occupied_squares() ^ from ^ to; + occ = pieces() ^ from ^ to; // The piece moved in 'to' attacks the square 's' ? if (attacks_from(piece, to, occ) & s) @@ -462,7 +474,7 @@ bool Position::pl_move_is_legal(Move m, Bitboard pinned) const { Square to = to_sq(m); Square capsq = to + pawn_push(them); Square ksq = king_square(us); - Bitboard b = (occupied_squares() ^ from ^ capsq) | to; + Bitboard b = (pieces() ^ from ^ capsq) | to; assert(to == ep_square()); assert(piece_moved(m) == make_piece(us, PAWN)); @@ -518,7 +530,7 @@ bool Position::is_pseudo_legal(const Move m) const { return move_is_legal(m); // Is not a promotion, so promotion piece must be empty - if (promotion_piece_type(m) - 2 != NO_PIECE_TYPE) + if (promotion_type(m) - 2 != NO_PIECE_TYPE) return false; // If the from square is not occupied by a piece belonging to the side to @@ -614,7 +626,7 @@ bool Position::is_pseudo_legal(const Move m) const { } // In case of king moves under check we have to remove king so to catch // as invalid moves like b1a1 when opposite queen is on c1. - else if (attackers_to(to, occupied_squares() ^ from) & pieces(~us)) + else if (attackers_to(to, pieces() ^ from) & pieces(~us)) return false; } @@ -656,7 +668,7 @@ bool Position::move_gives_check(Move m, const CheckInfo& ci) const { // Promotion with check ? if (is_promotion(m)) - return attacks_from(Piece(promotion_piece_type(m)), to, occupied_squares() ^ from) & ksq; + return attacks_from(Piece(promotion_type(m)), to, pieces() ^ from) & ksq; // En passant capture with check ? We have already handled the case // of direct checks and ordinary discovered check, the only case we @@ -665,7 +677,7 @@ bool Position::move_gives_check(Move m, const CheckInfo& ci) const { if (is_enpassant(m)) { Square capsq = make_square(file_of(to), rank_of(from)); - Bitboard b = (occupied_squares() ^ from ^ capsq) | to; + Bitboard b = (pieces() ^ from ^ capsq) | to; return (attacks_bb< ROOK>(ksq, b) & pieces( ROOK, QUEEN, us)) | (attacks_bb(ksq, b) & pieces(BISHOP, QUEEN, us)); @@ -678,7 +690,7 @@ bool Position::move_gives_check(Move m, const CheckInfo& ci) const { Square rfrom = to; // 'King captures the rook' notation Square kto = relative_square(us, rfrom > kfrom ? SQ_G1 : SQ_C1); Square rto = relative_square(us, rfrom > kfrom ? SQ_F1 : SQ_D1); - Bitboard b = (occupied_squares() ^ kfrom ^ rfrom) | rto | kto; + Bitboard b = (pieces() ^ kfrom ^ rfrom) | rto | kto; return attacks_bb(rto, b) & ksq; } @@ -850,7 +862,7 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI if (is_promotion(m)) { - PieceType promotion = promotion_piece_type(m); + PieceType promotion = promotion_type(m); assert(relative_rank(us, to) == RANK_8); assert(promotion >= KNIGHT && promotion <= QUEEN); @@ -965,7 +977,7 @@ void Position::undo_move(Move m) { if (is_promotion(m)) { - PieceType promotion = promotion_piece_type(m); + PieceType promotion = promotion_type(m); assert(promotion == pt); assert(relative_rank(us, to) == RANK_8); @@ -1223,7 +1235,7 @@ int Position::see(Move m) const { from = from_sq(m); to = to_sq(m); capturedType = type_of(piece_on(to)); - occ = occupied_squares(); + occ = pieces(); // Handle en passant moves if (is_enpassant(m)) @@ -1507,7 +1519,7 @@ void Position::init() { Bitboard b = cr; while (b) { - Key k = zobCastle[1 << pop_1st_bit(&b)]; + Key k = zobCastle[1ULL << pop_1st_bit(&b)]; zobCastle[cr] ^= k ? k : rk.rand(); } } @@ -1655,7 +1667,7 @@ bool Position::pos_is_ok(int* failedStep) const { // The union of the white and black pieces must be equal to all // occupied squares - if ((pieces(WHITE) | pieces(BLACK)) != occupied_squares()) + if ((pieces(WHITE) | pieces(BLACK)) != pieces()) return false; // Separate piece type bitboards must have empty intersections