/// Simple macro to wrap a very common while loop, no facny, no flexibility,
/// hardcoded names 'mlist' and 'from'.
-#define SERIALIZE(b) while (b) (*mlist++).move = make_move(from, pop_lsb(&b))
+#define SERIALIZE(b) while (b) (mlist++)->move = make_move(from, pop_lsb(&b))
/// 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_lsb(&b); \
- (*mlist++).move = make_move(to - (d), to); }
+ (mlist++)->move = make_move(to - (d), to); }
namespace {
template<CastlingSide Side, bool Checks, bool Chess960>
- MoveStack* generate_castle(const Position& pos, MoveStack* mlist, Color us) {
+ ExtMove* generate_castle(const Position& pos, ExtMove* mlist, Color us) {
if (pos.castle_impeded(us, Side) || !pos.can_castle(make_castle_right(us, Side)))
return mlist;
if (Chess960 && (pos.attackers_to(kto, pos.pieces() ^ rfrom) & enemies))
return mlist;
- (*mlist++).move = make<CASTLE>(kfrom, rfrom);
+ (mlist++)->move = make<CASTLE>(kfrom, rfrom);
- if (Checks && !pos.move_gives_check((mlist - 1)->move, CheckInfo(pos)))
- mlist--;
+ if (Checks && !pos.gives_check((mlist - 1)->move, CheckInfo(pos)))
+ --mlist;
return mlist;
}
template<GenType Type, Square Delta>
- inline MoveStack* generate_promotions(MoveStack* mlist, Bitboard pawnsOn7,
- Bitboard target, const CheckInfo* ci) {
+ inline ExtMove* generate_promotions(ExtMove* mlist, Bitboard pawnsOn7,
+ Bitboard target, const CheckInfo* ci) {
Bitboard b = shift_bb<Delta>(pawnsOn7) & target;
Square to = pop_lsb(&b);
if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS)
- (*mlist++).move = make<PROMOTION>(to - Delta, to, QUEEN);
+ (mlist++)->move = make<PROMOTION>(to - Delta, to, QUEEN);
if (Type == QUIETS || Type == EVASIONS || Type == NON_EVASIONS)
{
- (*mlist++).move = make<PROMOTION>(to - Delta, to, ROOK);
- (*mlist++).move = make<PROMOTION>(to - Delta, to, BISHOP);
- (*mlist++).move = make<PROMOTION>(to - Delta, to, KNIGHT);
+ (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 direct check not
// already included in the queen-promotion.
if (Type == QUIET_CHECKS && (StepAttacksBB[W_KNIGHT][to] & ci->ksq))
- (*mlist++).move = make<PROMOTION>(to - Delta, to, KNIGHT);
+ (mlist++)->move = make<PROMOTION>(to - Delta, to, KNIGHT);
else
(void)ci; // Silence a warning under MSVC
}
template<Color Us, GenType Type>
- MoveStack* generate_pawn_moves(const Position& pos, MoveStack* mlist,
- Bitboard target, const CheckInfo* ci) {
+ ExtMove* generate_pawn_moves(const Position& pos, ExtMove* mlist,
+ Bitboard target, const CheckInfo* ci) {
// Compute our parametrized parameters at compile time, named according to
// the point of view of white side.
assert(b1);
while (b1)
- (*mlist++).move = make<ENPASSANT>(pop_lsb(&b1), pos.ep_square());
+ (mlist++)->move = make<ENPASSANT>(pop_lsb(&b1), pos.ep_square());
}
}
template<PieceType Pt, bool Checks> FORCE_INLINE
- MoveStack* generate_moves(const Position& pos, MoveStack* mlist, Color us,
- Bitboard target, const CheckInfo* ci) {
+ ExtMove* generate_moves(const Position& pos, ExtMove* mlist, Color us,
+ Bitboard target, const CheckInfo* ci) {
assert(Pt != KING && Pt != PAWN);
- const Square* pl = pos.piece_list(us, Pt);
+ const Square* pl = pos.list<Pt>(us);
for (Square from = *pl; from != SQ_NONE; from = *++pl)
{
&& !(PseudoAttacks[Pt][from] & target & ci->checkSq[Pt]))
continue;
- if (ci->dcCandidates && (ci->dcCandidates & from))
+ if (unlikely(ci->dcCandidates) && (ci->dcCandidates & from))
continue;
}
}
- template<GenType Type> FORCE_INLINE
- MoveStack* generate_all(const Position& pos, MoveStack* mlist, Color us,
- Bitboard target, const CheckInfo* ci = NULL) {
+ template<Color Us, GenType Type> FORCE_INLINE
+ ExtMove* generate_all(const Position& pos, ExtMove* mlist, Bitboard target,
+ const CheckInfo* ci = NULL) {
const bool Checks = Type == QUIET_CHECKS;
- mlist = (us == WHITE ? generate_pawn_moves<WHITE, Type>(pos, mlist, target, ci)
- : generate_pawn_moves<BLACK, Type>(pos, mlist, target, ci));
-
- mlist = generate_moves<KNIGHT, Checks>(pos, mlist, us, target, ci);
- mlist = generate_moves<BISHOP, Checks>(pos, mlist, us, target, ci);
- mlist = generate_moves<ROOK, Checks>(pos, mlist, us, target, ci);
- mlist = generate_moves<QUEEN, Checks>(pos, mlist, us, target, ci);
+ mlist = generate_pawn_moves<Us, Type>(pos, mlist, target, ci);
+ mlist = generate_moves<KNIGHT, Checks>(pos, mlist, Us, target, ci);
+ mlist = generate_moves<BISHOP, Checks>(pos, mlist, Us, target, ci);
+ mlist = generate_moves< ROOK, Checks>(pos, mlist, Us, target, ci);
+ mlist = generate_moves< QUEEN, Checks>(pos, mlist, Us, target, ci);
if (Type != QUIET_CHECKS && Type != EVASIONS)
{
- Square from = pos.king_square(us);
+ Square from = pos.king_square(Us);
Bitboard b = pos.attacks_from<KING>(from) & target;
SERIALIZE(b);
}
- if (Type != CAPTURES && Type != EVASIONS && pos.can_castle(us))
+ if (Type != CAPTURES && Type != EVASIONS && pos.can_castle(Us))
{
if (pos.is_chess960())
{
- mlist = generate_castle<KING_SIDE, Checks, true>(pos, mlist, us);
- mlist = generate_castle<QUEEN_SIDE, Checks, true>(pos, mlist, us);
+ mlist = generate_castle< KING_SIDE, Checks, true>(pos, mlist, Us);
+ mlist = generate_castle<QUEEN_SIDE, Checks, true>(pos, mlist, Us);
}
else
{
- mlist = generate_castle<KING_SIDE, Checks, false>(pos, mlist, us);
- mlist = generate_castle<QUEEN_SIDE, Checks, false>(pos, mlist, us);
+ mlist = generate_castle< KING_SIDE, Checks, false>(pos, mlist, Us);
+ mlist = generate_castle<QUEEN_SIDE, Checks, false>(pos, mlist, Us);
}
}
/// non-captures. Returns a pointer to the end of the move list.
template<GenType Type>
-MoveStack* generate(const Position& pos, MoveStack* mlist) {
+ExtMove* generate(const Position& pos, ExtMove* mlist) {
assert(Type == CAPTURES || Type == QUIETS || Type == NON_EVASIONS);
assert(!pos.checkers());
: Type == QUIETS ? ~pos.pieces()
: Type == NON_EVASIONS ? ~pos.pieces(us) : 0;
- return generate_all<Type>(pos, mlist, us, target);
+ return us == WHITE ? generate_all<WHITE, Type>(pos, mlist, target)
+ : generate_all<BLACK, Type>(pos, mlist, target);
}
// Explicit template instantiations
-template MoveStack* generate<CAPTURES>(const Position&, MoveStack*);
-template MoveStack* generate<QUIETS>(const Position&, MoveStack*);
-template MoveStack* generate<NON_EVASIONS>(const Position&, MoveStack*);
+template ExtMove* generate<CAPTURES>(const Position&, ExtMove*);
+template ExtMove* generate<QUIETS>(const Position&, ExtMove*);
+template ExtMove* generate<NON_EVASIONS>(const Position&, ExtMove*);
/// generate<QUIET_CHECKS> 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<QUIET_CHECKS>(const Position& pos, MoveStack* mlist) {
+ExtMove* generate<QUIET_CHECKS>(const Position& pos, ExtMove* mlist) {
assert(!pos.checkers());
+ Color us = pos.side_to_move();
CheckInfo ci(pos);
Bitboard dc = ci.dcCandidates;
SERIALIZE(b);
}
- return generate_all<QUIET_CHECKS>(pos, mlist, pos.side_to_move(), ~pos.pieces(), &ci);
+ return us == WHITE ? generate_all<WHITE, QUIET_CHECKS>(pos, mlist, ~pos.pieces(), &ci)
+ : generate_all<BLACK, QUIET_CHECKS>(pos, mlist, ~pos.pieces(), &ci);
}
/// generate<EVASIONS> generates all pseudo-legal check evasions when the side
/// to move is in check. Returns a pointer to the end of the move list.
template<>
-MoveStack* generate<EVASIONS>(const Position& pos, MoveStack* mlist) {
+ExtMove* generate<EVASIONS>(const Position& pos, ExtMove* mlist) {
assert(pos.checkers());
- Square from, checksq;
int checkersCnt = 0;
Color us = pos.side_to_move();
- Square ksq = pos.king_square(us);
+ Square ksq = pos.king_square(us), from = ksq /* For SERIALIZE */, checksq;
Bitboard sliderAttacks = 0;
Bitboard b = pos.checkers();
// evasions so to skip known illegal moves avoiding useless legality check later.
do
{
- checkersCnt++;
+ ++checkersCnt;
checksq = pop_lsb(&b);
assert(color_of(pos.piece_on(checksq)) == ~us);
// Generate evasions for king, capture and non capture moves
b = pos.attacks_from<KING>(ksq) & ~pos.pieces(us) & ~sliderAttacks;
- from = ksq;
SERIALIZE(b);
if (checkersCnt > 1)
return mlist; // Double check, only a king move can save the day
// Generate blocking evasions or captures of the checking piece
- Bitboard target = between_bb(checksq, ksq) | pos.checkers();
+ Bitboard target = between_bb(checksq, ksq) | checksq;
- return generate_all<EVASIONS>(pos, mlist, us, target);
+ return us == WHITE ? generate_all<WHITE, EVASIONS>(pos, mlist, target)
+ : generate_all<BLACK, EVASIONS>(pos, mlist, target);
}
/// generate<LEGAL> generates all the legal moves in the given position
template<>
-MoveStack* generate<LEGAL>(const Position& pos, MoveStack* mlist) {
+ExtMove* generate<LEGAL>(const Position& pos, ExtMove* mlist) {
- MoveStack *end, *cur = mlist;
+ ExtMove *end, *cur = mlist;
Bitboard pinned = pos.pinned_pieces();
Square ksq = pos.king_square(pos.side_to_move());
: generate<NON_EVASIONS>(pos, mlist);
while (cur != end)
if ( (pinned || from_sq(cur->move) == ksq || type_of(cur->move) == ENPASSANT)
- && !pos.pl_move_is_legal(cur->move, pinned))
+ && !pos.legal(cur->move, pinned))
cur->move = (--end)->move;
else
- cur++;
+ ++cur;
return end;
}