/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2014 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
#include "movegen.h"
#include "position.h"
-/// 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))
-
-/// 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); }
namespace {
- template<CastlingSide Side, bool Checks, bool Chess960>
- ExtMove* generate_castle(const Position& pos, ExtMove* mlist, Color us) {
+ template<CastlingRight Cr, bool Checks, bool Chess960>
+ ExtMove* generate_castling(const Position& pos, ExtMove* mlist, Color us, const CheckInfo* ci) {
+
+ static const bool KingSide = (Cr == WHITE_OO || Cr == BLACK_OO);
- if (pos.castle_impeded(us, Side) || !pos.can_castle(make_castle_right(us, Side)))
+ if (pos.castling_impeded(Cr) || !pos.can_castle(Cr))
return mlist;
// 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 rfrom = pos.castle_rook_square(us, Side);
- Square kto = relative_square(us, Side == KING_SIDE ? SQ_G1 : SQ_C1);
+ Square rfrom = pos.castling_rook_square(Cr);
+ Square kto = relative_square(us, KingSide ? SQ_G1 : SQ_C1);
Bitboard enemies = pos.pieces(~us);
assert(!pos.checkers());
- const int K = Chess960 ? kto > kfrom ? -1 : 1
- : Side == KING_SIDE ? -1 : 1;
+ const Square K = Chess960 ? kto > kfrom ? DELTA_W : DELTA_E
+ : KingSide ? DELTA_W : DELTA_E;
- for (Square s = kto; s != kfrom; s += (Square)K)
+ for (Square s = kto; s != kfrom; s += K)
if (pos.attackers_to(s) & enemies)
return mlist;
if (Chess960 && (attacks_bb<ROOK>(kto, pos.pieces() ^ rfrom) & pos.pieces(~us, ROOK, QUEEN)))
return mlist;
- (mlist++)->move = make<CASTLE>(kfrom, rfrom);
+ Move m = make<CASTLING>(kfrom, rfrom);
- if (Checks && !pos.gives_check((mlist - 1)->move, CheckInfo(pos)))
- --mlist;
+ if (Checks && !pos.gives_check(m, *ci))
+ return mlist;
+
+ (mlist++)->move = m;
return mlist;
}
(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.
+ // 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))
(mlist++)->move = make<PROMOTION>(to - Delta, to, KNIGHT);
else
// Add pawn pushes which give discovered check. This is possible only
// if the pawn is not on the same file as the enemy king, because we
// don't generate captures. Note that a possible discovery check
- // promotion has been already generated among captures.
+ // promotion has been already generated amongst the captures.
if (pawnsNotOn7 & ci->dcCandidates)
{
dc1 = shift_bb<Up>(pawnsNotOn7 & ci->dcCandidates) & emptySquares & ~file_bb(ci->ksq);
}
}
- SERIALIZE_PAWNS(b1, Up);
- SERIALIZE_PAWNS(b2, Up + Up);
+ while (b1)
+ {
+ Square to = pop_lsb(&b1);
+ (mlist++)->move = make_move(to - Up, to);
+ }
+
+ while (b2)
+ {
+ Square to = pop_lsb(&b2);
+ (mlist++)->move = make_move(to - Up - Up, to);
+ }
}
// Promotions and underpromotions
b1 = shift_bb<Right>(pawnsNotOn7) & enemies;
b2 = shift_bb<Left >(pawnsNotOn7) & enemies;
- SERIALIZE_PAWNS(b1, Right);
- SERIALIZE_PAWNS(b2, Left);
+ while (b1)
+ {
+ Square to = pop_lsb(&b1);
+ (mlist++)->move = make_move(to - Right, to);
+ }
+
+ while (b2)
+ {
+ Square to = pop_lsb(&b2);
+ (mlist++)->move = make_move(to - Left, to);
+ }
if (pos.ep_square() != SQ_NONE)
{
if (Checks)
b &= ci->checkSq[Pt];
- SERIALIZE(b);
+ while (b)
+ (mlist++)->move = make_move(from, pop_lsb(&b));
}
return mlist;
if (Type != QUIET_CHECKS && Type != EVASIONS)
{
- Square from = pos.king_square(Us);
- Bitboard b = pos.attacks_from<KING>(from) & target;
- SERIALIZE(b);
+ Square ksq = pos.king_square(Us);
+ Bitboard b = pos.attacks_from<KING>(ksq) & target;
+ while (b)
+ (mlist++)->move = make_move(ksq, pop_lsb(&b));
}
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_castling<MakeCastling<Us, KING_SIDE>::right, Checks, true>(pos, mlist, Us, ci);
+ mlist = generate_castling<MakeCastling<Us, QUEEN_SIDE>::right, Checks, true>(pos, mlist, Us, ci);
}
else
{
- mlist = generate_castle< KING_SIDE, Checks, false>(pos, mlist, Us);
- mlist = generate_castle<QUEEN_SIDE, Checks, false>(pos, mlist, Us);
+ mlist = generate_castling<MakeCastling<Us, KING_SIDE>::right, Checks, false>(pos, mlist, Us, ci);
+ mlist = generate_castling<MakeCastling<Us, QUEEN_SIDE>::right, Checks, false>(pos, mlist, Us, ci);
}
}
PieceType pt = type_of(pos.piece_on(from));
if (pt == PAWN)
- continue; // Will be generated togheter with direct checks
+ continue; // Will be generated together with direct checks
Bitboard b = pos.attacks_from(Piece(pt), from) & ~pos.pieces();
if (pt == KING)
b &= ~PseudoAttacks[QUEEN][ci.ksq];
- SERIALIZE(b);
+ while (b)
+ (mlist++)->move = make_move(from, pop_lsb(&b));
}
return us == WHITE ? generate_all<WHITE, QUIET_CHECKS>(pos, mlist, ~pos.pieces(), &ci)
assert(pos.checkers());
- int checkersCnt = 0;
Color us = pos.side_to_move();
- Square ksq = pos.king_square(us), from = ksq /* For SERIALIZE */, checksq;
+ Square ksq = pos.king_square(us);
Bitboard sliderAttacks = 0;
- Bitboard b = pos.checkers();
-
- assert(pos.checkers());
+ Bitboard sliders = pos.checkers() & ~pos.pieces(KNIGHT, PAWN);
- // Find squares attacked by slider checkers, we will remove them from the king
- // evasions so to skip known illegal moves avoiding useless legality check later.
- do
+ // Find all the squares attacked by slider checkers. We will remove them from
+ // the king evasions in order to skip known illegal moves, which avoids any
+ // useless legality checks later on.
+ while (sliders)
{
- ++checkersCnt;
- checksq = pop_lsb(&b);
-
- assert(color_of(pos.piece_on(checksq)) == ~us);
-
- if (type_of(pos.piece_on(checksq)) > KNIGHT) // A slider
- sliderAttacks |= LineBB[checksq][ksq] ^ checksq;
-
- } while (b);
+ Square checksq = pop_lsb(&sliders);
+ sliderAttacks |= LineBB[checksq][ksq] ^ checksq;
+ }
// Generate evasions for king, capture and non capture moves
- b = pos.attacks_from<KING>(ksq) & ~pos.pieces(us) & ~sliderAttacks;
- SERIALIZE(b);
+ Bitboard b = pos.attacks_from<KING>(ksq) & ~pos.pieces(us) & ~sliderAttacks;
+ while (b)
+ (mlist++)->move = make_move(ksq, pop_lsb(&b));
- if (checkersCnt > 1)
+ if (more_than_one(pos.checkers()))
return mlist; // Double check, only a king move can save the day
// Generate blocking evasions or captures of the checking piece
+ Square checksq = lsb(pos.checkers());
Bitboard target = between_bb(checksq, ksq) | checksq;
return us == WHITE ? generate_all<WHITE, EVASIONS>(pos, mlist, target)
projects / stockfish / blobdiff