////
#include <cassert>
-#include <iostream>
+#include <cstring>
#include <fstream>
+#include <iostream>
#include "mersenne.h"
#include "movegen.h"
castleRightsMask[make_square(initialQRFile, RANK_8)] ^= BLACK_OOO;
find_checkers();
+ find_pinned();
st->key = compute_key();
st->pawnKey = compute_pawn_key();
}
-/// Position:pinned_pieces() returns a bitboard of all pinned (against the
-/// king) pieces for the given color.
-Bitboard Position::pinned_pieces(Color c) const {
-
- if (st->pinned[c] != ~EmptyBoardBB)
- return st->pinned[c];
-
- Bitboard p1, p2;
- Square ksq = king_square(c);
- st->pinned[c] = hidden_checks<ROOK, true>(c, ksq, p1) | hidden_checks<BISHOP, true>(c, ksq, p2);
- st->pinners[c] = p1 | p2;
- return st->pinned[c];
-}
-
-Bitboard Position::pinned_pieces(Color c, Bitboard& p) const {
-
- if (st->pinned[c] == ~EmptyBoardBB)
- pinned_pieces(c);
-
- p = st->pinners[c];
- return st->pinned[c];
-}
-
-Bitboard Position::discovered_check_candidates(Color c) const {
-
- if (st->dcCandidates[c] != ~EmptyBoardBB)
- return st->dcCandidates[c];
-
- Bitboard dummy;
- Square ksq = king_square(opposite_color(c));
- st->dcCandidates[c] = hidden_checks<ROOK, false>(c, ksq, dummy) | hidden_checks<BISHOP, false>(c, ksq, dummy);
- return st->dcCandidates[c];
-}
-
/// Position:hidden_checks<>() 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.
+/// Note that checkersBB bitboard must be already updated.
template<PieceType Piece, bool FindPinned>
Bitboard Position::hidden_checks(Color c, Square ksq, Bitboard& pinners) const {
/// Position::find_checkers() computes the checkersBB bitboard, which
-/// contains a nonzero bit for each checking piece (0, 1 or 2). It
+/// contains a nonzero bit for each checking piece (0, 1 or 2). It
/// currently works by calling Position::attacks_to, which is probably
/// inefficient. Consider rewriting this function to use the last move
/// played, like in non-bitboard versions of Glaurung.
}
+/// Position:find_pinned() computes the pinned, pinners and dcCandidates
+/// bitboards for both colors. Bitboard checkersBB must be already updated.
+
+void Position::find_pinned() {
+
+ Bitboard p1, p2;
+ Square ksq;
+
+ for (Color c = WHITE; c <= BLACK; c++)
+ {
+ ksq = king_square(c);
+ st->pinned[c] = hidden_checks<ROOK, true>(c, ksq, p1) | hidden_checks<BISHOP, true>(c, ksq, p2);
+ st->pinners[c] = p1 | p2;
+ ksq = king_square(opposite_color(c));
+ st->dcCandidates[c] = hidden_checks<ROOK, false>(c, ksq, p1) | hidden_checks<BISHOP, false>(c, ksq, p2);
+ }
+}
+
+
/// Position::pl_move_is_legal() tests whether a pseudo-legal move is legal
bool Position::pl_move_is_legal(Move m) const {
}
+/// 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.
assert(is_ok());
assert(move_is_ok(m));
- // Get now the current (pre-move) dc candidates that we will use
+ // 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 the old state to our new StateInfo object (except the
- // captured piece, which is taken care of later.
- // TODO do not copy pinners and checkersBB because are recalculated
- // anyway.
- newSt = *st;
- newSt.capture = NO_PIECE_TYPE;
- newSt.previous = st;
+ // 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);
st = &newSt;
// Save the current key to the history[] array, in order to be able to
// case of non-reversible moves is taken care of later.
st->rule50++;
- // Reset pinned bitboard and its friends
- for (Color c = WHITE; c <= BLACK; c++)
- st->pinned[c] = st->dcCandidates[c] = ~EmptyBoardBB;
-
if (move_is_castle(m))
do_castle_move(m);
else if (move_promotion(m))
}
// Finish
+ find_pinned();
st->key ^= zobSideToMove;
sideToMove = opposite_color(sideToMove);
gamePly++;
/// Position::see() is a static exchange evaluator: It tries to estimate the
-/// material gain or loss resulting from a move. There are three versions of
+/// material gain or loss resulting from a move. There are three versions of
/// this function: One which takes a destination square as input, one takes a
/// move, and one which takes a 'from' and a 'to' square. The function does
/// not yet understand promotions captures.
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);
| (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;
swapList[0] = seeValues[capture];
do {
- // Locate the least valuable attacker for the side to move. The loop
+ // Locate the least valuable attacker for the side to move. The loop
// below looks like it is potentially infinite, but it isn't. We know
// that the side to move still has at least one attacker left.
for (pt = PAWN; !(attackers & pieces_of_color_and_type(c, pt)); pt++)
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)))
{
void Position::clear() {
st = &startState;
- st->previous = NULL; // We should never dereference this
+ memset(st, 0, sizeof(StateInfo));
+ st->epSquare = SQ_NONE;
+
+ memset(index, 0, sizeof(int) * 64);
+ memset(byColorBB, 0, sizeof(Bitboard) * 2);
for (int i = 0; i < 64; i++)
- {
board[i] = EMPTY;
- index[i] = 0;
- }
-
- for (int i = 0; i < 2; i++)
- byColorBB[i] = EmptyBoardBB;
for (int i = 0; i < 7; i++)
{
pieceList[0][i][j] = pieceList[1][i][j] = SQ_NONE;
}
- st->checkersBB = EmptyBoardBB;
- for (Color c = WHITE; c <= BLACK; c++)
- st->pinners[c] = st->pinned[c] = st->dcCandidates[c] = ~EmptyBoardBB;
-
sideToMove = WHITE;
gamePly = 0;
initialKFile = FILE_E;
initialKRFile = FILE_H;
initialQRFile = FILE_A;
-
- st->lastMove = MOVE_NONE;
- st->castleRights = NO_CASTLES;
- st->epSquare = SQ_NONE;
- st->rule50 = 0;
- st->previous = NULL;
}
projects / stockfish / blobdiff