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] = {
6) Fullmove number: The number of the full move. It starts at 1, and is incremented after Black's move.
*/
- char token;
+ char col, row, token;
size_t p;
- string ep;
Square sq = SQ_A8;
std::istringstream ss(fen);
clear();
- ss >> std::skipws >> token >> std::noskipws;
+ ss >> std::noskipws;
// 1. Piece placement
- while (!isspace(token))
+ while ((ss >> token) && !isspace(token))
{
if (token == '/')
sq -= Square(16); // Jump back of 2 rows
put_piece(Piece(p), sq);
sq++;
}
-
- ss >> token;
}
// 2. Active color
- ss >> std::skipws >> token;
+ ss >> token;
sideToMove = (token == 'w' ? WHITE : BLACK);
+ ss >> token;
// 3. Castling availability
- ss >> token >> std::noskipws;
- while (token != '-' && !isspace(token))
- {
+ while ((ss >> token) && !isspace(token))
set_castling_rights(token);
- ss >> token;
- }
// 4. En passant square. Ignore if no pawn capture is possible
- ss >> std::skipws >> ep;
- if (ep.size() == 2)
+ if ( ((ss >> col) && (col >= 'a' && col <= 'h'))
+ && ((ss >> row) && (row == '3' || row == '6')))
{
- st->epSquare = make_square(File(ep[0] - 'a'), Rank(ep[1] - '1'));
+ st->epSquare = make_square(File(col - 'a'), Rank(row - '1'));
+ Color them = opposite_color(sideToMove);
- if (!(attackers_to(st->epSquare) & pieces(PAWN, sideToMove)))
+ if (!(attacks_from<PAWN>(st->epSquare, them) & pieces(PAWN, sideToMove)))
st->epSquare = SQ_NONE;
}
// 5-6. Halfmove clock and fullmove number
- ss >> st->rule50 >> fullMoves;
+ ss >> std::skipws >> st->rule50 >> fullMoves;
// 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();
Square sqA = relative_square(c, SQ_A1);
Square sqH = relative_square(c, SQ_H1);
-
Square rsq, ksq = king_square(c);
- if (toupper(token) == 'K')
- {
+ token = char(toupper(token));
+
+ if (token == 'K')
for (rsq = sqH; piece_on(rsq) != make_piece(c, ROOK); rsq--) {}
- set_castle(WHITE_OO << c, ksq, rsq);
- }
- else if (toupper(token) == 'Q')
- {
+
+ else if (token == 'Q')
for (rsq = sqA; piece_on(rsq) != make_piece(c, ROOK); rsq++) {}
- set_castle(WHITE_OOO << c, ksq, rsq);
- }
- else if (toupper(token) >= 'A' && toupper(token) <= 'H')
- {
- Square rsq = make_square(File(toupper(token) - 'A'), RANK_1);
- if (square_file(rsq) < square_file(ksq))
- set_castle(WHITE_OOO << c, ksq, rsq);
- else
- set_castle(WHITE_OO << c, ksq, rsq);
- }
+ else if (token >= 'A' && token <= 'H')
+ rsq = make_square(File(token - 'A'), relative_rank(c, RANK_1));
+
+ else return;
+
+ if (square_file(rsq) < square_file(ksq))
+ set_castle(WHITE_OOO << c, ksq, rsq);
+ else
+ set_castle(WHITE_OO << c, ksq, rsq);
}
{
sq = make_square(file, rank);
- if (square_is_occupied(sq))
+ if (!square_is_empty(sq))
{
if (emptyCnt != '0')
{
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.
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;
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;
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.
}
-/// 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 {
// 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.
{
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
// 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;
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
st->pawnKey ^= zobrist[us][PAWN][to];
// Partially revert and update incremental scores
- st->value -= pst(us, PAWN, to);
- st->value += pst(us, promotion, to);
+ st->value -= pst(make_piece(us, PAWN), to);
+ st->value += pst(make_piece(us, promotion), to);
// Update material
st->npMaterial[us] += PieceValueMidgame[promotion];
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
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];
// Update incremental scores
- st->value -= pst(them, capture, capsq);
+ st->value -= pst(make_piece(them, capture), capsq);
// Update piece count
pieceCount[them][capture]--;
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));
{
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;
// 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);
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);
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]--;
// 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;
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);
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
{
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);
}
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;
// 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];
// 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)
st = &startState;
memset(st, 0, sizeof(StateInfo));
st->epSquare = SQ_NONE;
- fullMoves = 1;
- nodes = 0;
memset(byColorBB, 0, sizeof(Bitboard) * 2);
memset(byTypeBB, 0, sizeof(Bitboard) * 8);
memset(pieceCount, 0, sizeof(int) * 2 * 8);
memset(index, 0, sizeof(int) * 64);
- for (int i = 0; i < 64; i++)
- board[i] = PIECE_NONE;
-
for (int i = 0; i < 8; i++)
for (int j = 0; j < 16; j++)
pieceList[0][i][j] = pieceList[1][i][j] = SQ_NONE;
for (Square sq = SQ_A1; sq <= SQ_H8; sq++)
+ {
+ board[sq] = PIECE_NONE;
castleRightsMask[sq] = ALL_CASTLES;
-
+ }
sideToMove = WHITE;
+ fullMoves = 1;
+ nodes = 0;
}
index[s] = pieceCount[c][pt]++;
pieceList[c][pt][index[s]] = s;
- set_bit(&(byTypeBB[pt]), s);
- set_bit(&(byColorBB[c]), s);
- set_bit(&(byTypeBB[0]), s); // HACK: byTypeBB[0] contains all occupied squares.
+ set_bit(&byTypeBB[pt], s);
+ set_bit(&byColorBB[c], s);
+ set_bit(&byTypeBB[0], s); // HACK: byTypeBB[0] contains all occupied squares.
}
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)
Key Position::compute_material_key() const {
- int count;
Key result = 0;
for (Color c = WHITE; c <= BLACK; c++)
for (PieceType pt = PAWN; pt <= QUEEN; pt++)
- {
- count = piece_count(c, pt);
- for (int i = 0; i < count; i++)
+ for (int i = 0, cnt = piece_count(c, pt); i < cnt; i++)
result ^= zobrist[c][pt][i];
- }
+
return result;
}
{
b = pieces(pt, c);
while (b)
- result += pst(c, pt, pop_1st_bit(&b));
+ result += pst(make_piece(c, pt), pop_1st_bit(&b));
}
result += (side_to_move() == WHITE ? TempoValue / 2 : -TempoValue / 2);
bool Position::is_mate() const {
- MoveStack moves[MAX_MOVES];
- return in_check() && generate<MV_LEGAL>(*this, moves) == moves;
+ return in_check() && !MoveList<MV_LEGAL>(*this).size();
}
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)];
}
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();
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;
}
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
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;
}
projects / stockfish / blobdiff