/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
- Copyright (C) 2004-2008 Tord Romstad (Glaurung author) Copyright (C) 2008 Marco Costalba
+ Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
+ Copyright (C) 2008-2009 Marco Costalba
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <cassert>
+#include "bitcount.h"
#include "movegen.h"
// Simple macro to wrap a very common while loop, no facny, no flexibility,
// hardcoded list name 'mlist' and from square 'from'.
-#define SERIALIZE_MOVES(b) while (b) (*mlist++).move = make_move(from, pop_1st_bit(&b))
+#define SERIALIZE_MOVES(b, bsf) while (b) (*mlist++).move = make_move(from, pop_1st_bit<bsf>(&b))
////
//// Local definitions
template<CastlingSide Side>
MoveStack* generate_castle_moves(const Position& pos, MoveStack* mlist);
- template<Color Us, Rank, Bitboard, SquareDelta>
+ template<Color Us>
MoveStack* generate_pawn_blocking_evasions(const Position&, Bitboard, Bitboard, MoveStack*);
- template<Color, Color, Bitboard, SquareDelta, SquareDelta, SquareDelta>
+ template<Color Us>
MoveStack* generate_pawn_captures(const Position& pos, MoveStack* mlist);
- template<Color, Color, Bitboard, Bitboard, SquareDelta, SquareDelta, SquareDelta>
+ template<Color Us, SquareDelta Diagonal>
+ MoveStack* generate_pawn_captures_diagonal(MoveStack* mlist, Bitboard pawns, Bitboard enemyPieces);
+
+ template<Color Us>
MoveStack* generate_pawn_noncaptures(const Position& pos, MoveStack* mlist);
- template<Color, Color, Bitboard, Bitboard, SquareDelta>
+ template<Color Us>
MoveStack* generate_pawn_checks(const Position&, Bitboard, Square, MoveStack*);
+ template<Color Us, SquareDelta Direction>
+ inline Bitboard move_pawns(Bitboard p) {
+
+ if (Direction == DELTA_N)
+ return Us == WHITE ? p << 8 : p >> 8;
+ else if (Direction == DELTA_NE)
+ return Us == WHITE ? p << 9 : p >> 7;
+ else if (Direction == DELTA_NW)
+ return Us == WHITE ? p << 7 : p >> 9;
+ else
+ return p;
+ }
+
// Template generate_piece_checks() with specializations
- template<PieceType>
+ template<PieceType, bool HasBSF>
MoveStack* generate_piece_checks(const Position&, MoveStack*, Color, Bitboard, Square);
template<>
- inline MoveStack* generate_piece_checks<PAWN>(const Position& p, MoveStack* m, Color us, Bitboard dc, Square ksq) {
-
- if (us == WHITE)
- return generate_pawn_checks<WHITE, BLACK, Rank8BB, Rank3BB, DELTA_N>(p, dc, ksq, m);
- else
- return generate_pawn_checks<BLACK, WHITE, Rank1BB, Rank6BB, DELTA_S>(p, dc, ksq, m);
+ inline MoveStack* generate_piece_checks<PAWN, false>(const Position& p, MoveStack* m, Color us, Bitboard dc, Square ksq) {
+ return (us == WHITE ? generate_pawn_checks<WHITE>(p, dc, ksq, m)
+ : generate_pawn_checks<BLACK>(p, dc, ksq, m));
}
- // Template generate_piece_moves() with specializations
- template<PieceType>
+ // Template generate_piece_moves() with specializations and overloads
+ template<PieceType, bool HasBSF>
MoveStack* generate_piece_moves(const Position&, MoveStack*, Color us, Bitboard);
template<>
- MoveStack* generate_piece_moves<KING>(const Position&, MoveStack*, Color, Bitboard);
+ MoveStack* generate_piece_moves<KING, false>(const Position&, MoveStack*, Color, Bitboard);
template<PieceType Piece, MoveType Type>
inline MoveStack* generate_piece_moves(const Position& p, MoveStack* m, Color us) {
assert(Piece == PAWN);
if (Type == CAPTURE)
- return (us == WHITE ? generate_pawn_captures<WHITE, BLACK, Rank8BB, DELTA_NE, DELTA_NW, DELTA_N>(p, m)
- : generate_pawn_captures<BLACK, WHITE, Rank1BB, DELTA_SE, DELTA_SW, DELTA_S>(p, m));
+ return (us == WHITE ? generate_pawn_captures<WHITE>(p, m)
+ : generate_pawn_captures<BLACK>(p, m));
else
- return (us == WHITE ? generate_pawn_noncaptures<WHITE, BLACK, Rank8BB, Rank3BB, DELTA_NE, DELTA_NW, DELTA_N>(p, m)
- : generate_pawn_noncaptures<BLACK, WHITE, Rank1BB, Rank6BB, DELTA_SE, DELTA_SW, DELTA_S>(p, m));
+ return (us == WHITE ? generate_pawn_noncaptures<WHITE>(p, m)
+ : generate_pawn_noncaptures<BLACK>(p, m));
}
- template<PieceType>
+ template<PieceType, bool HasBSF>
MoveStack* generate_piece_moves(const Position&, MoveStack*, Color us, Bitboard, Bitboard);
template<>
- inline MoveStack* generate_piece_moves<PAWN>(const Position& p, MoveStack* m,
- Color us, Bitboard t, Bitboard pnd) {
- if (us == WHITE)
- return generate_pawn_blocking_evasions<WHITE, RANK_8, Rank3BB, DELTA_N>(p, pnd, t, m);
- else
- return generate_pawn_blocking_evasions<BLACK, RANK_1, Rank6BB, DELTA_S>(p, pnd, t, m);
+ inline MoveStack* generate_piece_moves<PAWN, false>(const Position& p, MoveStack* m,
+ Color us, Bitboard t, Bitboard pnd) {
+
+ return (us == WHITE ? generate_pawn_blocking_evasions<WHITE>(p, pnd, t, m)
+ : generate_pawn_blocking_evasions<BLACK>(p, pnd, t, m));
}
}
/// generate_captures generates() all pseudo-legal captures and queen
/// promotions. The return value is the number of moves generated.
-
+template<bool HasBSF>
int generate_captures(const Position& pos, MoveStack* mlist) {
assert(pos.is_ok());
Bitboard target = pos.pieces_of_color(opposite_color(us));
MoveStack* mlist_start = mlist;
- mlist = generate_piece_moves<QUEEN>(pos, mlist, us, target);
- mlist = generate_piece_moves<ROOK>(pos, mlist, us, target);
- mlist = generate_piece_moves<BISHOP>(pos, mlist, us, target);
- mlist = generate_piece_moves<KNIGHT>(pos, mlist, us, target);
+ mlist = generate_piece_moves<QUEEN, HasBSF>(pos, mlist, us, target);
+ mlist = generate_piece_moves<ROOK, HasBSF>(pos, mlist, us, target);
+ mlist = generate_piece_moves<BISHOP, HasBSF>(pos, mlist, us, target);
+ mlist = generate_piece_moves<KNIGHT, HasBSF>(pos, mlist, us, target);
mlist = generate_piece_moves<PAWN, CAPTURE>(pos, mlist, us);
- mlist = generate_piece_moves<KING>(pos, mlist, us, target);
+ mlist = generate_piece_moves<KING, false>(pos, mlist, us, target);
return int(mlist - mlist_start);
}
+int generate_captures(const Position& pos, MoveStack* mlist) {
+
+ return CpuHasPOPCNT ? generate_captures<true>(pos, mlist)
+ : generate_captures<false>(pos, mlist);
+}
+
/// generate_noncaptures() generates all pseudo-legal non-captures and
/// underpromotions. The return value is the number of moves generated.
-
+template<bool HasBSF>
int generate_noncaptures(const Position& pos, MoveStack* mlist) {
assert(pos.is_ok());
MoveStack* mlist_start = mlist;
mlist = generate_piece_moves<PAWN, NON_CAPTURE>(pos, mlist, us);
- mlist = generate_piece_moves<KNIGHT>(pos, mlist, us, target);
- mlist = generate_piece_moves<BISHOP>(pos, mlist, us, target);
- mlist = generate_piece_moves<ROOK>(pos, mlist, us, target);
- mlist = generate_piece_moves<QUEEN>(pos, mlist, us, target);
- mlist = generate_piece_moves<KING>(pos, mlist, us, target);
+ mlist = generate_piece_moves<KNIGHT, HasBSF>(pos, mlist, us, target);
+ mlist = generate_piece_moves<BISHOP, HasBSF>(pos, mlist, us, target);
+ mlist = generate_piece_moves<ROOK, HasBSF>(pos, mlist, us, target);
+ mlist = generate_piece_moves<QUEEN, HasBSF>(pos, mlist, us, target);
+ mlist = generate_piece_moves<KING, false>(pos, mlist, us, target);
mlist = generate_castle_moves<KING_SIDE>(pos, mlist);
mlist = generate_castle_moves<QUEEN_SIDE>(pos, mlist);
return int(mlist - mlist_start);
}
+int generate_noncaptures(const Position& pos, MoveStack* mlist) {
+
+ return CpuHasPOPCNT ? generate_noncaptures<true>(pos, mlist)
+ : generate_noncaptures<false>(pos, mlist);
+}
-/// generate_checks() generates all pseudo-legal non-capturing, non-promoting
-/// checks. It returns the number of generated moves.
-int generate_checks(const Position& pos, MoveStack* mlist, Bitboard dc) {
+/// generate_non_capture_checks() generates all pseudo-legal non-capturing,
+/// non-promoting checks. It returns the number of generated moves.
+template<bool HasBSF>
+int generate_non_capture_checks(const Position& pos, MoveStack* mlist, Bitboard dc) {
assert(pos.is_ok());
assert(!pos.is_check());
Square ksq = pos.king_square(opposite_color(us));
MoveStack* mlist_start = mlist;
- assert(pos.piece_on(ksq) == king_of_color(opposite_color(us)));
+ assert(pos.piece_on(ksq) == piece_of_color_and_type(opposite_color(us), KING));
// Pieces moves
- mlist = generate_piece_checks<PAWN>(pos, mlist, us, dc, ksq);
- mlist = generate_piece_checks<KNIGHT>(pos, mlist, us, dc, ksq);
- mlist = generate_piece_checks<BISHOP>(pos, mlist, us, dc, ksq);
- mlist = generate_piece_checks<ROOK>(pos, mlist, us, dc, ksq);
- mlist = generate_piece_checks<QUEEN>(pos, mlist, us, dc, ksq);
- mlist = generate_piece_checks<KING>(pos, mlist, us, dc, ksq);
+ mlist = generate_piece_checks<PAWN, false>(pos, mlist, us, dc, ksq);
+ mlist = generate_piece_checks<KNIGHT, HasBSF>(pos, mlist, us, dc, ksq);
+ mlist = generate_piece_checks<BISHOP, HasBSF>(pos, mlist, us, dc, ksq);
+ mlist = generate_piece_checks<ROOK, HasBSF>(pos, mlist, us, dc, ksq);
+ mlist = generate_piece_checks<QUEEN, HasBSF>(pos, mlist, us, dc, ksq);
+ mlist = generate_piece_checks<KING, false>(pos, mlist, us, dc, ksq);
// Castling moves that give check. Very rare but nice to have!
if ( pos.can_castle_queenside(us)
return int(mlist - mlist_start);
}
+int generate_non_capture_checks(const Position& pos, MoveStack* mlist, Bitboard dc) {
+
+ return CpuHasPOPCNT ? generate_non_capture_checks<true>(pos, mlist, dc)
+ : generate_non_capture_checks<false>(pos, mlist, dc);
+}
+
/// generate_evasions() generates all check evasions when the side to move is
/// in check. Unlike the other move generation functions, this one generates
/// only legal moves. It returns the number of generated moves.
-
+template<bool HasBSF>
int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) {
assert(pos.is_ok());
Square ksq = pos.king_square(us);
MoveStack* mlist_start = mlist;
- assert(pos.piece_on(ksq) == king_of_color(us));
+ assert(pos.piece_on(ksq) == piece_of_color_and_type(us, KING));
// The bitboard of occupied pieces without our king
Bitboard b_noKing = pos.occupied_squares();
if (blockSquares != EmptyBoardBB)
{
- // Pieces moves
- mlist = generate_piece_moves<PAWN>(pos, mlist, us, blockSquares, pinned);
- mlist = generate_piece_moves<KNIGHT>(pos, mlist, us, blockSquares, pinned);
- mlist = generate_piece_moves<BISHOP>(pos, mlist, us, blockSquares, pinned);
- mlist = generate_piece_moves<ROOK>(pos, mlist, us, blockSquares, pinned);
- mlist = generate_piece_moves<QUEEN>(pos, mlist, us, blockSquares, pinned);
+ mlist = generate_piece_moves<PAWN, false>(pos, mlist, us, blockSquares, pinned);
+ mlist = generate_piece_moves<KNIGHT, HasBSF>(pos, mlist, us, blockSquares, pinned);
+ mlist = generate_piece_moves<BISHOP, HasBSF>(pos, mlist, us, blockSquares, pinned);
+ mlist = generate_piece_moves<ROOK, HasBSF>(pos, mlist, us, blockSquares, pinned);
+ mlist = generate_piece_moves<QUEEN, HasBSF>(pos, mlist, us, blockSquares, pinned);
}
}
// The checking pawn cannot be a discovered (bishop) check candidate
// otherwise we were in check also before last double push move.
assert(!bit_is_set(pos.discovered_check_candidates(them), checksq));
- assert(count_1s(b1) == 1 || count_1s(b1) == 2);
+ assert(count_1s<false>(b1) == 1 || count_1s<false>(b1) == 2);
b1 &= ~pinned;
while (b1)
return int(mlist - mlist_start);
}
+int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) {
+
+ return CpuHasPOPCNT ? generate_evasions<true>(pos, mlist, pinned)
+ : generate_evasions<false>(pos, mlist, pinned);
+}
+
/// generate_legal_moves() computes a complete list of legal moves in the
/// current position. This function is not very fast, and should be used
return false;
assert(pos.square_is_empty(to));
- assert(pos.piece_on(to - pawn_push(us)) == pawn_of_color(them));
+ assert(pos.piece_on(to - pawn_push(us)) == piece_of_color_and_type(them, PAWN));
// The move is pseudo-legal, check if it is also legal
return pos.pl_move_is_legal(m, pinned);
assert(from == pos.king_square(us));
assert(to == pos.initial_kr_square(us));
- assert(pos.piece_on(to) == rook_of_color(us));
+ assert(pos.piece_on(to) == piece_of_color_and_type(us, ROOK));
Square g1 = relative_square(us, SQ_G1);
Square f1 = relative_square(us, SQ_F1);
assert(from == pos.king_square(us));
assert(to == pos.initial_qr_square(us));
- assert(pos.piece_on(to) == rook_of_color(us));
+ assert(pos.piece_on(to) == piece_of_color_and_type(us, ROOK));
Square c1 = relative_square(us, SQ_C1);
Square d1 = relative_square(us, SQ_D1);
illegal = true;
if ( square_file(to) == FILE_B
- && ( pos.piece_on(to + DELTA_W) == rook_of_color(them)
- || pos.piece_on(to + DELTA_W) == queen_of_color(them)))
+ && ( pos.piece_on(to + DELTA_W) == piece_of_color_and_type(them, ROOK)
+ || pos.piece_on(to + DELTA_W) == piece_of_color_and_type(them, QUEEN)))
illegal = true;
return !illegal;
// Proceed according to the type of the moving piece.
if (type_of_piece(pc) == PAWN)
{
+ // Move direction must be compatible with pawn color
+ int direction = to - from;
+ if ((us == WHITE) != (direction > 0))
+ return false;
+
// If the destination square is on the 8/1th rank, the move must
// be a promotion.
if ( ( (square_rank(to) == RANK_8 && us == WHITE)
// Proceed according to the square delta between the source and
// destionation squares.
- switch (to - from)
+ switch (direction)
{
case DELTA_NW:
case DELTA_NE:
}
// Luckly we can handle all the other pieces in one go
- return ( pos.piece_attacks_square(from, to)
+ return ( pos.piece_attacks_square(pos.piece_on(from), from, to)
&& pos.pl_move_is_legal(m, pinned)
&& !move_promotion(m));
}
namespace {
- template<PieceType Piece>
+ template<PieceType Piece, bool HasBSF>
MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) {
Square from;
{
from = pos.piece_list(us, Piece, i);
b = pos.piece_attacks<Piece>(from) & target;
- SERIALIZE_MOVES(b);
+ SERIALIZE_MOVES(b, HasBSF);
}
return mlist;
}
- template<PieceType Piece>
+ template<PieceType Piece, bool HasBSF>
MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist,
Color us, Bitboard target, Bitboard pinned) {
Square from;
continue;
b = pos.piece_attacks<Piece>(from) & target;
- SERIALIZE_MOVES(b);
+ SERIALIZE_MOVES(b, HasBSF);
}
return mlist;
}
template<>
- MoveStack* generate_piece_moves<KING>(const Position& pos, MoveStack* mlist, Color us, Bitboard target) {
+ MoveStack* generate_piece_moves<KING, false>(const Position& pos, MoveStack* mlist, Color us, Bitboard target) {
Bitboard b;
Square from = pos.king_square(us);
b = pos.piece_attacks<KING>(from) & target;
- SERIALIZE_MOVES(b);
+ SERIALIZE_MOVES(b, false);
return mlist;
}
- template<Color Us, Color Them, Bitboard TRank8BB, SquareDelta TDELTA_NE,
- SquareDelta TDELTA_NW, SquareDelta TDELTA_N
- >
- MoveStack* generate_pawn_captures(const Position& pos, MoveStack* mlist) {
+ template<Color Us, SquareDelta Diagonal>
+ MoveStack* generate_pawn_captures_diagonal(MoveStack* mlist, Bitboard pawns, Bitboard enemyPieces) {
+
+ // Calculate our parametrized parameters at compile time
+ const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB);
+ const Bitboard TFileABB = (Diagonal == DELTA_NE ? FileABB : FileHBB);
+ const SquareDelta TDELTA_NE = (Us == WHITE ? DELTA_NE : DELTA_SE);
+ const SquareDelta TDELTA_NW = (Us == WHITE ? DELTA_NW : DELTA_SW);
+ const SquareDelta TTDELTA_NE = (Diagonal == DELTA_NE ? TDELTA_NE : TDELTA_NW);
Square to;
- Bitboard pawns = pos.pawns(Us);
- Bitboard enemyPieces = pos.pieces_of_color(Them);
- // Captures in the a1-h8 (a8-h1 for black) direction
- Bitboard b1 = (Us == WHITE ? pawns << 9 : pawns >> 7) & ~FileABB & enemyPieces;
+ // Captures in the a1-h8 (a8-h1 for black) diagonal or in the h1-a8 (h8-a1 for black)
+ Bitboard b1 = move_pawns<Us, Diagonal>(pawns) & ~TFileABB & enemyPieces;
// Capturing promotions
Bitboard b2 = b1 & TRank8BB;
while (b2)
{
to = pop_1st_bit(&b2);
- (*mlist++).move = make_promotion_move(to - TDELTA_NE, to, QUEEN);
+ (*mlist++).move = make_promotion_move(to - TTDELTA_NE, to, QUEEN);
}
// Capturing non-promotions
while (b2)
{
to = pop_1st_bit(&b2);
- (*mlist++).move = make_move(to - TDELTA_NE, to);
+ (*mlist++).move = make_move(to - TTDELTA_NE, to);
}
+ return mlist;
+ }
- // Captures in the h1-a8 (h8-a1 for black) direction
- b1 = (Us == WHITE ? pawns << 7 : pawns >> 9) & ~FileHBB & enemyPieces;
+ template<Color Us>
+ MoveStack* generate_pawn_captures(const Position& pos, MoveStack* mlist) {
- // Capturing promotions
- b2 = b1 & TRank8BB;
- while (b2)
- {
- to = pop_1st_bit(&b2);
- (*mlist++).move = make_promotion_move(to - TDELTA_NW, to, QUEEN);
- }
+ // Calculate our parametrized parameters at compile time
+ const Color Them = (Us == WHITE ? BLACK : WHITE);
+ const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB);
+ const SquareDelta TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S);
- // Capturing non-promotions
- b2 = b1 & ~TRank8BB;
- while (b2)
- {
- to = pop_1st_bit(&b2);
- (*mlist++).move = make_move(to - TDELTA_NW, to);
- }
+ Square to;
+ Bitboard pawns = pos.pawns(Us);
+ Bitboard enemyPieces = pos.pieces_of_color(opposite_color(Us));
+
+ // Standard captures and capturing promotions in both directions
+ mlist = generate_pawn_captures_diagonal<Us, DELTA_NE>(mlist, pawns, enemyPieces);
+ mlist = generate_pawn_captures_diagonal<Us, DELTA_NW>(mlist, pawns, enemyPieces);
// Non-capturing promotions
- b1 = (Us == WHITE ? pawns << 8 : pawns >> 8) & pos.empty_squares() & TRank8BB;
+ Bitboard b1 = move_pawns<Us, DELTA_N>(pawns) & pos.empty_squares() & TRank8BB;
while (b1)
{
to = pop_1st_bit(&b1);
return mlist;
}
- template<Color Us, Color Them, Bitboard TRank8BB, Bitboard TRank3BB,
- SquareDelta TDELTA_NE, SquareDelta TDELTA_NW, SquareDelta TDELTA_N
- >
+ template<Color Us>
MoveStack* generate_pawn_noncaptures(const Position& pos, MoveStack* mlist) {
- Bitboard pawns = pos.pawns(Us);
- Bitboard enemyPieces = pos.pieces_of_color(Them);
- Bitboard emptySquares = pos.empty_squares();
+ // Calculate our parametrized parameters at compile time
+ const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB);
+ const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB);
+ const SquareDelta TDELTA_NE = (Us == WHITE ? DELTA_NE : DELTA_SE);
+ const SquareDelta TDELTA_NW = (Us == WHITE ? DELTA_NW : DELTA_SW);
+ const SquareDelta TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S);
+
Bitboard b1, b2;
Square to;
+ Bitboard pawns = pos.pawns(Us);
+ Bitboard enemyPieces = pos.pieces_of_color(opposite_color(Us));
+ Bitboard emptySquares = pos.empty_squares();
// Underpromotion captures in the a1-h8 (a8-h1 for black) direction
- b1 = (Us == WHITE ? pawns << 9 : pawns >> 7) & ~FileABB & enemyPieces & TRank8BB;
+ b1 = move_pawns<Us, DELTA_NE>(pawns) & ~FileABB & enemyPieces & TRank8BB;
while (b1)
{
to = pop_1st_bit(&b1);
}
// Underpromotion captures in the h1-a8 (h8-a1 for black) direction
- b1 = (Us == WHITE ? pawns << 7 : pawns >> 9) & ~FileHBB & enemyPieces & TRank8BB;
+ b1 = move_pawns<Us, DELTA_NW>(pawns) & ~FileHBB & enemyPieces & TRank8BB;
while (b1)
{
to = pop_1st_bit(&b1);
}
// Single pawn pushes
- b1 = (Us == WHITE ? pawns << 8 : pawns >> 8) & emptySquares;
+ b1 = move_pawns<Us, DELTA_N>(pawns) & emptySquares;
b2 = b1 & TRank8BB;
while (b2)
{
}
// Double pawn pushes
- b2 = (Us == WHITE ? (b1 & TRank3BB) << 8 : (b1 & TRank3BB) >> 8) & emptySquares;
+ b2 = move_pawns<Us, DELTA_N>(b1 & TRank3BB) & emptySquares;
while (b2)
{
to = pop_1st_bit(&b2);
}
- template<Color Us, Color Them, Bitboard TRank8BB, Bitboard TRank3BB, SquareDelta TDELTA_N>
+ template<Color Us>
MoveStack* generate_pawn_checks(const Position& pos, Bitboard dc, Square ksq, MoveStack* mlist)
{
- // Find all friendly pawns not on the enemy king's file
+ // Calculate our parametrized parameters at compile time
+ const Color Them = (Us == WHITE ? BLACK : WHITE);
+ const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB);
+ const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB);
+ const SquareDelta TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S);
+ const SquareDelta TDELTA_S = (Us == WHITE ? DELTA_S : DELTA_N);
+
Bitboard b1, b2, b3;
- Bitboard empty = pos.empty_squares();
+ Bitboard pawns = pos.pawns(Us);
- if (dc != EmptyBoardBB)
+ if (dc & pawns)
{
+ Bitboard empty = pos.empty_squares();
+
// Pawn moves which gives discovered check. This is possible only if the
// pawn is not on the same file as the enemy king, because we don't
// generate captures.
- b1 = pos.pawns(Us) & ~file_bb(ksq);
+ b1 = pawns & ~file_bb(ksq);
// Discovered checks, single pawn pushes, no promotions
- b2 = b3 = (Us == WHITE ? (b1 & dc) << 8 : (b1 & dc) >> 8) & empty & ~TRank8BB;
+ b2 = b3 = move_pawns<Us, DELTA_N>(b1 & dc) & empty & ~TRank8BB;
while (b3)
{
Square to = pop_1st_bit(&b3);
}
// Discovered checks, double pawn pushes
- b3 = (Us == WHITE ? (b2 & TRank3BB) << 8 : (b2 & TRank3BB) >> 8) & empty;
+ b3 = move_pawns<Us, DELTA_N>(b2 & TRank3BB) & empty;
while (b3)
{
Square to = pop_1st_bit(&b3);
}
// Direct checks. These are possible only for pawns on neighboring files
- // of the enemy king.
- b1 = pos.pawns(Us) & neighboring_files_bb(ksq) & ~dc;
+ // and in the two ranks that, after the push, are in front of the enemy king.
+ b1 = pawns & neighboring_files_bb(ksq) & ~dc;
+ b2 = rank_bb(ksq + 2 * TDELTA_S) | rank_bb(ksq + 3 * TDELTA_S);
+ b1 &= b2;
+ if (!b1)
+ return mlist;
// Direct checks, single pawn pushes
- b2 = (Us == WHITE ? b1 << 8 : b1 >> 8) & empty;
+ Bitboard empty = pos.empty_squares();
+ b2 = move_pawns<Us, DELTA_N>(b1) & empty;
b3 = b2 & pos.pawn_attacks(Them, ksq);
while (b3)
{
}
// Direct checks, double pawn pushes
- b3 = (Us == WHITE ? (b2 & TRank3BB) << 8 : (b2 & TRank3BB) >> 8)
- & empty
- & pos.pawn_attacks(Them, ksq);
+ b3 = move_pawns<Us, DELTA_N>(b2 & TRank3BB) & empty & pos.pawn_attacks(Them, ksq);
while (b3)
{
Square to = pop_1st_bit(&b3);
return mlist;
}
- template<PieceType Piece>
+ template<PieceType Piece, bool HasBSF>
MoveStack* generate_piece_checks(const Position& pos, MoveStack* mlist, Color us,
Bitboard dc, Square ksq) {
if (Piece == KING)
bb &= ~QueenPseudoAttacks[ksq];
- SERIALIZE_MOVES(bb);
+ SERIALIZE_MOVES(bb, HasBSF);
}
// Direct checks
b = target & ~dc;
- if (Piece == KING || !b)
- return mlist;
-
- Bitboard checkSqs = pos.piece_attacks<Piece>(ksq) & pos.empty_squares();
- while (b)
+ if (Piece != KING || b)
{
- Square from = pop_1st_bit(&b);
- Bitboard bb = pos.piece_attacks<Piece>(from) & checkSqs;
- SERIALIZE_MOVES(bb);
+ Bitboard checkSqs = pos.piece_attacks<Piece>(ksq) & pos.empty_squares();
+ if (!checkSqs)
+ return mlist;
+
+ while (b)
+ {
+ Square from = pop_1st_bit(&b);
+ if ( (Piece == QUEEN && !(QueenPseudoAttacks[from] & checkSqs))
+ || (Piece == ROOK && !(RookPseudoAttacks[from] & checkSqs))
+ || (Piece == BISHOP && !(BishopPseudoAttacks[from] & checkSqs)))
+ continue;
+
+ Bitboard bb = pos.piece_attacks<Piece>(from) & checkSqs;
+ SERIALIZE_MOVES(bb, HasBSF);
+ }
}
return mlist;
}
- template<Color Us, Rank TRANK_8, Bitboard TRank3BB, SquareDelta TDELTA_N>
+ template<Color Us>
MoveStack* generate_pawn_blocking_evasions(const Position& pos, Bitboard pinned,
Bitboard blockSquares, MoveStack* mlist) {
+
+ // Calculate our parametrized parameters at compile time
+ const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB);
+ const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB);
+ const SquareDelta TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S);
+
Square to;
- // Find non-pinned pawns
- Bitboard b1 = pos.pawns(Us) & ~pinned;
+ // Find non-pinned pawns and push them one square
+ Bitboard b1 = move_pawns<Us, DELTA_N>(pos.pawns(Us) & ~pinned);
- // Single pawn pushes. We don't have to AND with empty squares here,
+ // We don't have to AND with empty squares here,
// because the blocking squares will always be empty.
- Bitboard b2 = (Us == WHITE ? b1 << 8 : b1 >> 8) & blockSquares;
+ Bitboard b2 = b1 & blockSquares;
while (b2)
{
to = pop_1st_bit(&b2);
assert(pos.piece_on(to) == EMPTY);
- if (square_rank(to) == TRANK_8)
+ if (square_rank(to) == TRank8BB)
{
(*mlist++).move = make_promotion_move(to - TDELTA_N, to, QUEEN);
(*mlist++).move = make_promotion_move(to - TDELTA_N, to, ROOK);
}
// Double pawn pushes
- b2 = (Us == WHITE ? b1 << 8 : b1 >> 8) & pos.empty_squares() & TRank3BB;
- b2 = (Us == WHITE ? b2 << 8 : b2 >> 8) & blockSquares;
+ b2 = b1 & pos.empty_squares() & TRank3BB;
+ b2 = move_pawns<Us, DELTA_N>(b2) & blockSquares;
while (b2)
{
to = pop_1st_bit(&b2);
Color them = opposite_color(us);
Square ksq = pos.king_square(us);
- assert(pos.piece_on(ksq) == king_of_color(us));
+ assert(pos.piece_on(ksq) == piece_of_color_and_type(us, KING));
Square rsq = (Side == KING_SIDE ? pos.initial_kr_square(us) : pos.initial_qr_square(us));
Square s1 = relative_square(us, Side == KING_SIDE ? SQ_G1 : SQ_C1);
Square s;
bool illegal = false;
- assert(pos.piece_on(rsq) == rook_of_color(us));
+ assert(pos.piece_on(rsq) == piece_of_color_and_type(us, ROOK));
// It is a bit complicated to correctly handle Chess960
for (s = Min(ksq, s1); s <= Max(ksq, s1); s++)
if ( Side == QUEEN_SIDE
&& square_file(rsq) == FILE_B
- && ( pos.piece_on(relative_square(us, SQ_A1)) == rook_of_color(them)
- || pos.piece_on(relative_square(us, SQ_A1)) == queen_of_color(them)))
+ && ( pos.piece_on(relative_square(us, SQ_A1)) == piece_of_color_and_type(them, ROOK)
+ || pos.piece_on(relative_square(us, SQ_A1)) == piece_of_color_and_type(them, QUEEN)))
illegal = true;
if (!illegal)
projects / stockfish / blobdiff