X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.cpp;h=1725acbb4bc76ef68cb91249b76e0d9fa9beec98;hp=462088e09c9dee5fc634f0d92fa38a2d5e306876;hb=46141b078cd9df291ad21dbf9b420cb92e9c44ed;hpb=6709b01903b9122cf619e8469a0bea96097447e7 diff --git a/src/position.cpp b/src/position.cpp index 462088e0..1725acbb 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -379,36 +379,35 @@ Bitboard Position::discovered_check_candidates(Color c) const { return hidden_checkers(c); } -/// Position::attacks_to() computes a bitboard containing all pieces which +/// Position::attackers_to() computes a bitboard containing all pieces which /// attacks a given square. -Bitboard Position::attacks_to(Square s) const { +Bitboard Position::attackers_to(Square s) const { - return (pawn_attacks(BLACK, s) & pieces(PAWN, WHITE)) - | (pawn_attacks(WHITE, s) & pieces(PAWN, BLACK)) - | (piece_attacks(s) & pieces(KNIGHT)) - | (piece_attacks(s) & pieces(ROOK, QUEEN)) - | (piece_attacks(s) & pieces(BISHOP, QUEEN)) - | (piece_attacks(s) & pieces(KING)); + return (attacks_from(s, BLACK) & pieces(PAWN, WHITE)) + | (attacks_from(s, WHITE) & pieces(PAWN, BLACK)) + | (attacks_from(s) & pieces(KNIGHT)) + | (attacks_from(s) & pieces(ROOK, QUEEN)) + | (attacks_from(s) & pieces(BISHOP, QUEEN)) + | (attacks_from(s) & pieces(KING)); } -/// Position::piece_attacks_square() tests whether the piece on square f -/// attacks square t. +/// Position::attacks_from() computes a bitboard of all attacks +/// of a given piece put in a given square. -bool Position::piece_attacks_square(Piece p, Square f, Square t) const { +Bitboard Position::attacks_from(Piece p, Square s) const { - assert(square_is_ok(f)); - assert(square_is_ok(t)); + assert(square_is_ok(s)); switch (p) { - case WP: return pawn_attacks_square(WHITE, f, t); - case BP: return pawn_attacks_square(BLACK, f, t); - case WN: case BN: return piece_attacks_square(f, t); - case WB: case BB: return piece_attacks_square(f, t); - case WR: case BR: return piece_attacks_square(f, t); - case WQ: case BQ: return piece_attacks_square(f, t); - case WK: case BK: return piece_attacks_square(f, t); + case WP: return attacks_from(s, WHITE); + case BP: return attacks_from(s, BLACK); + case WN: case BN: return attacks_from(s); + case WB: case BB: return attacks_from(s); + case WR: case BR: return attacks_from(s); + case WQ: case BQ: return attacks_from(s); + case WK: case BK: return attacks_from(s); default: break; } return false; @@ -427,7 +426,7 @@ bool Position::move_attacks_square(Move m, Square s) const { assert(square_is_occupied(f)); - if (piece_attacks_square(piece_on(f), t, s)) + if (bit_is_set(attacks_from(piece_on(f), t), s)) return true; // Move the piece and scan for X-ray attacks behind it @@ -440,20 +439,20 @@ bool Position::move_attacks_square(Move m, Square s) const { // If we have attacks we need to verify that are caused by our move // and are not already existent ones. - return xray && (xray ^ (xray & piece_attacks(s))); + return xray && (xray ^ (xray & attacks_from(s))); } /// Position::find_checkers() computes the checkersBB bitboard, which /// contains a nonzero bit for each checking piece (0, 1 or 2). It -/// currently works by calling Position::attacks_to, which is probably +/// currently works by calling Position::attackers_to, which is probably /// inefficient. Consider rewriting this function to use the last move /// played, like in non-bitboard versions of Glaurung. void Position::find_checkers() { Color us = side_to_move(); - st->checkersBB = attacks_to(king_square(us), opposite_color(us)); + st->checkersBB = attackers_to(king_square(us)) & pieces_of_color(opposite_color(us)); } @@ -510,7 +509,7 @@ bool Position::pl_move_is_legal(Move m, Bitboard pinned) const { // If the moving piece is a king, check whether the destination // square is attacked by the opponent. if (type_of_piece_on(from) == KING) - return !(square_is_attacked(move_to(m), opposite_color(us))); + return !(attackers_to(move_to(m)) & pieces_of_color(opposite_color(us))); // 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. @@ -548,7 +547,7 @@ bool Position::move_is_check(Move m, Bitboard dcCandidates) const { { case PAWN: - if (bit_is_set(pawn_attacks(them, ksq), to)) // Normal check? + if (bit_is_set(attacks_from(ksq, them), to)) // Normal check? return true; if ( dcCandidates // Discovered check? @@ -564,7 +563,7 @@ bool Position::move_is_check(Move m, Bitboard dcCandidates) const { switch (move_promotion_piece(m)) { case KNIGHT: - return bit_is_set(piece_attacks(to), ksq); + return bit_is_set(attacks_from(to), ksq); case BISHOP: return bit_is_set(bishop_attacks_bb(to, b), ksq); case ROOK: @@ -594,21 +593,21 @@ bool Position::move_is_check(Move m, Bitboard dcCandidates) const { // Test discovered check and normal check according to piece type case KNIGHT: return (dcCandidates && bit_is_set(dcCandidates, from)) - || bit_is_set(piece_attacks(ksq), to); + || bit_is_set(attacks_from(ksq), to); case BISHOP: return (dcCandidates && bit_is_set(dcCandidates, from)) - || (direction_is_diagonal(ksq, to) && bit_is_set(piece_attacks(ksq), to)); + || (direction_is_diagonal(ksq, to) && bit_is_set(attacks_from(ksq), to)); case ROOK: return (dcCandidates && bit_is_set(dcCandidates, from)) - || (direction_is_straight(ksq, to) && bit_is_set(piece_attacks(ksq), to)); + || (direction_is_straight(ksq, to) && bit_is_set(attacks_from(ksq), to)); case QUEEN: // Discovered checks are impossible! assert(!bit_is_set(dcCandidates, from)); - return ( (direction_is_straight(ksq, to) && bit_is_set(piece_attacks(ksq), to)) - || (direction_is_diagonal(ksq, to) && bit_is_set(piece_attacks(ksq), to))); + return ( (direction_is_straight(ksq, to) && bit_is_set(attacks_from(ksq), to)) + || (direction_is_diagonal(ksq, to) && bit_is_set(attacks_from(ksq), to))); case KING: // Discovered check? @@ -662,22 +661,23 @@ inline void Position::update_checkers(Bitboard* pCheckersBB, Square ksq, Square // Direct checks 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 + && bit_is_set(attacks_from(ksq), to)) // slow, try to early skip set_bit(pCheckersBB, to); else if ( Piece != KING && !Slider - && bit_is_set(Piece == PAWN ? pawn_attacks(opposite_color(sideToMove), ksq) : piece_attacks(ksq), to)) + && bit_is_set(Piece == PAWN ? attacks_from(ksq, opposite_color(sideToMove)) + : attacks_from(ksq), to)) set_bit(pCheckersBB, to); // Discovery checks if (Piece != QUEEN && bit_is_set(dcCandidates, from)) { if (Piece != ROOK) - (*pCheckersBB) |= (piece_attacks(ksq) & pieces(ROOK, QUEEN, side_to_move())); + (*pCheckersBB) |= (attacks_from(ksq) & pieces(ROOK, QUEEN, side_to_move())); if (Piece != BISHOP) - (*pCheckersBB) |= (piece_attacks(ksq) & pieces(BISHOP, QUEEN, side_to_move())); + (*pCheckersBB) |= (attacks_from(ksq) & pieces(BISHOP, QUEEN, side_to_move())); } } @@ -704,7 +704,7 @@ void Position::do_move(Move m, StateInfo& newSt, Bitboard dcCandidates) { struct ReducedStateInfo { Key key, pawnKey, materialKey; int castleRights, rule50; - Square epSquare; + Square kingSquare[2], epSquare; Value mgValue, egValue; Value npMaterial[2]; }; @@ -786,7 +786,7 @@ void Position::do_move(Move m, StateInfo& newSt, Bitboard dcCandidates) { // If the moving piece was a king, update the king square if (pt == KING) - kingSquare[us] = to; + st->kingSquare[us] = to; // Update piece lists, note that index[from] is not updated and // becomes stale. This works as long as index[] is accessed just @@ -806,7 +806,7 @@ void Position::do_move(Move m, StateInfo& newSt, Bitboard dcCandidates) { // Set en passant square, only if moved pawn can be captured if (abs(int(to) - int(from)) == 16) { - if (pawn_attacks(us, from + (us == WHITE ? DELTA_N : DELTA_S)) & pieces(PAWN, them)) + if (attacks_from(from + (us == WHITE ? DELTA_N : DELTA_S), us) & pieces(PAWN, them)) { st->epSquare = Square((int(from) + int(to)) / 2); key ^= zobEp[st->epSquare]; @@ -864,7 +864,7 @@ void Position::do_move(Move m, StateInfo& newSt, Bitboard dcCandidates) { // Update checkers bitboard, piece must be already moved if (ep | pm) - st->checkersBB = attacks_to(king_square(them), us); + st->checkersBB = attackers_to(king_square(them)) & pieces_of_color(us); else { st->checkersBB = EmptyBoardBB; @@ -920,16 +920,15 @@ void Position::do_capture_move(Bitboard& key, PieceType capture, Color them, Squ // Update hash key key ^= zobrist[them][capture][capsq]; - // If the captured piece was a pawn, update pawn hash key - if (capture == PAWN) - st->pawnKey ^= zobrist[them][PAWN][capsq]; - // Update incremental scores st->mgValue -= pst(them, capture, capsq); st->egValue -= pst(them, capture, capsq); - // Update material - if (capture != PAWN) + // If the captured piece was a pawn, update pawn hash key, + // otherwise update non-pawn material. + if (capture == PAWN) + st->pawnKey ^= zobrist[them][PAWN][capsq]; + else st->npMaterial[them] -= piece_value_midgame(capture); // Update material hash key @@ -1007,7 +1006,7 @@ void Position::do_castle_move(Move m) { board[rto] = rook; // Update king square - kingSquare[us] = kto; + st->kingSquare[us] = kto; // Update piece lists pieceList[us][KING][index[kfrom]] = kto; @@ -1042,7 +1041,7 @@ void Position::do_castle_move(Move m) { st->rule50 = 0; // Update checkers BB - st->checkersBB = attacks_to(king_square(them), us); + st->checkersBB = attackers_to(king_square(them)) & pieces_of_color(us); // Finish sideToMove = opposite_color(sideToMove); @@ -1120,10 +1119,6 @@ void Position::undo_move(Move m) { board[from] = piece_of_color_and_type(us, pt); board[to] = EMPTY; - // If the moving piece was a king, update the king square - if (pt == KING) - kingSquare[us] = from; - // Update piece list index[from] = index[to]; pieceList[us][pt][index[from]] = from; @@ -1209,9 +1204,6 @@ void Position::undo_castle_move(Move m) { board[rfrom] = piece_of_color_and_type(us, ROOK); board[kfrom] = piece_of_color_and_type(us, KING); - // Update king square - kingSquare[us] = kfrom; - // Update piece lists pieceList[us][KING][index[kto]] = kfrom; pieceList[us][ROOK][index[rto]] = rfrom; @@ -1366,12 +1358,12 @@ int Position::see(Square from, Square to) const { while (true) { clear_bit(&occ, from); - attackers = (rook_attacks_bb(to, occ) & pieces(ROOK, QUEEN)) - | (bishop_attacks_bb(to, occ) & pieces(BISHOP, QUEEN)) - | (piece_attacks(to) & pieces(KNIGHT)) - | (piece_attacks(to) & pieces(KING)) - | (pawn_attacks(WHITE, to) & pieces(PAWN, BLACK)) - | (pawn_attacks(BLACK, to) & pieces(PAWN, WHITE)); + attackers = (rook_attacks_bb(to, occ) & pieces(ROOK, QUEEN)) + | (bishop_attacks_bb(to, occ) & pieces(BISHOP, QUEEN)) + | (attacks_from(to) & pieces(KNIGHT)) + | (attacks_from(to) & pieces(KING)) + | (attacks_from(to, WHITE) & pieces(PAWN, BLACK)) + | (attacks_from(to, BLACK) & pieces(PAWN, WHITE)); if (from != SQ_NONE) break; @@ -1529,7 +1521,7 @@ void Position::put_piece(Piece p, Square s) { pieceCount[c][pt]++; if (pt == KING) - kingSquare[c] = s; + st->kingSquare[c] = s; } @@ -1931,7 +1923,7 @@ bool Position::is_ok(int* failedStep) const { Color us = side_to_move(); Color them = opposite_color(us); Square ksq = king_square(them); - if (square_is_attacked(ksq, us)) + if (attackers_to(ksq) & pieces_of_color(us)) return false; } @@ -2022,7 +2014,7 @@ bool Position::is_ok(int* failedStep) const { for(PieceType pt = PAWN; pt <= KING; pt++) for(int i = 0; i < pieceCount[c][pt]; i++) { - if (piece_on(piece_list(c, pt, i)) != (pieces(pt, c))) + if (piece_on(piece_list(c, pt, i)) != piece_of_color_and_type(c, pt)) return false; if (index[piece_list(c, pt, i)] != i)