X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.cpp;h=e0e9aa3a9b37b316dc1b55f02b00755a3305c42b;hp=96b455f1249801cf9b6435ec72b0ea2b2f30b5ba;hb=da948cc94ebef4988199c90389a5099b087d2088;hpb=e4277c06bfb783b5ec78001eeef06fa9feae033f diff --git a/src/position.cpp b/src/position.cpp index 96b455f1..e0e9aa3a 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -704,7 +704,7 @@ void Position::do_move(Move m, StateInfo& newSt, Bitboard dcCandidates) { struct ReducedStateInfo { Key key, pawnKey, materialKey; int castleRights, rule50; - Square kingSquare[2], epSquare; + Square epSquare; Value mgValue, egValue; Value npMaterial[2]; }; @@ -784,10 +784,6 @@ void Position::do_move(Move m, StateInfo& newSt, Bitboard dcCandidates) { board[to] = board[from]; board[from] = EMPTY; - // If the moving piece was a king, update the king square - if (pt == KING) - 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 // by known occupied squares. @@ -842,6 +838,7 @@ void Position::do_move(Move m, StateInfo& newSt, Bitboard dcCandidates) { Square lastPawnSquare = pieceList[us][PAWN][pieceCount[us][PAWN]]; index[lastPawnSquare] = index[to]; pieceList[us][PAWN][index[lastPawnSquare]] = lastPawnSquare; + pieceList[us][PAWN][pieceCount[us][PAWN]] = SQ_NONE; index[to] = pieceCount[us][promotion] - 1; pieceList[us][promotion][index[to]] = to; @@ -947,6 +944,7 @@ void Position::do_capture_move(Bitboard& key, PieceType capture, Color them, Squ Square lastPieceSquare = pieceList[them][capture][pieceCount[them][capture]]; index[lastPieceSquare] = index[capsq]; pieceList[them][capture][index[lastPieceSquare]] = lastPieceSquare; + pieceList[them][capture][pieceCount[them][capture]] = SQ_NONE; // Reset rule 50 counter st->rule50 = 0; @@ -987,17 +985,22 @@ void Position::do_castle_move(Move m) { rto = relative_square(us, SQ_D1); } - // Move the pieces - Bitboard kmove_bb = make_move_bb(kfrom, kto); - do_move_bb(&(byColorBB[us]), kmove_bb); - do_move_bb(&(byTypeBB[KING]), kmove_bb); - do_move_bb(&(byTypeBB[0]), kmove_bb); // HACK: byTypeBB[0] == occupied squares - - Bitboard rmove_bb = make_move_bb(rfrom, rto); - do_move_bb(&(byColorBB[us]), rmove_bb); - do_move_bb(&(byTypeBB[ROOK]), rmove_bb); - do_move_bb(&(byTypeBB[0]), rmove_bb); // HACK: byTypeBB[0] == occupied squares - + // Remove pieces from source squares: + clear_bit(&(byColorBB[us]), kfrom); + clear_bit(&(byTypeBB[KING]), kfrom); + clear_bit(&(byTypeBB[0]), kfrom); // HACK: byTypeBB[0] == occupied squares + clear_bit(&(byColorBB[us]), rfrom); + clear_bit(&(byTypeBB[ROOK]), rfrom); + clear_bit(&(byTypeBB[0]), rfrom); // HACK: byTypeBB[0] == occupied squares + + // Put pieces on destination squares: + set_bit(&(byColorBB[us]), kto); + set_bit(&(byTypeBB[KING]), kto); + set_bit(&(byTypeBB[0]), kto); // HACK: byTypeBB[0] == occupied squares + set_bit(&(byColorBB[us]), rto); + set_bit(&(byTypeBB[ROOK]), rto); + set_bit(&(byTypeBB[0]), rto); // HACK: byTypeBB[0] == occupied squares + // Update board array Piece king = piece_of_color_and_type(us, KING); Piece rook = piece_of_color_and_type(us, ROOK); @@ -1005,9 +1008,6 @@ void Position::do_castle_move(Move m) { board[kto] = king; board[rto] = rook; - // Update king square - st->kingSquare[us] = kto; - // Update piece lists pieceList[us][KING][index[kfrom]] = kto; pieceList[us][ROOK][index[rfrom]] = rto; @@ -1106,10 +1106,12 @@ void Position::undo_move(Move m) { Square lastPromotionSquare = pieceList[us][promotion][pieceCount[us][promotion]]; index[lastPromotionSquare] = index[to]; pieceList[us][promotion][index[lastPromotionSquare]] = lastPromotionSquare; + pieceList[us][promotion][pieceCount[us][promotion]] = SQ_NONE; index[to] = pieceCount[us][PAWN] - 1; pieceList[us][PAWN][index[to]] = to; } + // Put the piece back at the source square Bitboard move_bb = make_move_bb(to, from); do_move_bb(&(byColorBB[us]), move_bb); @@ -1187,17 +1189,22 @@ void Position::undo_castle_move(Move m) { assert(piece_on(kto) == piece_of_color_and_type(us, KING)); assert(piece_on(rto) == piece_of_color_and_type(us, ROOK)); - - // Put the pieces back at the source square - Bitboard kmove_bb = make_move_bb(kto, kfrom); - do_move_bb(&(byColorBB[us]), kmove_bb); - do_move_bb(&(byTypeBB[KING]), kmove_bb); - do_move_bb(&(byTypeBB[0]), kmove_bb); // HACK: byTypeBB[0] == occupied squares - - Bitboard rmove_bb = make_move_bb(rto, rfrom); - do_move_bb(&(byColorBB[us]), rmove_bb); - do_move_bb(&(byTypeBB[ROOK]), rmove_bb); - do_move_bb(&(byTypeBB[0]), rmove_bb); // HACK: byTypeBB[0] == occupied squares + + // Remove pieces from destination squares: + clear_bit(&(byColorBB[us]), kto); + clear_bit(&(byTypeBB[KING]), kto); + clear_bit(&(byTypeBB[0]), kto); // HACK: byTypeBB[0] == occupied squares + clear_bit(&(byColorBB[us]), rto); + clear_bit(&(byTypeBB[ROOK]), rto); + clear_bit(&(byTypeBB[0]), rto); // HACK: byTypeBB[0] == occupied squares + + // Put pieces on source squares: + set_bit(&(byColorBB[us]), kfrom); + set_bit(&(byTypeBB[KING]), kfrom); + set_bit(&(byTypeBB[0]), kfrom); // HACK: byTypeBB[0] == occupied squares + set_bit(&(byColorBB[us]), rfrom); + set_bit(&(byTypeBB[ROOK]), rfrom); + set_bit(&(byTypeBB[0]), rfrom); // HACK: byTypeBB[0] == occupied squares // Update board board[rto] = board[kto] = EMPTY; @@ -1325,7 +1332,7 @@ int Position::see(Square from, Square to) const { 0, 0 }; - Bitboard attackers, stmAttackers, occ, b; + Bitboard attackers, stmAttackers, b; assert(square_is_ok(from) || from == SQ_NONE); assert(square_is_ok(to)); @@ -1337,10 +1344,7 @@ int Position::see(Square from, Square to) const { // Initialize pieces Piece piece = piece_on(from); Piece capture = piece_on(to); - - // Find all attackers to the destination square, with the moving piece - // removed, but possibly an X-ray attacker added behind it. - occ = occupied_squares(); + Bitboard occ = occupied_squares(); // Handle en passant moves if (st->epSquare == to && type_of_piece_on(from) == PAWN) @@ -1357,6 +1361,8 @@ int Position::see(Square from, Square to) const { while (true) { + // 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); attackers = (rook_attacks_bb(to, occ) & pieces(ROOK, QUEEN)) | (bishop_attacks_bb(to, occ) & pieces(BISHOP, QUEEN)) @@ -1519,9 +1525,6 @@ void Position::put_piece(Piece p, Square s) { set_bit(&byTypeBB[0], s); // HACK: byTypeBB[0] contains all occupied squares. pieceCount[c][pt]++; - - if (pt == KING) - st->kingSquare[c] = s; } @@ -2014,7 +2017,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)