(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;
}
&& !(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
- ExtMove* generate_all(const Position& pos, ExtMove* 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);
}
}
: 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
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);
}
// 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 blocking evasions or captures of the checking piece
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<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;
}