X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovegen.cpp;h=be848cf1a6acb370e1ddf262b4f79762ba187f56;hb=c581b7ea36274826b95497570231335dd6b77468;hp=8c4712dfeb4340ca696b1f4a68f0c558155e03d2;hpb=834bd9edd79d11566ec3556945a858d2d84a726b;p=stockfish
diff --git a/src/movegen.cpp b/src/movegen.cpp
index 8c4712df..be848cf1 100644
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -17,7 +17,6 @@
along with this program. If not, see .
*/
-#include
#include
#include "movegen.h"
@@ -32,7 +31,7 @@
(*mlist++).move = make_move(to - (d), to); }
namespace {
- template
+ template
MoveStack* generate_castle(const Position& pos, MoveStack* mlist, Color us) {
if (pos.castle_impeded(us, Side) || !pos.can_castle(make_castle_right(us, Side)))
@@ -47,21 +46,22 @@ namespace {
assert(!pos.in_check());
- 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))
+ const int K = Chess960 ? kto > kfrom ? -1 : 1
+ : Side == KING_SIDE ? -1 : 1;
+
+ for (Square s = kto; s != kfrom; s += (Square)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;
+ if (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)))
+ if (Checks && !pos.move_gives_check((mlist - 1)->move, CheckInfo(pos)))
mlist--;
return mlist;
@@ -81,7 +81,8 @@ namespace {
template
- inline MoveStack* generate_promotions(MoveStack* mlist, Bitboard pawnsOn7, Bitboard target, Square ksq) {
+ inline MoveStack* generate_promotions(MoveStack* mlist, Bitboard pawnsOn7,
+ Bitboard target, const CheckInfo* ci) {
Bitboard b = move_pawns(pawnsOn7) & target;
@@ -101,10 +102,10 @@ namespace {
// 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))
+ 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 +113,8 @@ namespace {
template
- MoveStack* generate_pawn_moves(const Position& pos, MoveStack* mlist, Bitboard target, Square ksq = SQ_NONE) {
+ MoveStack* generate_pawn_moves(const Position& pos, MoveStack* mlist,
+ Bitboard target, const CheckInfo* ci) {
// Compute our parametrized parameters at compile time, named according to
// the point of view of white side.
@@ -135,7 +137,7 @@ 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;
@@ -148,16 +150,16 @@ 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
+ if (pawnsNotOn7 & ci->dcCandidates)
{
- dc1 = move_pawns(pawnsNotOn7 & target) & emptySquares & ~file_bb(ksq);
+ dc1 = move_pawns(pawnsNotOn7 & ci->dcCandidates) & emptySquares & ~file_bb(ci->ksq);
dc2 = move_pawns(dc1 & TRank3BB) & emptySquares;
b1 |= dc1;
@@ -178,9 +180,9 @@ 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
@@ -215,9 +217,9 @@ namespace {
}
- template FORCE_INLINE
+ template FORCE_INLINE
MoveStack* generate_moves(const Position& pos, MoveStack* mlist, Color us,
- Bitboard target, const CheckInfo* ci = NULL) {
+ Bitboard target, const CheckInfo* ci) {
assert(Pt != KING && Pt != PAWN);
@@ -225,7 +227,7 @@ namespace {
for (Square from = *pl; from != SQ_NONE; from = *++pl)
{
- if (OnlyChecks)
+ if (Checks)
{
if ( (Pt == BISHOP || Pt == ROOK || Pt == QUEEN)
&& !(PseudoAttacks[Pt][from] & target & ci->checkSq[Pt]))
@@ -237,7 +239,7 @@ namespace {
Bitboard b = pos.attacks_from(from) & target;
- if (OnlyChecks)
+ if (Checks)
b &= ci->checkSq[Pt];
SERIALIZE(b);
@@ -246,15 +248,49 @@ namespace {
return mlist;
}
- template<> FORCE_INLINE
- MoveStack* generate_moves(const Position& pos, MoveStack* mlist, Color us,
- Bitboard target, const CheckInfo*) {
+
+ 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(from) & target;
SERIALIZE(b);
return mlist;
}
+
+ template FORCE_INLINE
+ MoveStack* generate_all_moves(const Position& pos, MoveStack* mlist, Color us,
+ Bitboard target, const CheckInfo* ci = NULL) {
+
+ mlist = (us == WHITE ? generate_pawn_moves(pos, mlist, target, ci)
+ : 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(pos, mlist, us, target, ci);
+ mlist = generate_moves(pos, mlist, us, target, ci);
+
+ if (Type != QUIET_CHECKS && Type != EVASIONS)
+ mlist = generate_king_moves(pos, mlist, us, target);
+
+ if (Type != CAPTURES && Type != EVASIONS && pos.can_castle(us))
+ {
+ if (pos.is_chess960())
+ {
+ mlist = generate_castle(pos, mlist, us);
+ mlist = generate_castle(pos, mlist, us);
+ }
+ else
+ {
+ mlist = generate_castle(pos, mlist, us);
+ mlist = generate_castle(pos, mlist, us);
+ }
+ }
+
+ return mlist;
+ }
+
+
} // namespace
@@ -285,28 +321,13 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) {
else if (Type == NON_EVASIONS)
target = ~pos.pieces(us);
- 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 generate_all_moves(pos, mlist, us, 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 MoveStack* generate(const Position&, MoveStack*);
+template MoveStack* generate(const Position&, MoveStack*);
+template MoveStack* generate(const Position&, MoveStack*);
/// generate generates all pseudo-legal non-captures and knight
@@ -318,7 +339,6 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) {
Color us = pos.side_to_move();
CheckInfo ci(pos);
- Bitboard empty = ~pos.pieces();
Bitboard dc = ci.dcCandidates;
while (dc)
@@ -337,21 +357,7 @@ 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_moves(pos, mlist, us, empty, &ci);
- mlist = generate_moves(pos, mlist, us, empty, &ci);
- mlist = generate_moves(pos, mlist, us, empty, &ci);
- mlist = generate_moves(pos, mlist, us, empty, &ci);
-
- if (pos.can_castle(us))
- {
- mlist = generate_castle(pos, mlist, us);
- mlist = generate_castle(pos, mlist, us);
- }
-
- return mlist;
+ return generate_all_moves(pos, mlist, us, ~pos.pieces(), &ci);
}
@@ -362,19 +368,17 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) {
assert(pos.in_check());
- Bitboard b, target;
Square from, checksq;
int checkersCnt = 0;
Color us = pos.side_to_move();
Square ksq = pos.king_square(us);
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;
do
{
checkersCnt++;
@@ -409,20 +413,13 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) {
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) | pos.checkers();
- 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 generate_all_moves(pos, mlist, us, target);
}
@@ -433,11 +430,13 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) {
MoveStack *end, *cur = mlist;
Bitboard pinned = pos.pinned_pieces();
+ Square ksq = pos.king_square(pos.side_to_move());
end = pos.in_check() ? generate(pos, mlist)
: generate(pos, mlist);
while (cur != end)
- if (!pos.pl_move_is_legal(cur->move, pinned))
+ if ( (pinned || from_sq(cur->move) == ksq || type_of(cur->move) == ENPASSANT)
+ && !pos.pl_move_is_legal(cur->move, pinned))
cur->move = (--end)->move;
else
cur++;