/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Square kto = relative_square(us, Side == KING_SIDE ? SQ_G1 : SQ_C1);
Bitboard enemies = pos.pieces(~us);
- assert(!pos.in_check());
+ assert(!pos.checkers());
const int K = Chess960 ? kto > kfrom ? -1 : 1
: Side == KING_SIDE ? -1 : 1;
}
- FORCE_INLINE MoveStack* generate_king_moves(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);
- return mlist;
- }
-
-
template<GenType Type> FORCE_INLINE
- MoveStack* generate_all_moves(const Position& pos, MoveStack* mlist, Color us,
- Bitboard target, const CheckInfo* ci = NULL) {
+ MoveStack* generate_all(const Position& pos, MoveStack* mlist, Color us,
+ 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, Type == QUIET_CHECKS>(pos, mlist, us, target, ci);
- mlist = generate_moves<BISHOP, Type == QUIET_CHECKS>(pos, mlist, us, target, ci);
- mlist = generate_moves<ROOK, Type == QUIET_CHECKS>(pos, mlist, us, target, ci);
- mlist = generate_moves<QUEEN, Type == QUIET_CHECKS>(pos, mlist, us, 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)
- mlist = generate_king_moves(pos, mlist, us, target);
+ {
+ 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 (pos.is_chess960())
{
- mlist = generate_castle<KING_SIDE, Type == QUIET_CHECKS, true>(pos, mlist, us);
- mlist = generate_castle<QUEEN_SIDE, Type == QUIET_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, Type == QUIET_CHECKS, false>(pos, mlist, us);
- mlist = generate_castle<QUEEN_SIDE, Type == QUIET_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);
}
}
MoveStack* generate(const Position& pos, MoveStack* mlist) {
assert(Type == CAPTURES || Type == QUIETS || Type == NON_EVASIONS);
- assert(!pos.in_check());
+ assert(!pos.checkers());
Color us = pos.side_to_move();
- Bitboard target;
-
- if (Type == CAPTURES)
- target = pos.pieces(~us);
- else if (Type == QUIETS)
- target = ~pos.pieces();
+ Bitboard target = Type == CAPTURES ? pos.pieces(~us)
+ : Type == QUIETS ? ~pos.pieces()
+ : Type == NON_EVASIONS ? ~pos.pieces(us) : 0;
- else if (Type == NON_EVASIONS)
- target = ~pos.pieces(us);
-
- return generate_all_moves<Type>(pos, mlist, us, target);
+ return generate_all<Type>(pos, mlist, us, target);
}
// Explicit template instantiations
template<>
MoveStack* generate<QUIET_CHECKS>(const Position& pos, MoveStack* mlist) {
- assert(!pos.in_check());
+ assert(!pos.checkers());
- Color us = pos.side_to_move();
CheckInfo ci(pos);
Bitboard dc = ci.dcCandidates;
SERIALIZE(b);
}
- return generate_all_moves<QUIET_CHECKS>(pos, mlist, us, ~pos.pieces(), &ci);
+ return generate_all<QUIET_CHECKS>(pos, mlist, pos.side_to_move(), ~pos.pieces(), &ci);
}
template<>
MoveStack* generate<EVASIONS>(const Position& pos, MoveStack* mlist) {
- assert(pos.in_check());
+ assert(pos.checkers());
Square from, checksq;
int checkersCnt = 0;
// Generate blocking evasions or captures of the checking piece
Bitboard target = between_bb(checksq, ksq) | pos.checkers();
- return generate_all_moves<EVASIONS>(pos, mlist, us, target);
+ return generate_all<EVASIONS>(pos, mlist, us, target);
}
Bitboard pinned = pos.pinned_pieces();
Square ksq = pos.king_square(pos.side_to_move());
- end = pos.in_check() ? generate<EVASIONS>(pos, mlist)
+ end = pos.checkers() ? generate<EVASIONS>(pos, mlist)
: generate<NON_EVASIONS>(pos, mlist);
while (cur != end)
if ( (pinned || from_sq(cur->move) == ksq || type_of(cur->move) == ENPASSANT)