X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.cpp;h=537674c9119c123370c44456cfb7b9ea94301451;hp=88eb22eaa338d910b08647abbf4e95b0f3841de3;hb=34178205fc762638e633a61ecc45360e1662bdee;hpb=c19ea4b0005c312aceb82d31ea17c2e1ff0729d2 diff --git a/src/position.cpp b/src/position.cpp index 88eb22ea..537674c9 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -19,7 +19,6 @@ #include #include -#include #include #include #include @@ -37,7 +36,7 @@ using std::cout; using std::endl; Key Position::zobrist[2][8][64]; -Key Position::zobEp[64]; +Key Position::zobEp[8]; Key Position::zobCastle[16]; Key Position::zobSideToMove; Key Position::zobExclusion; @@ -78,7 +77,7 @@ namespace { CheckInfo::CheckInfo(const Position& pos) { - Color them = flip(pos.side_to_move()); + Color them = ~pos.side_to_move(); ksq = pos.king_square(them); pinned = pos.pinned_pieces(); @@ -165,11 +164,11 @@ void Position::from_fen(const string& fenStr, bool isChess960) { // 1. Piece placement while ((fen >> token) && !isspace(token)) { - if (token == '/') - sq -= Square(16); // Jump back of 2 rows + if (isdigit(token)) + sq += Square(token - '0'); // Advance the given number of files - else if (isdigit(token)) - sq += Square(token - '0'); // Skip the given number of files + else if (token == '/') + sq = make_square(FILE_A, rank_of(sq) - Rank(2)); else if ((p = PieceToChar.find(token)) != string::npos) { @@ -192,15 +191,14 @@ void Position::from_fen(const string& fenStr, bool isChess960) { { Square rsq; Color c = islower(token) ? BLACK : WHITE; - Piece rook = make_piece(c, ROOK); token = char(toupper(token)); if (token == 'K') - for (rsq = relative_square(c, SQ_H1); piece_on(rsq) != rook; rsq--) {} + for (rsq = relative_square(c, SQ_H1); type_of(piece_on(rsq)) != ROOK; rsq--) {} else if (token == 'Q') - for (rsq = relative_square(c, SQ_A1); piece_on(rsq) != rook; rsq++) {} + for (rsq = relative_square(c, SQ_A1); type_of(piece_on(rsq)) != ROOK; rsq++) {} else if (token >= 'A' && token <= 'H') rsq = make_square(File(token - 'A'), relative_rank(c, RANK_1)); @@ -208,7 +206,7 @@ void Position::from_fen(const string& fenStr, bool isChess960) { else continue; - set_castle_right(king_square(c), rsq); + set_castle_right(c, rsq); } // 4. En passant square. Ignore if no pawn capture is possible @@ -234,7 +232,7 @@ void Position::from_fen(const string& fenStr, bool isChess960) { st->value = compute_value(); st->npMaterial[WHITE] = compute_non_pawn_material(WHITE); st->npMaterial[BLACK] = compute_non_pawn_material(BLACK); - st->checkersBB = attackers_to(king_square(sideToMove)) & pieces(flip(sideToMove)); + st->checkersBB = attackers_to(king_square(sideToMove)) & pieces(~sideToMove); chess960 = isChess960; assert(pos_is_ok()); @@ -242,16 +240,29 @@ 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 king and rook starting squares. +/// rights given the corresponding color and the rook starting square. -void Position::set_castle_right(Square ksq, Square rsq) { +void Position::set_castle_right(Color c, Square rfrom) { - int f = (rsq < ksq ? WHITE_OOO : WHITE_OO) << color_of(piece_on(ksq)); + Square kfrom = king_square(c); + bool kingSide = kfrom < rfrom; + int cr = (kingSide ? WHITE_OO : WHITE_OOO) << c; - st->castleRights |= f; - castleRightsMask[ksq] ^= 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; } @@ -357,8 +368,8 @@ Bitboard Position::hidden_checkers() const { // Pinned pieces protect our king, dicovery checks attack the enemy king Bitboard b, result = 0; - Bitboard pinners = pieces(FindPinned ? flip(sideToMove) : sideToMove); - Square ksq = king_square(FindPinned ? sideToMove : flip(sideToMove)); + Bitboard pinners = pieces(FindPinned ? ~sideToMove : sideToMove); + Square ksq = king_square(FindPinned ? sideToMove : ~sideToMove); // Pinners are sliders, that give check when candidate pinned is removed pinners &= (pieces(ROOK, QUEEN) & PseudoAttacks[ROOK][ksq]) @@ -388,8 +399,8 @@ Bitboard Position::attackers_to(Square s, Bitboard occ) const { return (attacks_from(s, BLACK) & pieces(PAWN, WHITE)) | (attacks_from(s, WHITE) & pieces(PAWN, BLACK)) | (attacks_from(s) & pieces(KNIGHT)) - | (rook_attacks_bb(s, occ) & pieces(ROOK, QUEEN)) - | (bishop_attacks_bb(s, occ) & pieces(BISHOP, QUEEN)) + | (attacks_bb(s, occ) & pieces(ROOK, QUEEN)) + | (attacks_bb(s, occ) & pieces(BISHOP, QUEEN)) | (attacks_from(s) & pieces(KING)); } @@ -403,9 +414,9 @@ Bitboard Position::attacks_from(Piece p, Square s, Bitboard occ) { switch (type_of(p)) { - case BISHOP: return bishop_attacks_bb(s, occ); - case ROOK : return rook_attacks_bb(s, occ); - case QUEEN : return bishop_attacks_bb(s, occ) | rook_attacks_bb(s, occ); + case BISHOP: return attacks_bb(s, occ); + case ROOK : return attacks_bb(s, occ); + case QUEEN : return attacks_bb(s, occ) | attacks_bb(s, occ); default : return StepAttacksBB[p][s]; } } @@ -422,21 +433,20 @@ bool Position::move_attacks_square(Move m, Square s) const { Bitboard occ, xray; Square from = from_sq(m); Square to = to_sq(m); - Piece piece = piece_on(from); + Piece piece = piece_moved(m); assert(!square_is_empty(from)); // Update occupancy as if the piece is moving - occ = occupied_squares(); - do_move_bb(&occ, make_move_bb(from, to)); + occ = occupied_squares() ^ from ^ to; // The piece moved in 'to' attacks the square 's' ? - if (bit_is_set(attacks_from(piece, to, occ), s)) + if (attacks_from(piece, to, occ) & s) return true; // Scan for possible X-ray attackers behind the moved piece - xray = (rook_attacks_bb(s, occ) & pieces(ROOK, QUEEN, color_of(piece))) - |(bishop_attacks_bb(s, occ) & pieces(BISHOP, QUEEN, color_of(piece))); + xray = (attacks_bb(s, occ) & pieces(ROOK, QUEEN, color_of(piece))) + |(attacks_bb(s, occ) & pieces(BISHOP, QUEEN, color_of(piece))); // Verify attackers are triggered by our move and not already existing return xray && (xray ^ (xray & attacks_from(s))); @@ -450,10 +460,10 @@ bool Position::pl_move_is_legal(Move m, Bitboard pinned) const { assert(is_ok(m)); assert(pinned == pinned_pieces()); - Color us = side_to_move(); + Color us = sideToMove; Square from = from_sq(m); - assert(color_of(piece_on(from)) == us); + assert(color_of(piece_moved(m)) == us); assert(piece_on(king_square(us)) == make_piece(us, KING)); // En passant captures are a tricky special case. Because they are rather @@ -461,35 +471,31 @@ bool Position::pl_move_is_legal(Move m, Bitboard pinned) const { // the move is made. if (is_enpassant(m)) { - Color them = flip(us); + Color them = ~us; Square to = to_sq(m); Square capsq = to + pawn_push(them); Square ksq = king_square(us); - Bitboard b = occupied_squares(); + Bitboard b = (occupied_squares() ^ from ^ capsq) | to; assert(to == ep_square()); - assert(piece_on(from) == make_piece(us, PAWN)); + assert(piece_moved(m) == make_piece(us, PAWN)); assert(piece_on(capsq) == make_piece(them, PAWN)); assert(piece_on(to) == NO_PIECE); - clear_bit(&b, from); - clear_bit(&b, capsq); - set_bit(&b, to); - - return !(rook_attacks_bb(ksq, b) & pieces(ROOK, QUEEN, them)) - && !(bishop_attacks_bb(ksq, b) & pieces(BISHOP, QUEEN, them)); + return !(attacks_bb(ksq, b) & pieces(ROOK, QUEEN, them)) + && !(attacks_bb(ksq, b) & pieces(BISHOP, QUEEN, them)); } // If the moving piece is a king, check whether the destination // square is attacked by the opponent. Castling moves are checked // for legality during move generation. if (type_of(piece_on(from)) == KING) - return is_castle(m) || !(attackers_to(to_sq(m)) & pieces(flip(us))); + return is_castle(m) || !(attackers_to(to_sq(m)) & pieces(~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. return !pinned - || !bit_is_set(pinned, from) + || !(pinned & from) || squares_aligned(from, to_sq(m), king_square(us)); } @@ -515,17 +521,17 @@ bool Position::move_is_legal(const Move m) const { bool Position::is_pseudo_legal(const Move m) const { Color us = sideToMove; - Color them = flip(sideToMove); + Color them = ~sideToMove; Square from = from_sq(m); Square to = to_sq(m); - Piece pc = piece_on(from); + Piece pc = piece_moved(m); // Use a slower but simpler function for uncommon cases if (is_special(m)) 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 @@ -599,7 +605,7 @@ bool Position::is_pseudo_legal(const Move m) const { return false; } } - else if (!bit_is_set(attacks_from(pc, from), to)) + else if (!(attacks_from(pc, from) & to)) return false; // Evasions generator already takes care to avoid some kind of illegal moves @@ -607,28 +613,22 @@ bool Position::is_pseudo_legal(const Move m) const { // same kind of moves are filtered out here. if (in_check()) { - // 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. - if (type_of(piece_on(from)) == KING) + if (type_of(pc) != KING) { - Bitboard b = occupied_squares(); - clear_bit(&b, from); - if (attackers_to(to_sq(m), b) & pieces(flip(us))) - return false; - } - else - { - Bitboard target = checkers(); - Square checksq = pop_1st_bit(&target); + Bitboard b = checkers(); + Square checksq = pop_1st_bit(&b); - if (target) // double check ? In this case a king move is required + if (b) // double check ? In this case a king move is required return false; // Our move must be a blocking evasion or a capture of the checking piece - target = squares_between(checksq, king_square(us)) | checkers(); - if (!bit_is_set(target, to_sq(m))) + if (!((squares_between(checksq, king_square(us)) | checkers()) & to)) return false; } + // 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)) + return false; } return true; @@ -641,22 +641,22 @@ bool Position::move_gives_check(Move m, const CheckInfo& ci) const { assert(is_ok(m)); assert(ci.dcCandidates == discovered_check_candidates()); - assert(color_of(piece_moved(m)) == side_to_move()); + assert(color_of(piece_moved(m)) == sideToMove); Square from = from_sq(m); Square to = to_sq(m); PieceType pt = type_of(piece_on(from)); // Direct check ? - if (bit_is_set(ci.checkSq[pt], to)) + if (ci.checkSq[pt] & to) return true; // Discovery check ? - if (ci.dcCandidates && bit_is_set(ci.dcCandidates, from)) + if (ci.dcCandidates && (ci.dcCandidates & from)) { // For pawn and king moves we need to verify also direction if ( (pt != PAWN && pt != KING) - || !squares_aligned(from, to, king_square(flip(side_to_move())))) + || !squares_aligned(from, to, king_square(~sideToMove))) return true; } @@ -664,16 +664,12 @@ bool Position::move_gives_check(Move m, const CheckInfo& ci) const { if (!is_special(m)) return false; - Color us = side_to_move(); - Bitboard b = occupied_squares(); - Square ksq = king_square(flip(us)); + Color us = sideToMove; + Square ksq = king_square(~us); // Promotion with check ? if (is_promotion(m)) - { - clear_bit(&b, from); - return bit_is_set(attacks_from(Piece(promotion_piece_type(m)), to, b), ksq); - } + return attacks_from(Piece(promotion_type(m)), to, occupied_squares() ^ from) & ksq; // En passant capture with check ? We have already handled the case // of direct checks and ordinary discovered check, the only case we @@ -682,33 +678,22 @@ 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)); - clear_bit(&b, from); - clear_bit(&b, capsq); - set_bit(&b, to); - return (rook_attacks_bb(ksq, b) & pieces(ROOK, QUEEN, us)) - ||(bishop_attacks_bb(ksq, b) & pieces(BISHOP, QUEEN, us)); + Bitboard b = (occupied_squares() ^ from ^ capsq) | to; + + return (attacks_bb< ROOK>(ksq, b) & pieces( ROOK, QUEEN, us)) + | (attacks_bb(ksq, b) & pieces(BISHOP, QUEEN, us)); } // Castling with check ? if (is_castle(m)) { - Square kfrom, kto, rfrom, rto; - kfrom = from; - rfrom = to; + Square kfrom = from; + 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; - if (rfrom > kfrom) - { - kto = relative_square(us, SQ_G1); - rto = relative_square(us, SQ_F1); - } else { - kto = relative_square(us, SQ_C1); - rto = relative_square(us, SQ_D1); - } - clear_bit(&b, kfrom); - clear_bit(&b, rfrom); - set_bit(&b, rto); - set_bit(&b, kto); - return bit_is_set(rook_attacks_bb(rto, b), ksq); + return attacks_bb(rto, b) & ksq; } return false; @@ -753,7 +738,7 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI k ^= zobSideToMove; // Increment the 50 moves rule draw counter. Resetting it to zero in the - // case of non-reversible moves is taken care of later. + // case of a capture or a pawn move is taken care of later. st->rule50++; st->pliesFromNull++; @@ -764,8 +749,8 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI return; } - Color us = side_to_move(); - Color them = flip(us); + Color us = sideToMove; + Color them = ~us; Square from = from_sq(m); Square to = to_sq(m); Piece piece = piece_on(from); @@ -803,9 +788,9 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI st->npMaterial[them] -= PieceValueMidgame[capture]; // Remove the captured piece - clear_bit(&byColorBB[them], capsq); - clear_bit(&byTypeBB[capture], capsq); - clear_bit(&occupied, capsq); + byColorBB[them] ^= capsq; + byTypeBB[capture] ^= capsq; + occupied ^= capsq; // Update piece list, move the last piece at index[capsq] position and // shrink the list. @@ -836,27 +821,26 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI // Reset en passant square if (st->epSquare != SQ_NONE) { - k ^= zobEp[st->epSquare]; + k ^= zobEp[file_of(st->epSquare)]; st->epSquare = SQ_NONE; } // Update castle rights if needed - if ( st->castleRights != CASTLES_NONE - && (castleRightsMask[from] & castleRightsMask[to]) != ALL_CASTLES) + if (st->castleRights && (castleRightsMask[from] | castleRightsMask[to])) { - k ^= zobCastle[st->castleRights]; - st->castleRights &= castleRightsMask[from] & castleRightsMask[to]; - k ^= zobCastle[st->castleRights]; + int cr = castleRightsMask[from] | castleRightsMask[to]; + k ^= zobCastle[st->castleRights & cr]; + st->castleRights &= ~cr; } // Prefetch TT access as soon as we know key is updated prefetch((char*)TT.first_entry(k)); // Move the piece - Bitboard move_bb = make_move_bb(from, to); - do_move_bb(&byColorBB[us], move_bb); - do_move_bb(&byTypeBB[pt], move_bb); - do_move_bb(&occupied, move_bb); + Bitboard from_to_bb = SquareBB[from] | SquareBB[to]; + byColorBB[us] ^= from_to_bb; + byTypeBB[pt] ^= from_to_bb; + occupied ^= from_to_bb; board[to] = board[from]; board[from] = NO_PIECE; @@ -870,23 +854,23 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI if (pt == PAWN) { // Set en-passant square, only if moved pawn can be captured - if ( (to ^ from) == 16 + if ( (int(to) ^ int(from)) == 16 && (attacks_from(from + pawn_push(us), us) & pieces(PAWN, them))) { st->epSquare = Square((from + to) / 2); - k ^= zobEp[st->epSquare]; + k ^= zobEp[file_of(st->epSquare)]; } 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); // Replace the pawn with the promoted piece - clear_bit(&byTypeBB[PAWN], to); - set_bit(&byTypeBB[promotion], to); + byTypeBB[PAWN] ^= to; + byTypeBB[promotion] |= to; board[to] = make_piece(us, promotion); // Update piece lists, move the last pawn at index[to] position @@ -942,11 +926,11 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI else { // Direct checks - if (bit_is_set(ci.checkSq[pt], to)) - st->checkersBB = SetMaskBB[to]; + if (ci.checkSq[pt] & to) + st->checkersBB |= to; // Discovery checks - if (ci.dcCandidates && bit_is_set(ci.dcCandidates, from)) + if (ci.dcCandidates && (ci.dcCandidates & from)) { if (pt != ROOK) st->checkersBB |= attacks_from(king_square(them)) & pieces(ROOK, QUEEN, us); @@ -958,7 +942,7 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI } // Finish - sideToMove = flip(sideToMove); + sideToMove = ~sideToMove; st->value += (sideToMove == WHITE ? TempoValue : -TempoValue); assert(pos_is_ok()); @@ -972,7 +956,7 @@ void Position::undo_move(Move m) { assert(is_ok(m)); - sideToMove = flip(sideToMove); + sideToMove = ~sideToMove; if (is_castle(m)) { @@ -980,8 +964,8 @@ void Position::undo_move(Move m) { return; } - Color us = side_to_move(); - Color them = flip(us); + Color us = sideToMove; + Color them = ~us; Square from = from_sq(m); Square to = to_sq(m); Piece piece = piece_on(to); @@ -994,15 +978,15 @@ 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); assert(promotion >= KNIGHT && promotion <= QUEEN); // Replace the promoted piece with the pawn - clear_bit(&byTypeBB[promotion], to); - set_bit(&byTypeBB[PAWN], to); + byTypeBB[promotion] ^= to; + byTypeBB[PAWN] |= to; board[to] = make_piece(us, PAWN); // Update piece lists, move the last promoted piece at index[to] position @@ -1018,10 +1002,10 @@ void Position::undo_move(Move m) { } // Put the piece back at the source square - Bitboard move_bb = make_move_bb(to, from); - do_move_bb(&byColorBB[us], move_bb); - do_move_bb(&byTypeBB[pt], move_bb); - do_move_bb(&occupied, move_bb); + Bitboard from_to_bb = SquareBB[from] | SquareBB[to]; + byColorBB[us] ^= from_to_bb; + byTypeBB[pt] ^= from_to_bb; + occupied ^= from_to_bb; board[from] = board[to]; board[to] = NO_PIECE; @@ -1046,9 +1030,9 @@ void Position::undo_move(Move m) { } // Restore the captured piece - set_bit(&byColorBB[them], capsq); - set_bit(&byTypeBB[capture], capsq); - set_bit(&occupied, capsq); + byColorBB[them] |= capsq; + byTypeBB[capture] |= capsq; + occupied |= capsq; board[capsq] = make_piece(them, capture); @@ -1076,7 +1060,7 @@ void Position::do_castle_move(Move m) { Square kto, kfrom, rfrom, rto, kAfter, rAfter; - Color us = side_to_move(); + Color us = sideToMove; Square kBefore = from_sq(m); Square rBefore = to_sq(m); @@ -1102,20 +1086,20 @@ void Position::do_castle_move(Move m) { assert(piece_on(rfrom) == make_piece(us, ROOK)); // Remove pieces from source squares - clear_bit(&byColorBB[us], kfrom); - clear_bit(&byTypeBB[KING], kfrom); - clear_bit(&occupied, kfrom); - clear_bit(&byColorBB[us], rfrom); - clear_bit(&byTypeBB[ROOK], rfrom); - clear_bit(&occupied, rfrom); + byColorBB[us] ^= kfrom; + byTypeBB[KING] ^= kfrom; + occupied ^= kfrom; + byColorBB[us] ^= rfrom; + byTypeBB[ROOK] ^= rfrom; + occupied ^= rfrom; // Put pieces on destination squares - set_bit(&byColorBB[us], kto); - set_bit(&byTypeBB[KING], kto); - set_bit(&occupied, kto); - set_bit(&byColorBB[us], rto); - set_bit(&byTypeBB[ROOK], rto); - set_bit(&occupied, rto); + byColorBB[us] |= kto; + byTypeBB[KING] |= kto; + occupied |= kto; + byColorBB[us] |= rto; + byTypeBB[ROOK] |= rto; + occupied |= rto; // Update board Piece king = make_piece(us, KING); @@ -1147,23 +1131,19 @@ void Position::do_castle_move(Move m) { // Clear en passant square if (st->epSquare != SQ_NONE) { - st->key ^= zobEp[st->epSquare]; + st->key ^= zobEp[file_of(st->epSquare)]; st->epSquare = SQ_NONE; } // Update castling rights - st->key ^= zobCastle[st->castleRights]; - st->castleRights &= castleRightsMask[kfrom]; - st->key ^= zobCastle[st->castleRights]; - - // Reset rule 50 counter - st->rule50 = 0; + st->key ^= zobCastle[st->castleRights & castleRightsMask[kfrom]]; + st->castleRights &= ~castleRightsMask[kfrom]; // Update checkers BB - st->checkersBB = attackers_to(king_square(flip(us))) & pieces(us); + st->checkersBB = attackers_to(king_square(~us)) & pieces(us); // Finish - sideToMove = flip(sideToMove); + sideToMove = ~sideToMove; st->value += (sideToMove == WHITE ? TempoValue : -TempoValue); } else @@ -1194,12 +1174,12 @@ void Position::do_null_move(StateInfo& backupSt) { dst->rule50 = src->rule50; dst->pliesFromNull = src->pliesFromNull; - sideToMove = flip(sideToMove); + sideToMove = ~sideToMove; if (Do) { if (st->epSquare != SQ_NONE) - st->key ^= zobEp[st->epSquare]; + st->key ^= zobEp[file_of(st->epSquare)]; st->key ^= zobSideToMove; prefetch((char*)TT.first_entry(st->key)); @@ -1228,13 +1208,10 @@ int Position::see_sign(Move m) const { assert(is_ok(m)); - Square from = from_sq(m); - Square to = to_sq(m); - // Early return if SEE cannot be negative because captured piece value // is not less then capturing one. Note that king moves always return // here because king midgame value is set to 0. - if (PieceValueMidgame[piece_on(to)] >= PieceValueMidgame[piece_on(from)]) + if (PieceValueMidgame[piece_on(to_sq(m))] >= PieceValueMidgame[piece_moved(m)]) return 1; return see(m); @@ -1264,23 +1241,23 @@ int Position::see(Move m) const { // Handle en passant moves if (is_enpassant(m)) { - Square capQq = to - pawn_push(side_to_move()); + Square capQq = to - pawn_push(sideToMove); - assert(capturedType == NO_PIECE_TYPE); + assert(!capturedType); assert(type_of(piece_on(capQq)) == PAWN); // Remove the captured pawn - clear_bit(&occ, capQq); + occ ^= capQq; capturedType = PAWN; } // Find all attackers to the destination square, with the moving piece // removed, but possibly an X-ray attacker added behind it. - clear_bit(&occ, from); + occ ^= from; attackers = attackers_to(to, occ); // If the opponent has no attackers we are finished - stm = flip(color_of(piece_on(from))); + stm = ~color_of(piece_on(from)); stmAttackers = attackers & pieces(stm); if (!stmAttackers) return PieceValueMidgame[capturedType]; @@ -1305,8 +1282,8 @@ int Position::see(Move m) const { // and scan for new X-ray attacks behind the attacker. b = stmAttackers & pieces(pt); occ ^= (b & (~b + 1)); - attackers |= (rook_attacks_bb(to, occ) & pieces(ROOK, QUEEN)) - | (bishop_attacks_bb(to, occ) & pieces(BISHOP, QUEEN)); + attackers |= (attacks_bb(to, occ) & pieces(ROOK, QUEEN)) + | (attacks_bb(to, occ) & pieces(BISHOP, QUEEN)); attackers &= occ; // Cut out pieces we've already done @@ -1318,7 +1295,7 @@ int Position::see(Move m) const { // Remember the value of the capturing piece, and change the side to // move before beginning the next iteration. capturedType = pt; - stm = flip(stm); + stm = ~stm; stmAttackers = attackers & pieces(stm); // Stop before processing a king capture @@ -1344,27 +1321,16 @@ int Position::see(Move m) const { void Position::clear() { + memset(this, 0, sizeof(Position)); + startState.epSquare = SQ_NONE; st = &startState; - memset(st, 0, sizeof(StateInfo)); - st->epSquare = SQ_NONE; - - memset(byColorBB, 0, sizeof(Bitboard) * 2); - memset(byTypeBB, 0, sizeof(Bitboard) * 8); - memset(pieceCount, 0, sizeof(int) * 2 * 8); - memset(index, 0, sizeof(int) * 64); for (int i = 0; i < 8; i++) for (int j = 0; j < 16; j++) pieceList[0][i][j] = pieceList[1][i][j] = SQ_NONE; for (Square sq = SQ_A1; sq <= SQ_H8; sq++) - { board[sq] = NO_PIECE; - castleRightsMask[sq] = ALL_CASTLES; - } - sideToMove = WHITE; - nodes = 0; - occupied = 0; } @@ -1380,9 +1346,9 @@ void Position::put_piece(Piece p, Square s) { index[s] = pieceCount[c][pt]++; pieceList[c][pt][index[s]] = s; - set_bit(&byTypeBB[pt], s); - set_bit(&byColorBB[c], s); - set_bit(&occupied, s); + byTypeBB[pt] |= s; + byColorBB[c] |= s; + occupied |= s; } @@ -1400,9 +1366,9 @@ Key Position::compute_key() const { result ^= zobrist[color_of(piece_on(s))][type_of(piece_on(s))][s]; if (ep_square() != SQ_NONE) - result ^= zobEp[ep_square()]; + result ^= zobEp[file_of(ep_square())]; - if (side_to_move() == BLACK) + if (sideToMove == BLACK) result ^= zobSideToMove; return result; @@ -1466,7 +1432,7 @@ Score Position::compute_value() const { result += pst(make_piece(c, pt), pop_1st_bit(&b)); } - result += (side_to_move() == WHITE ? TempoValue / 2 : -TempoValue / 2); + result += (sideToMove == WHITE ? TempoValue / 2 : -TempoValue / 2); return result; } @@ -1546,11 +1512,18 @@ void Position::init() { for (Square s = SQ_A1; s <= SQ_H8; s++) zobrist[c][pt][s] = rk.rand(); - for (Square s = SQ_A1; s <= SQ_H8; s++) - zobEp[s] = rk.rand(); + for (File f = FILE_A; f <= FILE_H; f++) + zobEp[f] = rk.rand(); - for (int i = 0; i < 16; i++) - zobCastle[i] = rk.rand(); + for (int cr = CASTLES_NONE; cr <= ALL_CASTLES; cr++) + { + Bitboard b = cr; + while (b) + { + Key k = zobCastle[1 << pop_1st_bit(&b)]; + zobCastle[cr] ^= k ? k : rk.rand(); + } + } zobSideToMove = rk.rand(); zobExclusion = rk.rand(); @@ -1562,7 +1535,7 @@ void Position::init() { for (Square s = SQ_A1; s <= SQ_H8; s++) { pieceSquareTable[p][s] = ps + PSQT[p][s]; - pieceSquareTable[p+8][flip(s)] = -pieceSquareTable[p][s]; + pieceSquareTable[p+8][~s] = -pieceSquareTable[p][s]; } } } @@ -1582,27 +1555,27 @@ void Position::flip_me() { // Board for (Square s = SQ_A1; s <= SQ_H8; s++) if (!pos.square_is_empty(s)) - put_piece(Piece(pos.piece_on(s) ^ 8), flip(s)); + put_piece(Piece(pos.piece_on(s) ^ 8), ~s); // Side to move - sideToMove = flip(pos.side_to_move()); + sideToMove = ~pos.side_to_move(); // Castling rights if (pos.can_castle(WHITE_OO)) - set_castle_right(king_square(BLACK), flip(pos.castle_rook_square(WHITE_OO))); + set_castle_right(BLACK, ~pos.castle_rook_square(WHITE_OO)); if (pos.can_castle(WHITE_OOO)) - set_castle_right(king_square(BLACK), flip(pos.castle_rook_square(WHITE_OOO))); + set_castle_right(BLACK, ~pos.castle_rook_square(WHITE_OOO)); if (pos.can_castle(BLACK_OO)) - set_castle_right(king_square(WHITE), flip(pos.castle_rook_square(BLACK_OO))); + set_castle_right(WHITE, ~pos.castle_rook_square(BLACK_OO)); if (pos.can_castle(BLACK_OOO)) - set_castle_right(king_square(WHITE), flip(pos.castle_rook_square(BLACK_OOO))); + set_castle_right(WHITE, ~pos.castle_rook_square(BLACK_OOO)); // En passant square if (pos.st->epSquare != SQ_NONE) - st->epSquare = flip(pos.st->epSquare); + st->epSquare = ~pos.st->epSquare; // Checkers - st->checkersBB = attackers_to(king_square(sideToMove)) & pieces(flip(sideToMove)); + st->checkersBB = attackers_to(king_square(sideToMove)) & pieces(~sideToMove); // Hash keys st->key = compute_key(); @@ -1644,7 +1617,7 @@ bool Position::pos_is_ok(int* failedStep) const { if (failedStep) *failedStep = 1; // Side to move OK? - if (side_to_move() != WHITE && side_to_move() != BLACK) + if (sideToMove != WHITE && sideToMove != BLACK) return false; // Are the king squares in the position correct? @@ -1673,8 +1646,8 @@ bool Position::pos_is_ok(int* failedStep) const { if (failedStep) (*failedStep)++; if (debugKingCapture) { - Color us = side_to_move(); - Color them = flip(us); + Color us = sideToMove; + Color them = ~us; Square ksq = king_square(them); if (attackers_to(ksq) & pieces(us)) return false; @@ -1690,7 +1663,7 @@ bool Position::pos_is_ok(int* failedStep) const { if (debugBitboards) { // The intersection of the white and black pieces must be empty - if (!(pieces(WHITE) & pieces(BLACK))) + if (pieces(WHITE) & pieces(BLACK)) return false; // The union of the white and black pieces must be equal to all @@ -1711,7 +1684,7 @@ bool Position::pos_is_ok(int* failedStep) const { { // The en passant square must be on rank 6, from the point of view of the // side to move. - if (relative_rank(side_to_move(), ep_square()) != RANK_6) + if (relative_rank(sideToMove, ep_square()) != RANK_6) return false; } @@ -1776,8 +1749,8 @@ bool Position::pos_is_ok(int* failedStep) const { Piece rook = (f & (WHITE_OO | WHITE_OOO) ? W_ROOK : B_ROOK); - if ( castleRightsMask[castleRookSquare[f]] != (ALL_CASTLES ^ f) - || piece_on(castleRookSquare[f]) != rook) + if ( piece_on(castleRookSquare[f]) != rook + || castleRightsMask[castleRookSquare[f]] != f) return false; }