/// 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 };
if (pos.is_chess960())
{
Bitboard occ = pos.occupied_squares();
- clear_bit(&occ, rfrom);
+ occ ^= rfrom;
if (pos.attackers_to(kto, occ) & enemies)
return mlist;
}
: 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;
+ : Delta == DELTA_SW ? (p & ~FileABB) >> 9 : 0;
}
if (Type == MV_CAPTURE || Type == MV_EVASION || Type == MV_NON_EVASION)
(*mlist++).move = make_promotion(to - Delta, to, QUEEN);
- if (Type == MV_NON_CAPTURE || Type == MV_EVASION || Type == MV_NON_EVASION)
+ if (Type == MV_QUIET || Type == MV_EVASION || Type == MV_NON_EVASION)
{
(*mlist++).move = make_promotion(to - Delta, to, ROOK);
(*mlist++).move = make_promotion(to - Delta, to, BISHOP);
(*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.
- if (Type == MV_NON_CAPTURE_CHECK && bit_is_set(StepAttacksBB[W_KNIGHT][to], ksq))
+ // Knight-promotion is the only one that can give a direct check not
+ // already included in the queen-promotion.
+ if (Type == MV_QUIET_CHECK && (StepAttacksBB[W_KNIGHT][to] & ksq))
(*mlist++).move = make_promotion(to - Delta, to, KNIGHT);
else
(void)ksq; // Silence a warning under MSVC
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);
// Single and double pawn pushes, no promotions
if (Type != MV_CAPTURE)
{
- emptySquares = (Type == MV_NON_CAPTURE ? target : pos.empty_squares());
+ emptySquares = (Type == MV_QUIET ? target : pos.empty_squares());
b1 = move_pawns<UP>(pawnsNotOn7) & emptySquares;
b2 = move_pawns<UP>(b1 & TRank3BB) & emptySquares;
b2 &= target;
}
- if (Type == MV_NON_CAPTURE_CHECK)
+ if (Type == MV_QUIET_CHECK)
{
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
b1 = move_pawns<RIGHT>(pawnsNotOn7) & enemies;
b2 = move_pawns<LEFT >(pawnsNotOn7) & enemies;
- SERIALIZE_PAWNS(b1, -RIGHT);
- SERIALIZE_PAWNS(b2, -LEFT);
+ SERIALIZE_PAWNS(b1, RIGHT);
+ SERIALIZE_PAWNS(b2, LEFT);
if (pos.ep_square() != SQ_NONE)
{
// 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
// is a discovery check and we are forced to do otherwise.
- if (Type == MV_EVASION && !bit_is_set(target, pos.ep_square() - UP))
+ if (Type == MV_EVASION && !(target & (pos.ep_square() - UP)))
return mlist;
b1 = pawnsNotOn7 & pos.attacks_from<PAWN>(pos.ep_square(), Them);
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 && (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);
/// generate<MV_CAPTURE> generates all pseudo-legal captures and queen
/// promotions. Returns a pointer to the end of the move list.
///
-/// generate<MV_NON_CAPTURE> generates all pseudo-legal non-captures and
+/// generate<MV_QUIET> generates all pseudo-legal non-captures and
/// underpromotions. Returns a pointer to the end of the move list.
///
/// generate<MV_NON_EVASION> generates all pseudo-legal captures and
template<MoveType Type>
MoveStack* generate(const Position& pos, MoveStack* mlist) {
- assert(Type == MV_CAPTURE || Type == MV_NON_CAPTURE || Type == MV_NON_EVASION);
+ assert(Type == MV_CAPTURE || Type == MV_QUIET || Type == MV_NON_EVASION);
assert(!pos.in_check());
Color us = pos.side_to_move();
if (Type == MV_CAPTURE)
target = pos.pieces(~us);
- else if (Type == MV_NON_CAPTURE)
+ else if (Type == MV_QUIET)
target = pos.empty_squares();
else if (Type == MV_NON_EVASION)
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;
// Explicit template instantiations
template MoveStack* generate<MV_CAPTURE>(const Position& pos, MoveStack* mlist);
-template MoveStack* generate<MV_NON_CAPTURE>(const Position& pos, MoveStack* mlist);
+template MoveStack* generate<MV_QUIET>(const Position& pos, MoveStack* mlist);
template MoveStack* generate<MV_NON_EVASION>(const Position& pos, MoveStack* mlist);
-/// generate<MV_NON_CAPTURE_CHECK> generates all pseudo-legal non-captures and knight
+/// generate<MV_QUIET_CHECK> generates all pseudo-legal non-captures and knight
/// underpromotions that give check. Returns a pointer to the end of the move list.
template<>
-MoveStack* generate<MV_NON_CAPTURE_CHECK>(const Position& pos, MoveStack* mlist) {
+MoveStack* generate<MV_QUIET_CHECK>(const Position& pos, MoveStack* mlist) {
assert(!pos.in_check());
SERIALIZE(b);
}
- mlist = (us == WHITE ? generate_pawn_moves<WHITE, MV_NON_CAPTURE_CHECK>(pos, mlist, ci.dcCandidates, ci.ksq)
- : generate_pawn_moves<BLACK, MV_NON_CAPTURE_CHECK>(pos, mlist, ci.dcCandidates, ci.ksq));
+ mlist = (us == WHITE ? generate_pawn_moves<WHITE, MV_QUIET_CHECK>(pos, mlist, ci.dcCandidates, ci.ksq)
+ : generate_pawn_moves<BLACK, MV_QUIET_CHECK>(pos, mlist, ci.dcCandidates, ci.ksq));
mlist = generate_direct_checks<KNIGHT>(pos, mlist, us, ci);
mlist = generate_direct_checks<BISHOP>(pos, mlist, us, ci);
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;
// If queen and king are far or not on a diagonal line we can safely
// remove all the squares attacked in the other direction becuase are
// not reachable by the king anyway.
- if (squares_between(ksq, checksq) || !bit_is_set(PseudoAttacks[BISHOP][checksq], ksq))
+ if (squares_between(ksq, checksq) || !(PseudoAttacks[BISHOP][checksq] & ksq))
sliderAttacks |= PseudoAttacks[QUEEN][checksq];
// Otherwise we need to use real rook attacks to check if king is safe
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);
}