/// king) pieces for the given color.
Bitboard Position::pinned_pieces(Color c) const {
+ if (pinned[c] != ~EmptyBoardBB)
+ return pinned[c];
+
+ Bitboard p1, p2;
Square ksq = king_square(c);
- return hidden_checks<ROOK, true>(c, ksq) | hidden_checks<BISHOP, true>(c, ksq);
+ pinned[c] = hidden_checks<ROOK, true>(c, ksq, p1) | hidden_checks<BISHOP, true>(c, ksq, p2);
+ pinners[c] = p1 | p2;
+ return pinned[c];
}
+Bitboard Position::pinned_pieces(Color c, Bitboard& p) const {
+
+ if (pinned[c] == ~EmptyBoardBB)
+ pinned_pieces(c);
-/// Position:discovered_check_candidates() returns a bitboard containing all
-/// pieces for the given side which are candidates for giving a discovered
-/// check. The code is almost the same as the function for finding pinned
-/// pieces.
+ p = pinners[c];
+ return pinned[c];
+}
Bitboard Position::discovered_check_candidates(Color c) const {
+ if (dcCandidates[c] != ~EmptyBoardBB)
+ return dcCandidates[c];
+
+ Bitboard dummy;
Square ksq = king_square(opposite_color(c));
- return hidden_checks<ROOK, false>(c, ksq) | hidden_checks<BISHOP, false>(c, ksq);
+ dcCandidates[c] = hidden_checks<ROOK, false>(c, ksq, dummy) | hidden_checks<BISHOP, false>(c, ksq, dummy);
+ return 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.
template<PieceType Piece, bool FindPinned>
-Bitboard Position::hidden_checks(Color c, Square ksq) const {
+Bitboard Position::hidden_checks(Color c, Square ksq, Bitboard& pinners) const {
Square s;
Bitboard sliders, result = EmptyBoardBB;
// Pinners are sliders, not checkers, that give check when
// candidate pinned are removed.
- Bitboard pinners = (FindPinned ? sliders & ~checkersBB : sliders);
+ pinners = (FindPinned ? sliders & ~checkersBB : sliders);
if (Piece == ROOK)
pinners &= rook_attacks_bb(ksq, occupied_squares() ^ candidate_pinned);
// Finally for each pinner find the corresponding pinned piece (if same color of king)
// or discovery checker (if opposite color) among the candidates.
- while (pinners)
+ Bitboard p = pinners;
+ while (p)
{
- s = pop_1st_bit(&pinners);
+ s = pop_1st_bit(&p);
result |= (squares_between(s, ksq) & candidate_pinned);
}
}
+ else
+ pinners = EmptyBoardBB;
+
return result;
}
/// Position::piece_attacks_square() tests whether the piece on square f
/// attacks square t.
-bool Position::piece_attacks_square(Square f, Square t) const {
+bool Position::piece_attacks_square(Piece p, Square f, Square t) const {
assert(square_is_ok(f));
assert(square_is_ok(t));
- switch (piece_on(f))
+ switch (p)
{
case WP: return pawn_attacks_square(WHITE, f, t);
case BP: return pawn_attacks_square(BLACK, f, t);
assert(move_is_ok(m));
assert(square_is_ok(s));
- bool is_attack;
Square f = move_from(m), t = move_to(m);
assert(square_is_occupied(f));
- switch (piece_on(f))
- {
- case WP: is_attack = pawn_attacks_square(WHITE, t, s); break;
- case BP: is_attack = pawn_attacks_square(BLACK, t, s); break;
- case WN: case BN: is_attack = piece_attacks_square<KNIGHT>(t, s); break;
- case WB: case BB: is_attack = piece_attacks_square<BISHOP>(t, s); break;
- case WR: case BR: is_attack = piece_attacks_square<ROOK>(t, s); break;
- case WQ: case BQ: is_attack = piece_attacks_square<QUEEN>(t, s); break;
- case WK: case BK: is_attack = piece_attacks_square<KING>(t, s); break;
- default: break;
- }
-
- if (is_attack)
+ if (piece_attacks_square(piece_on(f), t, s))
return true;
// Move the piece and scan for X-ray attacks behind it
Square ksq = king_square(us);
assert(color_of_piece_on(from) == us);
- assert(piece_on(ksq) == king_of_color(us));
+ assert(piece_on(ksq) == piece_of_color_and_type(us, KING));
// En passant captures are a tricky special case. Because they are
// rather uncommon, we do it simply by testing whether the king is attacked
Bitboard b = occupied_squares();
assert(to == ep_square());
- assert(piece_on(from) == pawn_of_color(us));
- assert(piece_on(capsq) == pawn_of_color(them));
+ assert(piece_on(from) == piece_of_color_and_type(us, PAWN));
+ assert(piece_on(capsq) == piece_of_color_and_type(them, PAWN));
assert(piece_on(to) == EMPTY);
clear_bit(&b, from);
Square ksq = king_square(them);
assert(color_of_piece_on(from) == us);
- assert(piece_on(ksq) == king_of_color(them));
+ assert(piece_on(ksq) == piece_of_color_and_type(them, KING));
// Proceed according to the type of the moving piece
switch (type_of_piece_on(from))
u.mgValue = mgValue;
u.egValue = egValue;
u.capture = NO_PIECE_TYPE;
+
+ for (Color c = WHITE; c <= BLACK; c++)
+ {
+ u.pinners[c] = pinners[c];
+ u.pinned[c] = pinned[c];
+ u.dcCandidates[c] = dcCandidates[c];
+ }
}
mgValue = u.mgValue;
egValue = u.egValue;
// u.capture is restored in undo_move()
+
+ for (Color c = WHITE; c <= BLACK; c++)
+ {
+ pinners[c] = u.pinners[c];
+ pinned[c] = u.pinned[c];
+ dcCandidates[c] = u.dcCandidates[c];
+ }
}
do_move(m, u, discovered_check_candidates(side_to_move()));
}
-void Position::do_move(Move m, UndoInfo& u, Bitboard dcCandidates) {
+void Position::do_move(Move m, UndoInfo& u, Bitboard dc) {
assert(is_ok());
assert(move_is_ok(m));
// case of non-reversible moves is taken care of later.
rule50++;
+ // Reset pinned bitboard and its friends
+ for (Color c = WHITE; c <= BLACK; c++)
+ pinners[c] = pinned[c] = dcCandidates[c] = ~EmptyBoardBB;
+
if (move_is_castle(m))
do_castle_move(m);
else if (move_promotion(m))
Square ksq = king_square(them);
switch (piece)
{
- case PAWN: update_checkers<PAWN>(&checkersBB, ksq, from, to, dcCandidates); break;
- case KNIGHT: update_checkers<KNIGHT>(&checkersBB, ksq, from, to, dcCandidates); break;
- case BISHOP: update_checkers<BISHOP>(&checkersBB, ksq, from, to, dcCandidates); break;
- case ROOK: update_checkers<ROOK>(&checkersBB, ksq, from, to, dcCandidates); break;
- case QUEEN: update_checkers<QUEEN>(&checkersBB, ksq, from, to, dcCandidates); break;
- case KING: update_checkers<KING>(&checkersBB, ksq, from, to, dcCandidates); break;
+ case PAWN: update_checkers<PAWN>(&checkersBB, ksq, from, to, dc); break;
+ case KNIGHT: update_checkers<KNIGHT>(&checkersBB, ksq, from, to, dc); break;
+ case BISHOP: update_checkers<BISHOP>(&checkersBB, ksq, from, to, dc); break;
+ case ROOK: update_checkers<ROOK>(&checkersBB, ksq, from, to, dc); break;
+ case QUEEN: update_checkers<QUEEN>(&checkersBB, ksq, from, to, dc); break;
+ case KING: update_checkers<KING>(&checkersBB, ksq, from, to, dc); break;
default: assert(false); break;
}
}
Square rfrom = move_to(m); // HACK: See comment at beginning of function
Square kto, rto;
- assert(piece_on(kfrom) == king_of_color(us));
- assert(piece_on(rfrom) == rook_of_color(us));
+ assert(piece_on(kfrom) == piece_of_color_and_type(us, KING));
+ assert(piece_on(rfrom) == piece_of_color_and_type(us, ROOK));
// Find destination squares for king and rook
if (rfrom > kfrom) // O-O
// Update board array
board[kfrom] = board[rfrom] = EMPTY;
- board[kto] = king_of_color(us);
- board[rto] = rook_of_color(us);
+ board[kto] = piece_of_color_and_type(us, KING);
+ board[rto] = piece_of_color_and_type(us, ROOK);
// Update king square
kingSquare[us] = kto;
to = move_to(m);
assert(relative_rank(us, to) == RANK_8);
- assert(piece_on(from) == pawn_of_color(us));
+ assert(piece_on(from) == piece_of_color_and_type(us, PAWN));
assert(color_of_piece_on(to) == them || square_is_empty(to));
capture = type_of_piece_on(to);
assert(to == epSquare);
assert(relative_rank(us, to) == RANK_6);
assert(piece_on(to) == EMPTY);
- assert(piece_on(from) == pawn_of_color(us));
- assert(piece_on(capsq) == pawn_of_color(them));
+ assert(piece_on(from) == piece_of_color_and_type(us, PAWN));
+ assert(piece_on(capsq) == piece_of_color_and_type(them, PAWN));
// Remove captured piece
clear_bit(&(byColorBB[them]), capsq);
rto = relative_square(us, SQ_D1);
}
- assert(piece_on(kto) == king_of_color(us));
- assert(piece_on(rto) == rook_of_color(us));
+ assert(piece_on(kto) == piece_of_color_and_type(us, KING));
+ assert(piece_on(rto) == piece_of_color_and_type(us, ROOK));
// Remove pieces from destination squares
clear_bit(&(byColorBB[us]), kto);
// Update board
board[rto] = board[kto] = EMPTY;
- board[rfrom] = rook_of_color(us);
- board[kfrom] = king_of_color(us);
+ board[rfrom] = piece_of_color_and_type(us, ROOK);
+ board[kfrom] = piece_of_color_and_type(us, KING);
// Update king square
kingSquare[us] = kfrom;
set_bit(&(byColorBB[us]), from);
set_bit(&(byTypeBB[PAWN]), from);
set_bit(&(byTypeBB[0]), from); // HACK: byTypeBB[0] == occupied squares
- board[from] = pawn_of_color(us);
+ board[from] = piece_of_color_and_type(us, PAWN);
// Update material
npMaterial[us] -= piece_value_midgame(promotion);
assert(to == ep_square());
assert(relative_rank(us, to) == RANK_6);
- assert(piece_on(to) == pawn_of_color(us));
+ assert(piece_on(to) == piece_of_color_and_type(us, PAWN));
assert(piece_on(from) == EMPTY);
assert(piece_on(capsq) == EMPTY);
set_bit(&(byColorBB[them]), capsq);
set_bit(&(byTypeBB[PAWN]), capsq);
set_bit(&(byTypeBB[0]), capsq);
- board[capsq] = pawn_of_color(them);
+ board[capsq] = piece_of_color_and_type(them, PAWN);
// Remove moving piece from destination square
clear_bit(&(byColorBB[us]), to);
set_bit(&(byColorBB[us]), from);
set_bit(&(byTypeBB[PAWN]), from);
set_bit(&(byTypeBB[0]), from);
- board[from] = pawn_of_color(us);
+ board[from] = piece_of_color_and_type(us, PAWN);
// Update piece list:
pieceList[us][PAWN][index[to]] = from;
}
checkersBB = EmptyBoardBB;
+ for (Color c = WHITE; c <= BLACK; c++)
+ pinners[c] = pinned[c] = dcCandidates[c] = ~EmptyBoardBB;
lastMove = MOVE_NONE;
projects / stockfish / blobdiff