X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fposition.cpp;h=7f0e1447d08bde86e81ee24781a260509e0da54c;hb=155bed18f5224d401ddf5b4b71d93d8a8c379b3c;hp=c9da8d8b56e25e5df22b9610e59fde0524b3f58a;hpb=8094b2add88cd681f3cdc7896990633b54c6ff48;p=stockfish diff --git a/src/position.cpp b/src/position.cpp index c9da8d8b..7f0e1447 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -42,7 +42,7 @@ Key Position::zobCastle[16]; Key Position::zobSideToMove; Key Position::zobExclusion; -Score Position::PieceSquareTable[16][64]; +Score Position::pieceSquareTable[16][64]; // Material values arrays, indexed by Piece const Value PieceValueMidgame[17] = { @@ -207,7 +207,7 @@ void Position::from_fen(const string& fen, bool isChess960) { // Various initialisations chess960 = isChess960; - find_checkers(); + st->checkersBB = attackers_to(king_square(sideToMove)) & pieces(opposite_color(sideToMove)); st->key = compute_key(); st->pawnKey = compute_pawn_key(); @@ -245,7 +245,7 @@ void Position::set_castling_rights(char token) { Square sqH = relative_square(c, SQ_H1); Square rsq, ksq = king_square(c); - token = toupper(token); + token = char(toupper(token)); if (token == 'K') for (rsq = sqH; piece_on(rsq) != make_piece(c, ROOK); rsq--) {} @@ -282,7 +282,7 @@ const string Position::to_fen() const { { sq = make_square(file, rank); - if (square_is_occupied(sq)) + if (!square_is_empty(sq)) { if (emptyCnt != '0') { @@ -364,7 +364,7 @@ template Bitboard Position::hidden_checkers(Color c) const { Bitboard result = EmptyBoardBB; - Bitboard pinners = pieces_of_color(FindPinned ? opposite_color(c) : c); + Bitboard pinners = pieces(FindPinned ? opposite_color(c) : c); // Pinned pieces protect our king, dicovery checks attack // the enemy king. @@ -384,7 +384,7 @@ Bitboard Position::hidden_checkers(Color c) const { assert(b); if ( !(b & (b - 1)) // Only one bit set? - && (b & pieces_of_color(c))) // Is an our piece? + && (b & pieces(c))) // Is an our piece? result |= b; } return result; @@ -475,7 +475,7 @@ bool Position::move_attacks_square(Move m, Square s) const { Bitboard occ, xray; Square f = move_from(m), t = move_to(m); - assert(square_is_occupied(f)); + assert(!square_is_empty(f)); if (bit_is_set(attacks_from(piece_on(f), t), s)) return true; @@ -485,7 +485,7 @@ bool Position::move_attacks_square(Move m, Square s) const { do_move_bb(&occ, make_move_bb(f, t)); xray = ( (rook_attacks_bb(s, occ) & pieces(ROOK, QUEEN)) |(bishop_attacks_bb(s, occ) & pieces(BISHOP, QUEEN))) - & pieces_of_color(piece_color(piece_on(f))); + & pieces(piece_color(piece_on(f))); // If we have attacks we need to verify that are caused by our move // and are not already existent ones. @@ -493,19 +493,6 @@ bool Position::move_attacks_square(Move m, Square s) const { } -/// 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::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 = attackers_to(king_square(us)) & pieces_of_color(opposite_color(us)); -} - - /// Position::pl_move_is_legal() tests whether a pseudo-legal move is legal bool Position::pl_move_is_legal(Move m, Bitboard pinned) const { @@ -548,7 +535,7 @@ bool Position::pl_move_is_legal(Move m, Bitboard pinned) const { // square is attacked by the opponent. Castling moves are checked // for legality during move generation. if (piece_type(piece_on(from)) == KING) - return move_is_castle(m) || !(attackers_to(move_to(m)) & pieces_of_color(opposite_color(us))); + return move_is_castle(m) || !(attackers_to(move_to(m)) & pieces(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. @@ -558,20 +545,14 @@ bool Position::pl_move_is_legal(Move m, Bitboard pinned) const { } -/// Position::move_is_pl_slow() takes a move and tests whether the move -/// is pseudo legal. This version is not very fast and should be used -/// only in non time-critical paths. +/// Position::move_is_legal() takes a move and tests whether the move +/// is legal. This version is not very fast and should be used only +/// in non time-critical paths. -bool Position::move_is_pl_slow(const Move m) const { +bool Position::move_is_legal(const Move m) const { - MoveStack mlist[MAX_MOVES]; - MoveStack *cur, *last; - - last = in_check() ? generate(*this, mlist) - : generate(*this, mlist); - - for (cur = mlist; cur != last; cur++) - if (cur->move == m) + for (MoveList ml(*this); !ml.end(); ++ml) + if (ml.move() == m) return true; return false; @@ -593,7 +574,7 @@ bool Position::move_is_pl(const Move m) const { // Use a slower but simpler function for uncommon cases if (move_is_special(m)) - return move_is_pl_slow(m); + return move_is_legal(m); // Is not a promotion, so promotion piece must be empty if (promotion_piece_type(m) - 2 != PIECE_TYPE_NONE) @@ -681,7 +662,7 @@ bool Position::move_is_pl(const Move m) const { { Bitboard b = occupied_squares(); clear_bit(&b, from); - if (attackers_to(move_to(m), b) & pieces_of_color(opposite_color(us))) + if (attackers_to(move_to(m), b) & pieces(opposite_color(us))) return false; } else @@ -918,9 +899,9 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI // 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(&(byTypeBB[0]), move_bb); // HACK: byTypeBB[0] == occupied squares + do_move_bb(&byColorBB[us], move_bb); + do_move_bb(&byTypeBB[pt], move_bb); + do_move_bb(&byTypeBB[0], move_bb); // HACK: byTypeBB[0] == occupied squares board[to] = board[from]; board[from] = PIECE_NONE; @@ -957,8 +938,8 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI assert(promotion >= KNIGHT && promotion <= QUEEN); // Insert promoted piece instead of pawn - clear_bit(&(byTypeBB[PAWN]), to); - set_bit(&(byTypeBB[promotion]), to); + clear_bit(&byTypeBB[PAWN], to); + set_bit(&byTypeBB[promotion], to); board[to] = make_piece(us, promotion); // Update piece counts @@ -1010,7 +991,7 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI if (moveIsCheck) { if (ep | pm) - st->checkersBB = attackers_to(king_square(them)) & pieces_of_color(us); + st->checkersBB = attackers_to(king_square(them)) & pieces(us); else { // Direct checks @@ -1067,9 +1048,9 @@ void Position::do_capture_move(Key& key, PieceType capture, Color them, Square t st->npMaterial[them] -= PieceValueMidgame[capture]; // Remove captured piece - clear_bit(&(byColorBB[them]), capsq); - clear_bit(&(byTypeBB[capture]), capsq); - clear_bit(&(byTypeBB[0]), capsq); + clear_bit(&byColorBB[them], capsq); + clear_bit(&byTypeBB[capture], capsq); + clear_bit(&byTypeBB[0], capsq); // Update hash key key ^= zobrist[them][capture][capsq]; @@ -1113,12 +1094,9 @@ void Position::do_castle_move(Move m) { Color us = side_to_move(); Color them = opposite_color(us); - // Reset capture field - st->capturedType = PIECE_TYPE_NONE; - // Find source squares for king and rook Square kfrom = move_from(m); - Square rfrom = move_to(m); // HACK: See comment at beginning of function + Square rfrom = move_to(m); Square kto, rto; assert(piece_on(kfrom) == make_piece(us, KING)); @@ -1129,28 +1107,30 @@ void Position::do_castle_move(Move m) { { kto = relative_square(us, SQ_G1); rto = relative_square(us, SQ_F1); - } else { // O-O-O + } + else // O-O-O + { kto = relative_square(us, SQ_C1); rto = relative_square(us, SQ_D1); } - // 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 + // Remove pieces from source squares + clear_bit(&byColorBB[us], kfrom); + clear_bit(&byTypeBB[KING], kfrom); + clear_bit(&byTypeBB[0], kfrom); + clear_bit(&byColorBB[us], rfrom); + clear_bit(&byTypeBB[ROOK], rfrom); + clear_bit(&byTypeBB[0], rfrom); + + // Put pieces on destination squares + set_bit(&byColorBB[us], kto); + set_bit(&byTypeBB[KING], kto); + set_bit(&byTypeBB[0], kto); + set_bit(&byColorBB[us], rto); + set_bit(&byTypeBB[ROOK], rto); + set_bit(&byTypeBB[0], rto); + + // Update board Piece king = make_piece(us, KING); Piece rook = make_piece(us, ROOK); board[kfrom] = board[rfrom] = PIECE_NONE; @@ -1160,10 +1140,13 @@ void Position::do_castle_move(Move m) { // Update piece lists pieceList[us][KING][index[kfrom]] = kto; pieceList[us][ROOK][index[rfrom]] = rto; - int tmp = index[rfrom]; // In Chess960 could be rto == kfrom + int tmp = index[rfrom]; // In Chess960 could be kto == rfrom index[kto] = index[kfrom]; index[rto] = tmp; + // Reset capture field + st->capturedType = PIECE_TYPE_NONE; + // Update incremental scores st->value += pst_delta(king, kfrom, kto); st->value += pst_delta(rook, rfrom, rto); @@ -1188,7 +1171,7 @@ void Position::do_castle_move(Move m) { st->rule50 = 0; // Update checkers BB - st->checkersBB = attackers_to(king_square(them)) & pieces_of_color(us); + st->checkersBB = attackers_to(king_square(them)) & pieces(us); // Finish sideToMove = opposite_color(sideToMove); @@ -1239,8 +1222,8 @@ void Position::undo_move(Move m) { assert(piece_on(to) == make_piece(us, promotion)); // Replace promoted piece with a pawn - clear_bit(&(byTypeBB[promotion]), to); - set_bit(&(byTypeBB[PAWN]), to); + clear_bit(&byTypeBB[promotion], to); + set_bit(&byTypeBB[PAWN], to); // Update piece counts pieceCount[us][promotion]--; @@ -1257,9 +1240,9 @@ 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(&(byTypeBB[0]), move_bb); // HACK: byTypeBB[0] == occupied squares + do_move_bb(&byColorBB[us], move_bb); + do_move_bb(&byTypeBB[pt], move_bb); + do_move_bb(&byTypeBB[0], move_bb); // HACK: byTypeBB[0] == occupied squares board[from] = make_piece(us, pt); board[to] = PIECE_NONE; @@ -1279,9 +1262,9 @@ void Position::undo_move(Move m) { assert(!ep || square_is_empty(capsq)); // Restore the captured piece - set_bit(&(byColorBB[them]), capsq); - set_bit(&(byTypeBB[st->capturedType]), capsq); - set_bit(&(byTypeBB[0]), capsq); + set_bit(&byColorBB[them], capsq); + set_bit(&byTypeBB[st->capturedType], capsq); + set_bit(&byTypeBB[0], capsq); board[capsq] = make_piece(them, st->capturedType); @@ -1311,13 +1294,13 @@ void Position::undo_castle_move(Move m) { assert(move_is_castle(m)); // When we have arrived here, some work has already been done by - // Position::undo_move. In particular, the side to move has been switched, + // Position::undo_move. In particular, the side to move has been switched, // so the code below is correct. Color us = side_to_move(); // Find source squares for king and rook Square kfrom = move_from(m); - Square rfrom = move_to(m); // HACK: See comment at beginning of function + Square rfrom = move_to(m); Square kto, rto; // Find destination squares for king and rook @@ -1325,7 +1308,9 @@ void Position::undo_castle_move(Move m) { { kto = relative_square(us, SQ_G1); rto = relative_square(us, SQ_F1); - } else { // O-O-O + } + else // O-O-O + { kto = relative_square(us, SQ_C1); rto = relative_square(us, SQ_D1); } @@ -1333,26 +1318,28 @@ void Position::undo_castle_move(Move m) { assert(piece_on(kto) == make_piece(us, KING)); assert(piece_on(rto) == make_piece(us, ROOK)); - // 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 + // Remove pieces from destination squares + clear_bit(&byColorBB[us], kto); + clear_bit(&byTypeBB[KING], kto); + clear_bit(&byTypeBB[0], kto); + clear_bit(&byColorBB[us], rto); + clear_bit(&byTypeBB[ROOK], rto); + clear_bit(&byTypeBB[0], rto); + + // Put pieces on source squares + set_bit(&byColorBB[us], kfrom); + set_bit(&byTypeBB[KING], kfrom); + set_bit(&byTypeBB[0], kfrom); + set_bit(&byColorBB[us], rfrom); + set_bit(&byTypeBB[ROOK], rfrom); + set_bit(&byTypeBB[0], rfrom); // Update board - board[rto] = board[kto] = PIECE_NONE; - board[rfrom] = make_piece(us, ROOK); - board[kfrom] = make_piece(us, KING); + Piece king = make_piece(us, KING); + Piece rook = make_piece(us, ROOK); + board[kto] = board[rto] = PIECE_NONE; + board[kfrom] = king; + board[rfrom] = rook; // Update piece lists pieceList[us][KING][index[kto]] = kfrom; @@ -1491,7 +1478,7 @@ int Position::see(Move m) const { // If the opponent has no attackers we are finished stm = opposite_color(piece_color(piece_on(from))); - stmAttackers = attackers & pieces_of_color(stm); + stmAttackers = attackers & pieces(stm); if (!stmAttackers) return PieceValueMidgame[capturedType]; @@ -1529,7 +1516,7 @@ int Position::see(Move m) const { // move before beginning the next iteration. capturedType = pt; stm = opposite_color(stm); - stmAttackers = attackers & pieces_of_color(stm); + stmAttackers = attackers & pieces(stm); // Stop before processing a king capture if (capturedType == KING && stmAttackers) @@ -1606,7 +1593,7 @@ Key Position::compute_key() const { Key result = zobCastle[st->castleRights]; for (Square s = SQ_A1; s <= SQ_H8; s++) - if (square_is_occupied(s)) + if (!square_is_empty(s)) result ^= zobrist[piece_color(piece_on(s))][piece_type(piece_on(s))][s]; if (ep_square() != SQ_NONE) @@ -1731,8 +1718,7 @@ template bool Position::is_draw() const; bool Position::is_mate() const { - MoveStack moves[MAX_MOVES]; - return in_check() && generate(*this, moves) == moves; + return in_check() && !MoveList(*this).size(); } @@ -1763,11 +1749,11 @@ void Position::init() { for (Square s = SQ_A1; s <= SQ_H8; s++) for (Piece p = WP; p <= WK; p++) - PieceSquareTable[p][s] = make_score(MgPST[p][s], EgPST[p][s]); + pieceSquareTable[p][s] = make_score(MgPST[p][s], EgPST[p][s]); for (Square s = SQ_A1; s <= SQ_H8; s++) for (Piece p = BP; p <= BK; p++) - PieceSquareTable[p][s] = -PieceSquareTable[p-8][flip_square(s)]; + pieceSquareTable[p][s] = -pieceSquareTable[p-8][flip_square(s)]; } @@ -1807,7 +1793,7 @@ void Position::flip() { st->epSquare = flip_square(pos.st->epSquare); // Checkers - find_checkers(); + st->checkersBB = attackers_to(king_square(sideToMove)) & pieces(opposite_color(sideToMove)); // Hash keys st->key = compute_key(); @@ -1881,7 +1867,7 @@ bool Position::is_ok(int* failedStep) const { Color us = side_to_move(); Color them = opposite_color(us); Square ksq = king_square(them); - if (attackers_to(ksq) & pieces_of_color(us)) + if (attackers_to(ksq) & pieces(us)) return false; } @@ -1895,12 +1881,12 @@ bool Position::is_ok(int* failedStep) const { if (debugBitboards) { // The intersection of the white and black pieces must be empty - if ((pieces_of_color(WHITE) & pieces_of_color(BLACK)) != EmptyBoardBB) + if ((pieces(WHITE) & pieces(BLACK)) != EmptyBoardBB) return false; // The union of the white and black pieces must be equal to all // occupied squares - if ((pieces_of_color(WHITE) | pieces_of_color(BLACK)) != occupied_squares()) + if ((pieces(WHITE) | pieces(BLACK)) != occupied_squares()) return false; // Separate piece type bitboards must have empty intersections @@ -1965,10 +1951,10 @@ 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)) != make_piece(c, pt)) + if (piece_on(piece_list(c, pt)[i]) != make_piece(c, pt)) return false; - if (index[piece_list(c, pt, i)] != i) + if (index[piece_list(c, pt)[i]] != i) return false; }