X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=5b462c66879e42a06d42018dffda75ba2bc17231;hp=dcd7e60b6abf6c9c65835a501beee7f2655dee58;hb=1d1b7df7c6b3496d1a3fe926cadf25d91e1558f6;hpb=0de92576100bba948cae854ebb9cd5a7a9502b43
diff --git a/src/movegen.cpp b/src/movegen.cpp
index dcd7e60b..5b462c66 100644
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -1,7 +1,7 @@
/*
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-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
@@ -17,94 +17,87 @@
along with this program. If not, see .
*/
-#include
#include
#include "movegen.h"
#include "position.h"
-/// Simple macro to wrap a very common while loop, no facny, no flexibility,
+/// Simple macro to wrap a very common while loop, no fancy, 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
- MoveStack* generate_castle(const Position& pos, MoveStack* mlist, Color us) {
+ template
+ ExtMove* generate_castling(const Position& pos, ExtMove* mlist, Color us, const CheckInfo* ci) {
- if (pos.castle_impeded(us, Side) || !pos.can_castle(make_castle_right(us, Side)))
+ static const bool KingSide = (Cr == WHITE_OO || Cr == BLACK_OO);
+
+ 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.in_check());
+ assert(!pos.checkers());
+
+ const Square K = Chess960 ? kto > kfrom ? DELTA_W : DELTA_E
+ : KingSide ? DELTA_W : DELTA_E;
- for (Square s = std::min(kfrom, kto), e = std::max(kfrom, kto); s <= e; s++)
- if ( s != kfrom // We are not in check
- && (pos.attackers_to(s) & enemies))
+ for (Square s = kto; s != kfrom; s += K)
+ if (pos.attackers_to(s) & enemies)
return mlist;
// Because we generate only legal castling moves we need to verify that
// when moving the castling rook we do not discover some hidden checker.
// For instance an enemy queen in SQ_A1 when castling rook is in SQ_B1.
- if ( pos.is_chess960()
- && (pos.attackers_to(kto, pos.pieces() ^ rfrom) & enemies))
- return mlist;
-
- (*mlist++).move = make(kfrom, rfrom);
-
- if (OnlyChecks && !pos.move_gives_check((mlist - 1)->move, CheckInfo(pos)))
- mlist--;
+ if (Chess960 && (attacks_bb(kto, pos.pieces() ^ rfrom) & pos.pieces(~us, ROOK, QUEEN)))
+ return mlist;
- return mlist;
- }
+ Move m = make(kfrom, rfrom);
+ if (Checks && !pos.gives_check(m, *ci))
+ return mlist;
- template
- inline Bitboard move_pawns(Bitboard p) {
+ (mlist++)->move = m;
- return Delta == DELTA_N ? p << 8
- : Delta == DELTA_S ? p >> 8
- : Delta == DELTA_NE ? (p & ~FileHBB) << 9
- : Delta == DELTA_SE ? (p & ~FileHBB) >> 7
- : Delta == DELTA_NW ? (p & ~FileABB) << 7
- : Delta == DELTA_SW ? (p & ~FileABB) >> 9 : 0;
+ return mlist;
}
template
- inline MoveStack* generate_promotions(MoveStack* mlist, Bitboard pawnsOn7, Bitboard target, Square ksq) {
+ inline ExtMove* generate_promotions(ExtMove* mlist, Bitboard pawnsOn7,
+ Bitboard target, const CheckInfo* ci) {
- Bitboard b = move_pawns(pawnsOn7) & target;
+ Bitboard b = shift_bb(pawnsOn7) & target;
while (b)
{
Square to = pop_lsb(&b);
if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS)
- (*mlist++).move = make(to - Delta, to, QUEEN);
+ (mlist++)->move = make(to - Delta, to, QUEEN);
if (Type == QUIETS || Type == EVASIONS || Type == NON_EVASIONS)
{
- (*mlist++).move = make(to - Delta, to, ROOK);
- (*mlist++).move = make(to - Delta, to, BISHOP);
- (*mlist++).move = make(to - Delta, to, KNIGHT);
+ (mlist++)->move = make(to - Delta, to, ROOK);
+ (mlist++)->move = make(to - Delta, to, BISHOP);
+ (mlist++)->move = make(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] & ksq))
- (*mlist++).move = make(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))
+ (mlist++)->move = make(to - Delta, to, KNIGHT);
else
- (void)ksq; // Silence a warning under MSVC
+ (void)ci; // Silence a warning under MSVC
}
return mlist;
@@ -112,7 +105,8 @@ namespace {
template
- MoveStack* generate_pawn_moves(const Position& pos, MoveStack* mlist, Bitboard target, Square ksq = SQ_NONE) {
+ 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.
@@ -120,9 +114,9 @@ namespace {
const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB);
const Bitboard TRank7BB = (Us == WHITE ? Rank7BB : Rank2BB);
const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB);
- const Square UP = (Us == WHITE ? DELTA_N : DELTA_S);
- const Square RIGHT = (Us == WHITE ? DELTA_NE : DELTA_SW);
- const Square LEFT = (Us == WHITE ? DELTA_NW : DELTA_SE);
+ const Square Up = (Us == WHITE ? DELTA_N : DELTA_S);
+ const Square Right = (Us == WHITE ? DELTA_NE : DELTA_SW);
+ const Square Left = (Us == WHITE ? DELTA_NW : DELTA_SE);
Bitboard b1, b2, dc1, dc2, emptySquares;
@@ -135,10 +129,10 @@ namespace {
// Single and double pawn pushes, no promotions
if (Type != CAPTURES)
{
- emptySquares = (Type == QUIETS ? target : ~pos.pieces());
+ emptySquares = (Type == QUIETS || Type == QUIET_CHECKS ? target : ~pos.pieces());
- b1 = move_pawns(pawnsNotOn7) & emptySquares;
- b2 = move_pawns(b1 & TRank3BB) & emptySquares;
+ b1 = shift_bb(pawnsNotOn7) & emptySquares;
+ b2 = shift_bb(b1 & TRank3BB) & emptySquares;
if (Type == EVASIONS) // Consider only blocking squares
{
@@ -148,25 +142,25 @@ namespace {
if (Type == QUIET_CHECKS)
{
- b1 &= pos.attacks_from(ksq, Them);
- b2 &= pos.attacks_from(ksq, Them);
+ b1 &= pos.attacks_from(ci->ksq, Them);
+ b2 &= pos.attacks_from(ci->ksq, Them);
// 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.
- if (pawnsNotOn7 & target) // Target is dc bitboard
+ // promotion has been already generated amongst the captures.
+ if (pawnsNotOn7 & ci->dcCandidates)
{
- dc1 = move_pawns(pawnsNotOn7 & target) & emptySquares & ~file_bb(ksq);
- dc2 = move_pawns(dc1 & TRank3BB) & emptySquares;
+ dc1 = shift_bb(pawnsNotOn7 & ci->dcCandidates) & emptySquares & ~file_bb(ci->ksq);
+ dc2 = shift_bb(dc1 & TRank3BB) & emptySquares;
b1 |= dc1;
b2 |= dc2;
}
}
- SERIALIZE_PAWNS(b1, UP);
- SERIALIZE_PAWNS(b2, UP + UP);
+ SERIALIZE_PAWNS(b1, Up);
+ SERIALIZE_PAWNS(b2, Up + Up);
}
// Promotions and underpromotions
@@ -178,19 +172,19 @@ namespace {
if (Type == EVASIONS)
emptySquares &= target;
- mlist = generate_promotions(mlist, pawnsOn7, enemies, ksq);
- mlist = generate_promotions(mlist, pawnsOn7, enemies, ksq);
- mlist = generate_promotions(mlist, pawnsOn7, emptySquares, ksq);
+ mlist = generate_promotions(mlist, pawnsOn7, enemies, ci);
+ mlist = generate_promotions(mlist, pawnsOn7, enemies, ci);
+ mlist = generate_promotions(mlist, pawnsOn7, emptySquares, ci);
}
// Standard and en-passant captures
if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS)
{
- b1 = move_pawns(pawnsNotOn7) & enemies;
- b2 = move_pawns(pawnsNotOn7) & enemies;
+ b1 = shift_bb(pawnsNotOn7) & enemies;
+ b2 = shift_bb(pawnsNotOn7) & enemies;
- SERIALIZE_PAWNS(b1, RIGHT);
- SERIALIZE_PAWNS(b2, LEFT);
+ SERIALIZE_PAWNS(b1, Right);
+ SERIALIZE_PAWNS(b2, Left);
if (pos.ep_square() != SQ_NONE)
{
@@ -199,7 +193,7 @@ namespace {
// An en passant capture can be an evasion only if the checking piece
// is the double pushed pawn and so is in the target. Otherwise this
// is a discovery check and we are forced to do otherwise.
- if (Type == EVASIONS && !(target & (pos.ep_square() - UP)))
+ if (Type == EVASIONS && !(target & (pos.ep_square() - Up)))
return mlist;
b1 = pawnsNotOn7 & pos.attacks_from(pos.ep_square(), Them);
@@ -207,7 +201,7 @@ namespace {
assert(b1);
while (b1)
- (*mlist++).move = make(pop_lsb(&b1), pos.ep_square());
+ (mlist++)->move = make(pop_lsb(&b1), pos.ep_square());
}
}
@@ -215,25 +209,31 @@ namespace {
}
- template
- FORCE_INLINE MoveStack* generate_direct_checks(const Position& pos, MoveStack* mlist,
- Color us, const CheckInfo& ci) {
+ template FORCE_INLINE
+ 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(us);
for (Square from = *pl; from != SQ_NONE; from = *++pl)
{
- Bitboard target = ci.checkSq[Pt] & ~pos.pieces(); // Non capture checks only
-
- if ( (Pt == BISHOP || Pt == ROOK || Pt == QUEEN)
- && !(PseudoAttacks[Pt][from] & target))
- continue;
+ if (Checks)
+ {
+ if ( (Pt == BISHOP || Pt == ROOK || Pt == QUEEN)
+ && !(PseudoAttacks[Pt][from] & target & ci->checkSq[Pt]))
+ continue;
- if (ci.dcCandidates && (ci.dcCandidates & from))
- continue;
+ if (unlikely(ci->dcCandidates) && (ci->dcCandidates & from))
+ continue;
+ }
Bitboard b = pos.attacks_from(from) & target;
+
+ if (Checks)
+ b &= ci->checkSq[Pt];
+
SERIALIZE(b);
}
@@ -241,32 +241,43 @@ namespace {
}
- template
- FORCE_INLINE MoveStack* generate_moves(const Position& pos, MoveStack* mlist,
- Color us, Bitboard target) {
- assert(Pt != KING && Pt != PAWN);
+ template FORCE_INLINE
+ ExtMove* generate_all(const Position& pos, ExtMove* mlist, Bitboard target,
+ const CheckInfo* ci = NULL) {
- const Square* pl = pos.piece_list(us, Pt);
+ const bool Checks = Type == QUIET_CHECKS;
- for (Square from = *pl; from != SQ_NONE; from = *++pl)
+ mlist = generate_pawn_moves(pos, mlist, target, ci);
+ mlist = generate_moves(pos, mlist, Us, target, ci);
+ mlist = generate_moves(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)
{
- Bitboard b = pos.attacks_from(from) & target;
+ Square from = pos.king_square(Us);
+ Bitboard b = pos.attacks_from(from) & target;
SERIALIZE(b);
}
- return mlist;
- }
-
+ if (Type != CAPTURES && Type != EVASIONS && pos.can_castle(Us))
+ {
+ if (pos.is_chess960())
+ {
+ mlist = generate_castling::right, Checks, true>(pos, mlist, Us, ci);
+ mlist = generate_castling::right, Checks, true>(pos, mlist, Us, ci);
+ }
+ else
+ {
+ mlist = generate_castling::right, Checks, false>(pos, mlist, Us, ci);
+ mlist = generate_castling::right, Checks, false>(pos, mlist, Us, ci);
+ }
+ }
- template<>
- FORCE_INLINE MoveStack* generate_moves(const Position& pos, MoveStack* mlist,
- Color us, Bitboard target) {
- Square from = pos.king_square(us);
- Bitboard b = pos.attacks_from(from) & target;
- SERIALIZE(b);
return mlist;
}
+
} // namespace
@@ -280,53 +291,33 @@ namespace {
/// non-captures. Returns a pointer to the end of the move list.
template
-MoveStack* generate(const Position& pos, MoveStack* mlist) {
+ExtMove* generate(const Position& pos, ExtMove* 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();
- else if (Type == NON_EVASIONS)
- target = ~pos.pieces(us);
+ Bitboard target = Type == CAPTURES ? pos.pieces(~us)
+ : Type == QUIETS ? ~pos.pieces()
+ : Type == NON_EVASIONS ? ~pos.pieces(us) : 0;
- mlist = (us == WHITE ? generate_pawn_moves(pos, mlist, target)
- : generate_pawn_moves(pos, mlist, target));
-
- mlist = generate_moves(pos, mlist, us, target);
- mlist = generate_moves(pos, mlist, us, target);
- mlist = generate_moves(pos, mlist, us, target);
- mlist = generate_moves(pos, mlist, us, target);
- mlist = generate_moves(pos, mlist, us, target);
-
- if (Type != CAPTURES && pos.can_castle(us))
- {
- mlist = generate_castle(pos, mlist, us);
- mlist = generate_castle(pos, mlist, us);
- }
-
- return mlist;
+ return us == WHITE ? generate_all(pos, mlist, target)
+ : generate_all(pos, mlist, target);
}
// Explicit template instantiations
-template MoveStack* generate(const Position& pos, MoveStack* mlist);
-template MoveStack* generate(const Position& pos, MoveStack* mlist);
-template MoveStack* generate(const Position& pos, MoveStack* mlist);
+template ExtMove* generate(const Position&, ExtMove*);
+template ExtMove* generate(const Position&, ExtMove*);
+template ExtMove* generate(const Position&, ExtMove*);
/// generate 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(const Position& pos, MoveStack* mlist) {
+ExtMove* generate(const Position& pos, ExtMove* mlist) {
- assert(!pos.in_check());
+ assert(!pos.checkers());
Color us = pos.side_to_move();
CheckInfo ci(pos);
@@ -338,7 +329,7 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) {
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();
@@ -348,110 +339,73 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) {
SERIALIZE(b);
}
- mlist = (us == WHITE ? generate_pawn_moves(pos, mlist, ci.dcCandidates, ci.ksq)
- : generate_pawn_moves(pos, mlist, ci.dcCandidates, ci.ksq));
-
- mlist = generate_direct_checks(pos, mlist, us, ci);
- mlist = generate_direct_checks(pos, mlist, us, ci);
- mlist = generate_direct_checks(pos, mlist, us, ci);
- mlist = generate_direct_checks(pos, mlist, us, ci);
-
- if (pos.can_castle(us))
- {
- mlist = generate_castle(pos, mlist, us);
- mlist = generate_castle(pos, mlist, us);
- }
-
- return mlist;
+ return us == WHITE ? generate_all(pos, mlist, ~pos.pieces(), &ci)
+ : generate_all(pos, mlist, ~pos.pieces(), &ci);
}
/// generate 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(const Position& pos, MoveStack* mlist) {
+ExtMove* generate(const Position& pos, ExtMove* mlist) {
- assert(pos.in_check());
+ assert(pos.checkers());
- Bitboard b, target;
- 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 checkers = pos.checkers();
+ Bitboard b = pos.checkers();
- assert(checkers);
+ assert(pos.checkers());
- // 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.
- b = checkers;
+ // 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.
do
{
- checkersCnt++;
+ ++checkersCnt;
checksq = pop_lsb(&b);
assert(color_of(pos.piece_on(checksq)) == ~us);
- switch (type_of(pos.piece_on(checksq)))
- {
- case BISHOP: sliderAttacks |= PseudoAttacks[BISHOP][checksq]; break;
- case ROOK: sliderAttacks |= PseudoAttacks[ROOK][checksq]; break;
- case QUEEN:
- // If queen and king are far or not on a diagonal line we can safely
- // remove all the squares attacked in the other direction becuase are
- // not reachable by the king anyway.
- if (between_bb(ksq, checksq) || !(PseudoAttacks[BISHOP][checksq] & ksq))
- sliderAttacks |= PseudoAttacks[QUEEN][checksq];
-
- // Otherwise we need to use real rook attacks to check if king is safe
- // to move in the other direction. For example: king in B2, queen in A1
- // a knight in B1, and we can safely move to C1.
- else
- sliderAttacks |= PseudoAttacks[BISHOP][checksq] | pos.attacks_from(checksq);
-
- default:
- break;
- }
+ if (type_of(pos.piece_on(checksq)) > KNIGHT) // A slider
+ sliderAttacks |= LineBB[checksq][ksq] ^ checksq;
+
} while (b);
// Generate evasions for king, capture and non capture moves
b = pos.attacks_from(ksq) & ~pos.pieces(us) & ~sliderAttacks;
- from = ksq;
SERIALIZE(b);
- // Generate evasions for other pieces only if not under a double check
if (checkersCnt > 1)
- return mlist;
-
- // Blocking evasions or captures of the checking piece
- target = between_bb(checksq, ksq) | checkers;
+ return mlist; // Double check, only a king move can save the day
- mlist = (us == WHITE ? generate_pawn_moves(pos, mlist, target)
- : generate_pawn_moves(pos, mlist, target));
+ // Generate blocking evasions or captures of the checking piece
+ Bitboard target = between_bb(checksq, ksq) | checksq;
- mlist = generate_moves(pos, mlist, us, target);
- mlist = generate_moves(pos, mlist, us, target);
- mlist = generate_moves(pos, mlist, us, target);
- return generate_moves(pos, mlist, us, target);
+ return us == WHITE ? generate_all(pos, mlist, target)
+ : generate_all(pos, mlist, target);
}
/// generate generates all the legal moves in the given position
template<>
-MoveStack* generate(const Position& pos, MoveStack* mlist) {
-
- MoveStack *last, *cur = mlist;
- Bitboard pinned = pos.pinned_pieces();
-
- last = pos.in_check() ? generate(pos, mlist)
- : generate(pos, mlist);
- while (cur != last)
- if (!pos.pl_move_is_legal(cur->move, pinned))
- cur->move = (--last)->move;
+ExtMove* generate(const Position& pos, ExtMove* mlist) {
+
+ ExtMove *end, *cur = mlist;
+ Bitboard pinned = pos.pinned_pieces(pos.side_to_move());
+ Square ksq = pos.king_square(pos.side_to_move());
+
+ end = pos.checkers() ? generate(pos, mlist)
+ : generate(pos, mlist);
+ while (cur != end)
+ if ( (pinned || from_sq(cur->move) == ksq || type_of(cur->move) == ENPASSANT)
+ && !pos.legal(cur->move, pinned))
+ cur->move = (--end)->move;
else
- cur++;
+ ++cur;
- return last;
+ return end;
}