X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.cpp;h=65964b827a889880ca1d8322e7c339d0b81494bc;hp=7725b934e1eb34824789ae7cbdeaf54078ab53fb;hb=7c84b39a42bfcada7e9eafd745a9616aaa8f9c1c;hpb=55f9afee2a079b2dd0b1aeda41082c58eb317ca3 diff --git a/src/position.cpp b/src/position.cpp index 7725b934..65964b82 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -207,7 +207,6 @@ void Position::from_fen(const std::string& fen) { castleRightsMask[make_square(initialQRFile, RANK_8)] ^= BLACK_OOO; find_checkers(); - find_pinned(); st->key = compute_key(); st->pawnKey = compute_pawn_key(); @@ -321,48 +320,40 @@ void Position::copy(const Position &pos) { } -/// Position:hidden_checks<>() returns a bitboard of all pinned (against the +/// Position:hidden_checkers<>() returns a bitboard of all pinned (against the /// king) pieces for the given color and for the given pinner type. Or, when -/// template parameter FindPinned is false, the pinned pieces of opposite color -/// that are, indeed, the pieces candidate for a discovery check. +/// template parameter FindPinned is false, the pieces of the given color +/// candidate for a discovery check against the enemy king. /// Note that checkersBB bitboard must be already updated. -template -Bitboard Position::hidden_checks(Color c, Square ksq, Bitboard& pinners) const { - Square s; - Bitboard sliders, result = EmptyBoardBB; +template +Bitboard Position::hidden_checkers(Color c) const { - if (Piece == ROOK) // Resolved at compile time - sliders = rooks_and_queens(FindPinned ? opposite_color(c) : c) & RookPseudoAttacks[ksq]; - else - sliders = bishops_and_queens(FindPinned ? opposite_color(c) : c) & BishopPseudoAttacks[ksq]; + Bitboard pinners, result = EmptyBoardBB; + + // Pinned pieces protect our king, dicovery checks attack + // the enemy king. + Square ksq = king_square(FindPinned ? c : opposite_color(c)); + + // Pinners are sliders, not checkers, that give check when + // candidate pinned is removed. + pinners = (rooks_and_queens(FindPinned ? opposite_color(c) : c) & RookPseudoAttacks[ksq]) + | (bishops_and_queens(FindPinned ? opposite_color(c) : c) & BishopPseudoAttacks[ksq]); + + if (FindPinned && pinners) + pinners &= ~st->checkersBB; - if (sliders && (!FindPinned || (sliders & ~st->checkersBB))) + while (pinners) { - // King blockers are candidate pinned pieces - Bitboard candidate_pinned = piece_attacks(ksq) & pieces_of_color(c); - - // Pinners are sliders, not checkers, that give check when - // candidate pinned are removed. - pinners = (FindPinned ? sliders & ~st->checkersBB : sliders); - - if (Piece == ROOK) - pinners &= rook_attacks_bb(ksq, occupied_squares() ^ candidate_pinned); - else - pinners &= bishop_attacks_bb(ksq, occupied_squares() ^ candidate_pinned); - - // Finally for each pinner find the corresponding pinned piece (if same color of king) - // or discovery checker (if opposite color) among the candidates. - Bitboard p = pinners; - while (p) - { - s = pop_1st_bit(&p); - result |= (squares_between(s, ksq) & candidate_pinned); - } - } - else - pinners = EmptyBoardBB; + Square s = pop_1st_bit(&pinners); + Bitboard b = squares_between(s, ksq) & occupied_squares(); + + assert(b); + if ( !(b & (b - 1)) // Only one bit set? + && (b & pieces_of_color(c))) // Is an our piece? + result |= b; + } return result; } @@ -447,31 +438,18 @@ void Position::find_checkers() { } -/// Position:find_pinned() computes the pinned, pinners and dcCandidates -/// bitboards for both colors. Bitboard checkersBB must be already updated. - -void Position::find_pinned() { +/// Position::pl_move_is_legal() tests whether a pseudo-legal move is legal - Bitboard p1, p2; - Square ksq; +bool Position::pl_move_is_legal(Move m) const { - for (Color c = WHITE; c <= BLACK; c++) - { - ksq = king_square(c); - st->pinned[c] = hidden_checks(c, ksq, p1) | hidden_checks(c, ksq, p2); - st->pinners[c] = p1 | p2; - ksq = king_square(opposite_color(c)); - st->dcCandidates[c] = hidden_checks(c, ksq, p1) | hidden_checks(c, ksq, p2); - } + return pl_move_is_legal(m, pinned_pieces(side_to_move())); } - -/// Position::pl_move_is_legal() tests whether a pseudo-legal move is legal - -bool Position::pl_move_is_legal(Move m) const { +bool Position::pl_move_is_legal(Move m, Bitboard pinned) const { assert(is_ok()); assert(move_is_ok(m)); + assert(pinned == pinned_pieces(side_to_move())); // If we're in check, all pseudo-legal moves are legal, because our // check evasion generator only generates true legal moves. @@ -519,7 +497,7 @@ bool Position::pl_move_is_legal(Move m) const { // A non-king move is legal if and only if it is not pinned or it // is moving along the ray towards or away from the king. - return ( !bit_is_set(pinned_pieces(us), from) + return ( !bit_is_set(pinned, from) || (direction_between_squares(from, ksq) == direction_between_squares(move_to(m), ksq))); } @@ -528,15 +506,21 @@ bool Position::pl_move_is_legal(Move m) const { bool Position::move_is_check(Move m) const { + Bitboard dc = discovered_check_candidates(side_to_move()); + return move_is_check(m, dc); +} + +bool Position::move_is_check(Move m, Bitboard dcCandidates) const { + assert(is_ok()); assert(move_is_ok(m)); + assert(dcCandidates == discovered_check_candidates(side_to_move())); Color us = side_to_move(); Color them = opposite_color(us); Square from = move_from(m); Square to = move_to(m); Square ksq = king_square(them); - Bitboard dcCandidates = discovered_check_candidates(us); assert(color_of_piece_on(from) == us); assert(piece_on(ksq) == piece_of_color_and_type(them, KING)); @@ -657,13 +641,25 @@ bool Position::move_is_capture(Move m) const { } -/// Position::update_checkers() is a private method to udpate chekers info +/// Position::update_checkers() udpates chekers info given the move. It is called +/// in do_move() and is faster then find_checkers(). template inline void Position::update_checkers(Bitboard* pCheckersBB, Square ksq, Square from, Square to, Bitboard dcCandidates) { - if (Piece != KING && bit_is_set(piece_attacks(ksq), to)) + const bool Bishop = (Piece == QUEEN || Piece == BISHOP); + const bool Rook = (Piece == QUEEN || Piece == ROOK); + const bool Slider = Bishop || Rook; + + if ( ( (Bishop && bit_is_set(BishopPseudoAttacks[ksq], to)) + || (Rook && bit_is_set(RookPseudoAttacks[ksq], to))) + && bit_is_set(piece_attacks(ksq), to)) // slow, try to early skip + set_bit(pCheckersBB, to); + + else if ( Piece != KING + && !Slider + && bit_is_set(piece_attacks(ksq), to)) set_bit(pCheckersBB, to); if (Piece != QUEEN && bit_is_set(dcCandidates, from)) @@ -677,42 +673,33 @@ inline void Position::update_checkers(Bitboard* pCheckersBB, Square ksq, Square } -/// Position::init_new_state() copies from the current state the fields -/// that will be updated incrementally, skips the fields, like bitboards -/// that will be recalculated form scratch anyway. - -void Position::init_new_state(StateInfo& newSt) { - - newSt.key = st->key; - newSt.pawnKey = st->pawnKey; - newSt.materialKey = st->materialKey; - newSt.castleRights = st->castleRights; - newSt.rule50 = st->rule50; - newSt.epSquare = st->epSquare; - newSt.mgValue = st->mgValue; - newSt.egValue = st->egValue; - newSt.capture = NO_PIECE_TYPE; - newSt.previous = st; -} - - /// Position::do_move() makes a move, and saves all information necessary /// to a StateInfo object. The move is assumed to be legal. /// Pseudo-legal moves should be filtered out before this function is called. void Position::do_move(Move m, StateInfo& newSt) { + do_move(m, newSt, discovered_check_candidates(side_to_move())); +} + +void Position::do_move(Move m, StateInfo& newSt, Bitboard dcCandidates) { + assert(is_ok()); assert(move_is_ok(m)); - // Get now the current (before to move) dc candidates that we will use - // in update_checkers(). - Bitboard oldDcCandidates = discovered_check_candidates(side_to_move()); + // Copy some fields of old state to our new StateInfo object except the + // ones which are recalculated from scratch anyway, then switch our state + // pointer to point to the new, ready to be updated, state. + struct ReducedStateInfo { + Key key, pawnKey, materialKey; + int castleRights, rule50; + Square epSquare; + Value mgValue, egValue; + }; - // Copy some fields of old state to our new StateInfo object (except the - // captured piece, which is taken care of later) and switch state pointer - // to point to the new, ready to be updated, state. - init_new_state(newSt); + memcpy(&newSt, st, sizeof(ReducedStateInfo)); + newSt.capture = NO_PIECE_TYPE; + newSt.previous = st; st = &newSt; // Save the current key to the history[] array, in order to be able to @@ -812,18 +799,17 @@ void Position::do_move(Move m, StateInfo& newSt) { Square ksq = king_square(them); switch (piece) { - case PAWN: update_checkers(&st->checkersBB, ksq, from, to, oldDcCandidates); break; - case KNIGHT: update_checkers(&st->checkersBB, ksq, from, to, oldDcCandidates); break; - case BISHOP: update_checkers(&st->checkersBB, ksq, from, to, oldDcCandidates); break; - case ROOK: update_checkers(&st->checkersBB, ksq, from, to, oldDcCandidates); break; - case QUEEN: update_checkers(&st->checkersBB, ksq, from, to, oldDcCandidates); break; - case KING: update_checkers(&st->checkersBB, ksq, from, to, oldDcCandidates); break; + case PAWN: update_checkers(&(st->checkersBB), ksq, from, to, dcCandidates); break; + case KNIGHT: update_checkers(&(st->checkersBB), ksq, from, to, dcCandidates); break; + case BISHOP: update_checkers(&(st->checkersBB), ksq, from, to, dcCandidates); break; + case ROOK: update_checkers(&(st->checkersBB), ksq, from, to, dcCandidates); break; + case QUEEN: update_checkers(&(st->checkersBB), ksq, from, to, dcCandidates); break; + case KING: update_checkers(&(st->checkersBB), ksq, from, to, dcCandidates); break; default: assert(false); break; } } // Finish - find_pinned(); st->key ^= zobSideToMove; sideToMove = opposite_color(sideToMove); gamePly++; @@ -1528,11 +1514,6 @@ int Position::see(Square from, Square to) const { Color us = (from != SQ_NONE ? color_of_piece_on(from) : opposite_color(color_of_piece_on(to))); Color them = opposite_color(us); - // Initialize pinned and pinners bitboards - Bitboard pinned[2], pinners[2]; - pinned[us] = pinned_pieces(us, pinners[us]); - pinned[them] = pinned_pieces(them, pinners[them]); - // Initialize pieces Piece piece = piece_on(from); Piece capture = piece_on(to); @@ -1565,17 +1546,6 @@ int Position::see(Square from, Square to) const { | (pawn_attacks(WHITE, to) & pawns(BLACK)) | (pawn_attacks(BLACK, to) & pawns(WHITE)); - // Remove our pinned pieces from attacks if the captured piece is not - // a pinner, otherwise we could remove a valid "capture the pinner" attack. - if (pinned[us] != EmptyBoardBB && !bit_is_set(pinners[us], to)) - attackers &= ~pinned[us]; - - // Remove opponent pinned pieces from attacks if the moving piece is not - // a pinner, otherwise we could remove a piece that is no more pinned - // due to our pinner piece is moving away. - if (pinned[them] != EmptyBoardBB && !bit_is_set(pinners[them], from)) - attackers &= ~pinned[them]; - if (from != SQ_NONE) break; @@ -1638,12 +1608,6 @@ int Position::see(Square from, Square to) const { lastCapturingPieceValue = seeValues[pt]; c = opposite_color(c); - // Remove pinned pieces from attackers - if ( pinned[c] != EmptyBoardBB - && !bit_is_set(pinners[c], to) - && !(pinners[c] & attackers)) - attackers &= ~pinned[c]; - // Stop after a king capture if (pt == KING && (attackers & pieces_of_color(c))) {