CACHE_LINE_ALIGNMENT
-Score psq[COLOR_NB][PIECE_TYPE_NB][SQUARE_NB];
Value PieceValue[PHASE_NB][PIECE_NB] = {
{ VALUE_ZERO, PawnValueMg, KnightValueMg, BishopValueMg, RookValueMg, QueenValueMg },
{ VALUE_ZERO, PawnValueEg, KnightValueEg, BishopValueEg, RookValueEg, QueenValueEg } };
+static Score psq[COLOR_NB][PIECE_TYPE_NB][SQUARE_NB];
+
namespace Zobrist {
Key psq[COLOR_NB][PIECE_TYPE_NB][SQUARE_NB];
Key enpassant[FILE_NB];
- Key castling[CASTLING_FLAG_NB];
+ Key castling[CASTLING_RIGHT_NB];
Key side;
Key exclusion;
}
else
continue;
- set_castling_flag(c, rsq);
+ set_castling_right(c, rsq);
}
// 4. En passant square. Ignore if no pawn capture is possible
}
-/// Position::set_castling_flag() is a helper function used to set castling
-/// flags given the corresponding color and the rook starting square.
+/// Position::set_castling_right() is a helper function used to set castling
+/// rights given the corresponding color and the rook starting square.
-void Position::set_castling_flag(Color c, Square rfrom) {
+void Position::set_castling_right(Color c, Square rfrom) {
Square kfrom = king_square(c);
CastlingSide cs = kfrom < rfrom ? KING_SIDE : QUEEN_SIDE;
- CastlingFlag cf = (c | cs);
+ CastlingRight cr = (c | cs);
- st->castlingFlags |= cf;
- castlingFlagsMask[kfrom] |= cf;
- castlingFlagsMask[rfrom] |= cf;
- castlingRookSquare[cf] = rfrom;
+ st->castlingRights |= cr;
+ castlingRightsMask[kfrom] |= cr;
+ castlingRightsMask[rfrom] |= cr;
+ castlingRookSquare[cr] = rfrom;
Square kto = relative_square(c, cs == KING_SIDE ? SQ_G1 : SQ_C1);
Square rto = relative_square(c, cs == KING_SIDE ? SQ_F1 : SQ_D1);
for (Square s = std::min(rfrom, rto); s <= std::max(rfrom, rto); ++s)
if (s != kfrom && s != rfrom)
- castlingPath[cf] |= s;
+ castlingPath[cr] |= s;
for (Square s = std::min(kfrom, kto); s <= std::max(kfrom, kto); ++s)
if (s != kfrom && s != rfrom)
- castlingPath[cf] |= s;
+ castlingPath[cr] |= s;
}
// Handle the special case of a pawn move
if (type_of(pc) == PAWN)
{
- // Move direction must be compatible with pawn color
- int direction = to - from;
- if ((us == WHITE) != (direction > 0))
- return false;
-
// We have already handled promotion moves, so destination
// cannot be on the 8th/1st rank.
- if (rank_of(to) == RANK_8 || rank_of(to) == RANK_1)
+ if (rank_of(to) == relative_rank(us, RANK_8))
return false;
- // Proceed according to the square delta between the origin and
- // destination squares.
- switch (direction)
- {
- case DELTA_NW:
- case DELTA_NE:
- case DELTA_SW:
- case DELTA_SE:
- // Capture. The destination square must be occupied by an enemy
- // piece (en passant captures was handled earlier).
- if (piece_on(to) == NO_PIECE || color_of(piece_on(to)) != ~us)
- return false;
+ if ( !(attacks_from<PAWN>(from, us) & pieces(~us) & to) // Not a capture
- // From and to files must be one file apart, avoids a7h5
- if (abs(file_of(from) - file_of(to)) != 1)
- return false;
- break;
+ && !((from + pawn_push(us) == to) && empty(to)) // Not a single push
- case DELTA_N:
- case DELTA_S:
- // Pawn push. The destination square must be empty.
- if (!empty(to))
+ && !( (from + 2 * pawn_push(us) == to) // Not a double push
+ && (rank_of(from) == relative_rank(us, RANK_2))
+ && empty(to)
+ && empty(to - pawn_push(us))))
return false;
- break;
-
- case DELTA_NN:
- // Double white pawn push. The destination square must be on the fourth
- // rank, and both the destination square and the square between the
- // source and destination squares must be empty.
- if ( rank_of(to) != RANK_4
- || !empty(to)
- || !empty(from + DELTA_N))
- return false;
- break;
-
- case DELTA_SS:
- // Double black pawn push. The destination square must be on the fifth
- // rank, and both the destination square and the square between the
- // source and destination squares must be empty.
- if ( rank_of(to) != RANK_5
- || !empty(to)
- || !empty(from + DELTA_S))
- return false;
- break;
-
- default:
- return false;
- }
}
else if (!(attacks_from(pc, from) & to))
return false;
// Evasions generator already takes care to avoid some kind of illegal moves
- // and pl_move_is_legal() relies on this. We therefore have to take care that
- // the same kind of moves are filtered out here.
+ // and legal() relies on this. We therefore have to take care that the same
+ // kind of moves are filtered out here.
if (checkers())
{
if (type_of(pc) != KING)
&& !aligned(from, to, ci.ksq))
return true;
- // Can we skip the ugly special cases?
- if (type_of(m) == NORMAL)
- return false;
-
switch (type_of(m))
{
+ case NORMAL:
+ return false;
+
case PROMOTION:
return attacks_bb(Piece(promotion_type(m)), to, pieces() ^ from) & ci.ksq;
st->epSquare = SQ_NONE;
}
- // Update castling flags if needed
- if (st->castlingFlags && (castlingFlagsMask[from] | castlingFlagsMask[to]))
+ // Update castling rights if needed
+ if (st->castlingRights && (castlingRightsMask[from] | castlingRightsMask[to]))
{
- int cf = castlingFlagsMask[from] | castlingFlagsMask[to];
- k ^= Zobrist::castling[st->castlingFlags & cf];
- st->castlingFlags &= ~cf;
+ int cr = castlingRightsMask[from] | castlingRightsMask[to];
+ k ^= Zobrist::castling[st->castlingRights & cr];
+ st->castlingRights &= ~cr;
}
// Prefetch TT access as soon as we know the new hash key
Key Position::compute_key() const {
- Key k = Zobrist::castling[st->castlingFlags];
+ Key k = Zobrist::castling[st->castlingRights];
for (Bitboard b = pieces(); b; )
{
const bool debugPieceList = all || false;
const bool debugCastlingSquares = all || false;
- *step = 1;
-
- if (sideToMove != WHITE && sideToMove != BLACK)
+ if (*step = 1, sideToMove != WHITE && sideToMove != BLACK)
return false;
if ((*step)++, piece_on(king_square(WHITE)) != W_KING)
return false;
if ((*step)++, debugKingCount)
- {
- int kingCount[COLOR_NB] = {};
-
- for (Square s = SQ_A1; s <= SQ_H8; ++s)
- if (type_of(piece_on(s)) == KING)
- ++kingCount[color_of(piece_on(s))];
-
- if (kingCount[0] != 1 || kingCount[1] != 1)
+ if ( std::count(board, board + SQUARE_NB, W_KING) != 1
+ || std::count(board, board + SQUARE_NB, B_KING) != 1)
return false;
- }
if ((*step)++, debugKingCapture)
if (attackers_to(king_square(~sideToMove)) & pieces(sideToMove))
if (!can_castle(c | s))
continue;
- if ( (castlingFlagsMask[king_square(c)] & (c | s)) != (c | s)
+ if ( (castlingRightsMask[king_square(c)] & (c | s)) != (c | s)
|| piece_on(castlingRookSquare[c | s]) != make_piece(c, ROOK)
- || castlingFlagsMask[castlingRookSquare[c | s]] != (c | s))
+ || castlingRightsMask[castlingRookSquare[c | s]] != (c | s))
return false;
}
projects / stockfish / blobdiff