/// Version used for pawns, where the 'from' square is given as a delta from the 'to' square
#define SERIALIZE_PAWNS(b, d) while (b) { Square to = pop_1st_bit(&b); \
- (*mlist++).move = make_move(to + (d), to); }
+ (*mlist++).move = make_move(to - (d), to); }
namespace {
enum CastlingSide { KING_SIDE, QUEEN_SIDE };
template<CastlingSide Side, bool OnlyChecks>
- MoveStack* generate_castle_moves(const Position& pos, MoveStack* mlist, Color us) {
+ MoveStack* generate_castle(const Position& pos, MoveStack* mlist, Color us) {
const CastleRight CR[] = { Side ? WHITE_OOO : WHITE_OO,
Side ? BLACK_OOO : BLACK_OO };
: Delta == DELTA_NE ? (p & ~FileHBB) << 9
: Delta == DELTA_SE ? (p & ~FileHBB) >> 7
: Delta == DELTA_NW ? (p & ~FileABB) << 7
- : Delta == DELTA_SW ? (p & ~FileABB) >> 9 : p;
- }
-
-
- template<Square Delta>
- inline MoveStack* generate_pawn_captures(MoveStack* mlist, Bitboard pawns, Bitboard target) {
-
- Bitboard b = move_pawns<Delta>(pawns) & target;
- SERIALIZE_PAWNS(b, -Delta);
- return mlist;
+ : Delta == DELTA_SW ? (p & ~FileABB) >> 9 : 0;
}
(*mlist++).move = make_promotion(to - Delta, to, KNIGHT);
}
- // Knight-promotion is the only one that can give a check (direct or
- // discovered) not already included in the queen-promotion.
+ // Knight-promotion is the only one that can give a direct check not
+ // already included in the queen-promotion.
if (Type == MV_NON_CAPTURE_CHECK && bit_is_set(StepAttacksBB[W_KNIGHT][to], ksq))
(*mlist++).move = make_promotion(to - Delta, to, KNIGHT);
else
template<Color Us, MoveType Type>
MoveStack* generate_pawn_moves(const Position& pos, MoveStack* mlist, Bitboard target, Square ksq = SQ_NONE) {
- // Calculate our parametrized parameters at compile time, named according to
+ // Compute our parametrized parameters at compile time, named according to
// the point of view of white side.
const Color Them = (Us == WHITE ? BLACK : WHITE);
+ const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB);
const Bitboard TRank7BB = (Us == WHITE ? Rank7BB : Rank2BB);
const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB);
const Square UP = (Us == WHITE ? DELTA_N : DELTA_S);
if (Type == MV_NON_CAPTURE_CHECK)
{
- // Consider only direct checks
b1 &= pos.attacks_from<PAWN>(ksq, Them);
b2 &= pos.attacks_from<PAWN>(ksq, Them);
}
}
- SERIALIZE_PAWNS(b1, -UP);
- SERIALIZE_PAWNS(b2, -UP -UP);
+ SERIALIZE_PAWNS(b1, UP);
+ SERIALIZE_PAWNS(b2, UP + UP);
}
// Promotions and underpromotions
- if (pawnsOn7)
+ if (pawnsOn7 && (Type != MV_EVASION || (target & TRank8BB)))
{
if (Type == MV_CAPTURE)
emptySquares = pos.empty_squares();
// Standard and en-passant captures
if (Type == MV_CAPTURE || Type == MV_EVASION || Type == MV_NON_EVASION)
{
- mlist = generate_pawn_captures<RIGHT>(mlist, pawnsNotOn7, enemies);
- mlist = generate_pawn_captures<LEFT >(mlist, pawnsNotOn7, enemies);
+ b1 = move_pawns<RIGHT>(pawnsNotOn7) & enemies;
+ b2 = move_pawns<LEFT >(pawnsNotOn7) & enemies;
+
+ SERIALIZE_PAWNS(b1, RIGHT);
+ SERIALIZE_PAWNS(b2, LEFT);
if (pos.ep_square() != SQ_NONE)
{
- assert(rank_of(pos.ep_square()) == (Us == WHITE ? RANK_6 : RANK_3));
+ assert(rank_of(pos.ep_square()) == relative_rank(Us, RANK_6));
// An en passant capture can be an evasion only if the checking piece
// is the double pushed pawn and so is in the target. Otherwise this
Color us, const CheckInfo& ci) {
assert(Pt != KING && Pt != PAWN);
+ Bitboard b, target;
Square from;
const Square* pl = pos.piece_list(us, Pt);
- if ((from = *pl++) == SQ_NONE)
- return mlist;
-
- Bitboard checkSqs = ci.checkSq[Pt] & pos.empty_squares();
-
- do
+ if (*pl != SQ_NONE)
{
- if ( (Pt == BISHOP || Pt == ROOK || Pt == QUEEN)
- && !(PseudoAttacks[Pt][from] & checkSqs))
- continue;
+ target = ci.checkSq[Pt] & pos.empty_squares(); // Non capture checks only
- if (ci.dcCandidates && bit_is_set(ci.dcCandidates, from))
- continue;
+ do {
+ from = *pl;
- Bitboard b = pos.attacks_from<Pt>(from) & checkSqs;
- SERIALIZE(b);
+ if ( (Pt == BISHOP || Pt == ROOK || Pt == QUEEN)
+ && !(PseudoAttacks[Pt][from] & target))
+ continue;
- } while ((from = *pl++) != SQ_NONE);
+ if (ci.dcCandidates && bit_is_set(ci.dcCandidates, from))
+ continue;
+
+ b = pos.attacks_from<Pt>(from) & target;
+ SERIALIZE(b);
+ } while (*++pl != SQ_NONE);
+ }
return mlist;
}
template<PieceType Pt>
- FORCE_INLINE MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) {
+ FORCE_INLINE MoveStack* generate_moves(const Position& pos, MoveStack* mlist,
+ Color us, Bitboard target) {
+ assert(Pt != KING && Pt != PAWN);
Bitboard b;
Square from;
const Square* pl = pos.piece_list(us, Pt);
if (*pl != SQ_NONE)
- {
do {
from = *pl;
b = pos.attacks_from<Pt>(from) & target;
SERIALIZE(b);
} while (*++pl != SQ_NONE);
- }
return mlist;
}
template<>
- FORCE_INLINE MoveStack* generate_piece_moves<KING>(const Position& pos, MoveStack* mlist, Color us, Bitboard target) {
-
+ FORCE_INLINE MoveStack* generate_moves<KING>(const Position& pos, MoveStack* mlist,
+ Color us, Bitboard target) {
Square from = pos.king_square(us);
Bitboard b = pos.attacks_from<KING>(from) & target;
SERIALIZE(b);
mlist = (us == WHITE ? generate_pawn_moves<WHITE, Type>(pos, mlist, target)
: generate_pawn_moves<BLACK, Type>(pos, mlist, target));
- 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_moves<KNIGHT>(pos, mlist, us, target);
+ mlist = generate_moves<BISHOP>(pos, mlist, us, target);
+ mlist = generate_moves<ROOK>(pos, mlist, us, target);
+ mlist = generate_moves<QUEEN>(pos, mlist, us, target);
+ mlist = generate_moves<KING>(pos, mlist, us, target);
if (Type != MV_CAPTURE && pos.can_castle(us))
{
- mlist = generate_castle_moves<KING_SIDE, false>(pos, mlist, us);
- mlist = generate_castle_moves<QUEEN_SIDE, false>(pos, mlist, us);
+ mlist = generate_castle<KING_SIDE, false>(pos, mlist, us);
+ mlist = generate_castle<QUEEN_SIDE, false>(pos, mlist, us);
}
return mlist;
if (pos.can_castle(us))
{
- mlist = generate_castle_moves<KING_SIDE, true>(pos, mlist, us);
- mlist = generate_castle_moves<QUEEN_SIDE, true>(pos, mlist, us);
+ mlist = generate_castle<KING_SIDE, true>(pos, mlist, us);
+ mlist = generate_castle<QUEEN_SIDE, true>(pos, mlist, us);
}
return mlist;
mlist = (us == WHITE ? generate_pawn_moves<WHITE, MV_EVASION>(pos, mlist, target)
: generate_pawn_moves<BLACK, MV_EVASION>(pos, mlist, target));
- 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);
- return generate_piece_moves<QUEEN>(pos, mlist, us, target);
+ mlist = generate_moves<KNIGHT>(pos, mlist, us, target);
+ mlist = generate_moves<BISHOP>(pos, mlist, us, target);
+ mlist = generate_moves<ROOK>(pos, mlist, us, target);
+ return generate_moves<QUEEN>(pos, mlist, us, target);
}
projects / stockfish / blobdiff