X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovegen.cpp;h=be848cf1a6acb370e1ddf262b4f79762ba187f56;hb=6a75291ab18a4add2bf2fb6832434b3f49562c46;hp=2c71c680e9f857485a931a350e3bf69ed9afd9c2;hpb=dc7fd868f4fa41251a9521a0b25e3adb483bfd83;p=stockfish
diff --git a/src/movegen.cpp b/src/movegen.cpp
index 2c71c680..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"
@@ -25,14 +24,14 @@
/// 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_1st_bit(&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_1st_bit(&b); \
+#define SERIALIZE_PAWNS(b, d) while (b) { Square to = pop_lsb(&b); \
(*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_castle(kfrom, rfrom);
+ (*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,30 +81,31 @@ 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;
while (b)
{
- Square to = pop_1st_bit(&b);
+ Square to = pop_lsb(&b);
if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS)
- (*mlist++).move = make_promotion(to - Delta, to, QUEEN);
+ (*mlist++).move = make(to - Delta, to, QUEEN);
if (Type == QUIETS || Type == EVASIONS || Type == NON_EVASIONS)
{
- (*mlist++).move = make_promotion(to - Delta, to, ROOK);
- (*mlist++).move = make_promotion(to - Delta, to, BISHOP);
- (*mlist++).move = make_promotion(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_promotion(to - Delta, to, KNIGHT);
+ 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
@@ -207,7 +209,7 @@ namespace {
assert(b1);
while (b1)
- (*mlist++).move = make_enpassant(pop_1st_bit(&b1), pos.ep_square());
+ (*mlist++).move = make(pop_lsb(&b1), pos.ep_square());
}
}
@@ -215,67 +217,80 @@ namespace {
}
- template
- inline MoveStack* generate_direct_checks(const Position& pos, MoveStack* mlist,
- Color us, const CheckInfo& ci) {
+ template FORCE_INLINE
+ MoveStack* generate_moves(const Position& pos, MoveStack* mlist, Color us,
+ Bitboard target, const CheckInfo* ci) {
+
assert(Pt != KING && Pt != PAWN);
- Bitboard b, target;
- Square from;
const Square* pl = pos.piece_list(us, Pt);
- if (*pl != SQ_NONE)
+ for (Square from = *pl; from != SQ_NONE; from = *++pl)
{
- target = ci.checkSq[Pt] & ~pos.pieces(); // Non capture checks only
-
- do {
- from = *pl;
-
+ if (Checks)
+ {
if ( (Pt == BISHOP || Pt == ROOK || Pt == QUEEN)
- && !(PseudoAttacks[Pt][from] & target))
+ && !(PseudoAttacks[Pt][from] & target & ci->checkSq[Pt]))
continue;
- if (ci.dcCandidates && (ci.dcCandidates & from))
+ if (ci->dcCandidates && (ci->dcCandidates & from))
continue;
+ }
+
+ Bitboard b = pos.attacks_from(from) & target;
- b = pos.attacks_from(from) & target;
- SERIALIZE(b);
- } while (*++pl != SQ_NONE);
+ if (Checks)
+ b &= ci->checkSq[Pt];
+
+ SERIALIZE(b);
}
return mlist;
}
- template
- FORCE_INLINE MoveStack* generate_moves(const Position& pos, MoveStack* mlist,
- Color us, Bitboard target) {
- assert(Pt != KING && Pt != PAWN);
+ 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;
+ }
- Bitboard b;
- Square from;
- const Square* pl = pos.piece_list(us, Pt);
- if (*pl != SQ_NONE)
- do {
- from = *pl;
- b = pos.attacks_from(from) & target;
- SERIALIZE(b);
- } while (*++pl != SQ_NONE);
+ template FORCE_INLINE
+ MoveStack* generate_all_moves(const Position& pos, MoveStack* mlist, Color us,
+ Bitboard target, const CheckInfo* ci = NULL) {
- return mlist;
- }
+ 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);
+ }
+ }
- 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
@@ -306,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
@@ -343,7 +343,7 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) {
while (dc)
{
- Square from = pop_1st_bit(&dc);
+ Square from = pop_lsb(&dc);
PieceType pt = type_of(pos.piece_on(from));
if (pt == PAWN)
@@ -357,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_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 generate_all_moves(pos, mlist, us, ~pos.pieces(), &ci);
}
@@ -382,23 +368,21 @@ 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++;
- checksq = pop_1st_bit(&b);
+ checksq = pop_lsb(&b);
assert(color_of(pos.piece_on(checksq)) == ~us);
@@ -429,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;
+ return mlist; // Double check, only a king move can save the day
- // Blocking evasions or captures of the checking piece
- target = between_bb(checksq, ksq) | checkers;
+ // Generate blocking evasions or captures of the checking piece
+ Bitboard target = between_bb(checksq, ksq) | pos.checkers();
- 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);
- return generate_moves(pos, mlist, us, target);
+ return generate_all_moves(pos, mlist, us, target);
}
@@ -451,16 +428,18 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) {
template<>
MoveStack* generate(const Position& pos, MoveStack* mlist) {
- MoveStack *last, *cur = mlist;
+ MoveStack *end, *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;
+ Square ksq = pos.king_square(pos.side_to_move());
+
+ end = pos.in_check() ? generate(pos, mlist)
+ : generate(pos, mlist);
+ while (cur != end)
+ 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++;
- return last;
+ return end;
}