while (pinners)
{
- b = squares_between(ksq, pop_1st_bit(&pinners)) & occupied_squares();
+ b = squares_between(ksq, pop_1st_bit(&pinners)) & pieces();
if (b && single_bit(b) && (b & pieces(sideToMove)))
result |= b;
assert(!square_is_empty(from));
// Update occupancy as if the piece is moving
- occ = occupied_squares() ^ from ^ to;
+ occ = pieces() ^ from ^ to;
// The piece moved in 'to' attacks the square 's' ?
if (attacks_from(piece, to, occ) & s)
Square to = to_sq(m);
Square capsq = to + pawn_push(them);
Square ksq = king_square(us);
- Bitboard b = (occupied_squares() ^ from ^ capsq) | to;
+ Bitboard b = (pieces() ^ from ^ capsq) | to;
assert(to == ep_square());
assert(piece_moved(m) == make_piece(us, PAWN));
}
// 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))
+ else if (attackers_to(to, pieces() ^ from) & pieces(~us))
return false;
}
// Promotion with check ?
if (is_promotion(m))
- return attacks_from(Piece(promotion_type(m)), to, occupied_squares() ^ from) & ksq;
+ return attacks_from(Piece(promotion_type(m)), to, pieces() ^ from) & ksq;
// En passant capture with check ? We have already handled the case
// of direct checks and ordinary discovered check, the only case we
if (is_enpassant(m))
{
Square capsq = make_square(file_of(to), rank_of(from));
- Bitboard b = (occupied_squares() ^ from ^ capsq) | to;
+ Bitboard b = (pieces() ^ from ^ capsq) | to;
return (attacks_bb< ROOK>(ksq, b) & pieces( ROOK, QUEEN, us))
| (attacks_bb<BISHOP>(ksq, b) & pieces(BISHOP, QUEEN, us));
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;
+ Bitboard b = (pieces() ^ kfrom ^ rfrom) | rto | kto;
return attacks_bb<ROOK>(rto, b) & ksq;
}
st->npMaterial[them] -= PieceValueMidgame[capture];
// Remove the captured piece
- byColorBB[them] ^= capsq;
+ byTypeBB[ALL_PIECES] ^= capsq;
byTypeBB[capture] ^= capsq;
- occupied ^= capsq;
+ byColorBB[them] ^= capsq;
// Update piece list, move the last piece at index[capsq] position and
// shrink the list.
// Move the piece
Bitboard from_to_bb = SquareBB[from] | SquareBB[to];
- byColorBB[us] ^= from_to_bb;
+ byTypeBB[ALL_PIECES] ^= from_to_bb;
byTypeBB[pt] ^= from_to_bb;
- occupied ^= from_to_bb;
+ byColorBB[us] ^= from_to_bb;
board[to] = board[from];
board[from] = NO_PIECE;
// Put the piece back at the source square
Bitboard from_to_bb = SquareBB[from] | SquareBB[to];
- byColorBB[us] ^= from_to_bb;
+ byTypeBB[ALL_PIECES] ^= from_to_bb;
byTypeBB[pt] ^= from_to_bb;
- occupied ^= from_to_bb;
+ byColorBB[us] ^= from_to_bb;
board[from] = board[to];
board[to] = NO_PIECE;
}
// Restore the captured piece
- byColorBB[them] |= capsq;
+ byTypeBB[ALL_PIECES] |= capsq;
byTypeBB[capture] |= capsq;
- occupied |= capsq;
+ byColorBB[them] |= capsq;
board[capsq] = make_piece(them, capture);
assert(piece_on(rfrom) == make_piece(us, ROOK));
// Remove pieces from source squares
- byColorBB[us] ^= kfrom;
+ byTypeBB[ALL_PIECES] ^= kfrom;
byTypeBB[KING] ^= kfrom;
- occupied ^= kfrom;
- byColorBB[us] ^= rfrom;
+ byColorBB[us] ^= kfrom;
+ byTypeBB[ALL_PIECES] ^= rfrom;
byTypeBB[ROOK] ^= rfrom;
- occupied ^= rfrom;
+ byColorBB[us] ^= rfrom;
// Put pieces on destination squares
- byColorBB[us] |= kto;
+ byTypeBB[ALL_PIECES] |= kto;
byTypeBB[KING] |= kto;
- occupied |= kto;
- byColorBB[us] |= rto;
+ byColorBB[us] |= kto;
+ byTypeBB[ALL_PIECES] |= rto;
byTypeBB[ROOK] |= rto;
- occupied |= rto;
+ byColorBB[us] |= rto;
// Update board
Piece king = make_piece(us, KING);
from = from_sq(m);
to = to_sq(m);
capturedType = type_of(piece_on(to));
- occ = occupied_squares();
+ occ = pieces();
// Handle en passant moves
if (is_enpassant(m))
index[s] = pieceCount[c][pt]++;
pieceList[c][pt][index[s]] = s;
+ byTypeBB[ALL_PIECES] |= s;
byTypeBB[pt] |= s;
byColorBB[c] |= s;
- occupied |= s;
}
// The union of the white and black pieces must be equal to all
// occupied squares
- if ((pieces(WHITE) | pieces(BLACK)) != occupied_squares())
+ if ((pieces(WHITE) | pieces(BLACK)) != pieces())
return false;
// Separate piece type bitboards must have empty intersections