/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, 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
// After castling, the rook and king final positions are the same in Chess960
// as they would be in standard chess.
- Square kfrom = pos.king_square(us);
+ Square kfrom = pos.square<KING>(us);
Square rfrom = pos.castling_rook_square(Cr);
Square kto = relative_square(us, KingSide ? SQ_G1 : SQ_C1);
Bitboard enemies = pos.pieces(~us);
if (Checks && !pos.gives_check(m, *ci))
return moveList;
+ else
+ (void)ci; // Silence a warning under MSVC
- (moveList++)->move = m;
-
+ *moveList++ = m;
return moveList;
}
template<GenType Type, Square Delta>
- inline ExtMove* make_promotions(ExtMove* moveList, Square to, const CheckInfo* ci) {
+ ExtMove* make_promotions(ExtMove* moveList, Square to, const CheckInfo* ci) {
if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS)
- (moveList++)->move = make<PROMOTION>(to - Delta, to, QUEEN);
+ *moveList++ = make<PROMOTION>(to - Delta, to, QUEEN);
if (Type == QUIETS || Type == EVASIONS || Type == NON_EVASIONS)
{
- (moveList++)->move = make<PROMOTION>(to - Delta, to, ROOK);
- (moveList++)->move = make<PROMOTION>(to - Delta, to, BISHOP);
- (moveList++)->move = make<PROMOTION>(to - Delta, to, KNIGHT);
+ *moveList++ = make<PROMOTION>(to - Delta, to, ROOK);
+ *moveList++ = make<PROMOTION>(to - Delta, to, BISHOP);
+ *moveList++ = make<PROMOTION>(to - Delta, to, KNIGHT);
}
// Knight promotion is the only promotion that can give a direct check
// that's not already included in the queen promotion.
if (Type == QUIET_CHECKS && (StepAttacksBB[W_KNIGHT][to] & ci->ksq))
- (moveList++)->move = make<PROMOTION>(to - Delta, to, KNIGHT);
+ *moveList++ = make<PROMOTION>(to - Delta, to, KNIGHT);
else
(void)ci; // Silence a warning under MSVC
while (b1)
{
Square to = pop_lsb(&b1);
- (moveList++)->move = make_move(to - Up, to);
+ *moveList++ = make_move(to - Up, to);
}
while (b2)
{
Square to = pop_lsb(&b2);
- (moveList++)->move = make_move(to - Up - Up, to);
+ *moveList++ = make_move(to - Up - Up, to);
}
}
while (b1)
{
Square to = pop_lsb(&b1);
- (moveList++)->move = make_move(to - Right, to);
+ *moveList++ = make_move(to - Right, to);
}
while (b2)
{
Square to = pop_lsb(&b2);
- (moveList++)->move = make_move(to - Left, to);
+ *moveList++ = make_move(to - Left, to);
}
if (pos.ep_square() != SQ_NONE)
assert(b1);
while (b1)
- (moveList++)->move = make<ENPASSANT>(pop_lsb(&b1), pos.ep_square());
+ *moveList++ = make<ENPASSANT>(pop_lsb(&b1), pos.ep_square());
}
}
}
- template<PieceType Pt, bool Checks> FORCE_INLINE
+ template<PieceType Pt, bool Checks>
ExtMove* generate_moves(const Position& pos, ExtMove* moveList, Color us,
Bitboard target, const CheckInfo* ci) {
assert(Pt != KING && Pt != PAWN);
- const Square* pl = pos.list<Pt>(us);
+ const Square* pl = pos.squares<Pt>(us);
for (Square from = *pl; from != SQ_NONE; from = *++pl)
{
if (Checks)
{
if ( (Pt == BISHOP || Pt == ROOK || Pt == QUEEN)
- && !(PseudoAttacks[Pt][from] & target & ci->checkSq[Pt]))
+ && !(PseudoAttacks[Pt][from] & target & ci->checkSquares[Pt]))
continue;
- if (unlikely(ci->dcCandidates) && (ci->dcCandidates & from))
+ if (ci->dcCandidates && (ci->dcCandidates & from))
continue;
}
Bitboard b = pos.attacks_from<Pt>(from) & target;
if (Checks)
- b &= ci->checkSq[Pt];
+ b &= ci->checkSquares[Pt];
while (b)
- (moveList++)->move = make_move(from, pop_lsb(&b));
+ *moveList++ = make_move(from, pop_lsb(&b));
}
return moveList;
}
- template<Color Us, GenType Type> FORCE_INLINE
+ template<Color Us, GenType Type>
ExtMove* generate_all(const Position& pos, ExtMove* moveList, Bitboard target,
- const CheckInfo* ci = NULL) {
+ const CheckInfo* ci = nullptr) {
const bool Checks = Type == QUIET_CHECKS;
if (Type != QUIET_CHECKS && Type != EVASIONS)
{
- Square ksq = pos.king_square(Us);
+ Square ksq = pos.square<KING>(Us);
Bitboard b = pos.attacks_from<KING>(ksq) & target;
while (b)
- (moveList++)->move = make_move(ksq, pop_lsb(&b));
+ *moveList++ = make_move(ksq, pop_lsb(&b));
}
if (Type != CAPTURES && Type != EVASIONS && pos.can_castle(Us))
b &= ~PseudoAttacks[QUEEN][ci.ksq];
while (b)
- (moveList++)->move = make_move(from, pop_lsb(&b));
+ *moveList++ = make_move(from, pop_lsb(&b));
}
return us == WHITE ? generate_all<WHITE, QUIET_CHECKS>(pos, moveList, ~pos.pieces(), &ci)
assert(pos.checkers());
Color us = pos.side_to_move();
- Square ksq = pos.king_square(us);
+ Square ksq = pos.square<KING>(us);
Bitboard sliderAttacks = 0;
Bitboard sliders = pos.checkers() & ~pos.pieces(KNIGHT, PAWN);
// Generate evasions for king, capture and non capture moves
Bitboard b = pos.attacks_from<KING>(ksq) & ~pos.pieces(us) & ~sliderAttacks;
while (b)
- (moveList++)->move = make_move(ksq, pop_lsb(&b));
+ *moveList++ = make_move(ksq, pop_lsb(&b));
if (more_than_one(pos.checkers()))
return moveList; // Double check, only a king move can save the day
ExtMove* generate<LEGAL>(const Position& pos, ExtMove* moveList) {
Bitboard pinned = pos.pinned_pieces(pos.side_to_move());
- Square ksq = pos.king_square(pos.side_to_move());
+ Square ksq = pos.square<KING>(pos.side_to_move());
ExtMove* cur = moveList;
moveList = pos.checkers() ? generate<EVASIONS >(pos, moveList)
: generate<NON_EVASIONS>(pos, moveList);
while (cur != moveList)
- if ( (pinned || from_sq(cur->move) == ksq || type_of(cur->move) == ENPASSANT)
- && !pos.legal(cur->move, pinned))
- cur->move = (--moveList)->move;
+ if ( (pinned || from_sq(*cur) == ksq || type_of(*cur) == ENPASSANT)
+ && !pos.legal(*cur, pinned))
+ *cur = (--moveList)->move;
else
++cur;