X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fmovegen.cpp;h=86ab7ac4d1e007067ae21865b50dd4ba4c461264;hb=d1e18fc7dd78a3f5223162dfc79c26baaefcf69e;hp=d76441b3d45ccfd53c62b5e5aa010b548f5d3040;hpb=3c675db3d0c2ddf41036c3481f0891d208d4b6f5;p=stockfish
diff --git a/src/movegen.cpp b/src/movegen.cpp
index d76441b3..86ab7ac4 100644
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -17,32 +17,30 @@
along with this program. If not, see .
*/
-#include
#include
+#include
-#include "bitcount.h"
#include "movegen.h"
#include "position.h"
-#include "misc.h"
-
-// Simple macro to wrap a very common while loop, no facny, no flexibility,
-// hardcoded list name 'mlist' and from square 'from'.
-#define SERIALIZE_MOVES(b) while (b) (*mlist++).move = make_move(from, pop_1st_bit(&b))
-// Version used for pawns, where the 'from' square is given as a delta from the 'to' square
-#define SERIALIZE_MOVES_D(b, d) while (b) { to = pop_1st_bit(&b); (*mlist++).move = make_move(to + (d), to); }
+/// 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))
+/// 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); \
+ (*mlist++).move = make_move(to - (d), to); }
namespace {
enum CastlingSide { KING_SIDE, QUEEN_SIDE };
- template
- MoveStack* generate_castle_moves(const Position& pos, MoveStack* mlist, Color us) {
+ template
+ MoveStack* generate_castle(const Position& pos, MoveStack* mlist, Color us) {
const CastleRight CR[] = { Side ? WHITE_OOO : WHITE_OO,
Side ? BLACK_OOO : BLACK_OO };
- if (!pos.can_castle(CR[us]))
+ if (pos.castle_impeded(CR[us]) || !pos.can_castle(CR[us]))
return mlist;
// After castling, the rook and king final positions are the same in Chess960
@@ -50,39 +48,29 @@ namespace {
Square kfrom = pos.king_square(us);
Square rfrom = pos.castle_rook_square(CR[us]);
Square kto = relative_square(us, Side == KING_SIDE ? SQ_G1 : SQ_C1);
- Square rto = relative_square(us, Side == KING_SIDE ? SQ_F1 : SQ_D1);
- Bitboard enemies = pos.pieces(flip(us));
+ Bitboard enemies = pos.pieces(~us);
assert(!pos.in_check());
assert(pos.piece_on(kfrom) == make_piece(us, KING));
assert(pos.piece_on(rfrom) == make_piece(us, ROOK));
- // Unimpeded rule: All the squares between the king's initial and final squares
- // (including the final square), and all the squares between the rook's initial
- // and final squares (including the final square), must be vacant except for
- // the king and castling rook.
- for (Square s = std::min(rfrom, rto), e = std::max(rfrom, rto); s <= e; s++)
- if (s != kfrom && s != rfrom && !pos.square_is_empty(s))
- return mlist;
-
for (Square s = std::min(kfrom, kto), e = std::max(kfrom, kto); s <= e; s++)
- if ( (s != kfrom && s != rfrom && !pos.square_is_empty(s))
- ||(pos.attackers_to(s) & enemies))
+ if ( s != kfrom // We are not in check
+ && (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())
- {
- Bitboard occ = pos.occupied_squares();
- clear_bit(&occ, rfrom);
- if (pos.attackers_to(kto, occ) & enemies)
+ if ( pos.is_chess960()
+ && (pos.attackers_to(kto, pos.pieces() ^ rfrom) & enemies))
return mlist;
- }
(*mlist++).move = make_castle(kfrom, rfrom);
+ if (OnlyChecks && !pos.move_gives_check((mlist - 1)->move, CheckInfo(pos)))
+ mlist--;
+
return mlist;
}
@@ -90,83 +78,63 @@ namespace {
template
inline Bitboard move_pawns(Bitboard p) {
- return Delta == DELTA_N ? p << 8 : Delta == DELTA_S ? p >> 8 :
- Delta == DELTA_NE ? p << 9 : Delta == DELTA_SE ? p >> 7 :
- Delta == DELTA_NW ? p << 7 : Delta == DELTA_SW ? p >> 9 : p;
- }
-
-
- template
- inline MoveStack* generate_pawn_captures(MoveStack* mlist, Bitboard pawns, Bitboard target) {
-
- const Bitboard TFileABB = ( Delta == DELTA_NE
- || Delta == DELTA_SE ? FileABB : FileHBB);
- Bitboard b;
- Square to;
-
- b = move_pawns(pawns) & target & ~TFileABB;
- SERIALIZE_MOVES_D(b, -Delta);
- return mlist;
+ 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;
}
template
inline MoveStack* generate_promotions(MoveStack* mlist, Bitboard pawnsOn7, Bitboard target, Square ksq) {
- const Bitboard TFileABB = ( Delta == DELTA_NE
- || Delta == DELTA_SE ? FileABB : FileHBB);
- Bitboard b;
- Square to;
-
- b = move_pawns(pawnsOn7) & target;
-
- if (Delta != DELTA_N && Delta != DELTA_S)
- b &= ~TFileABB;
+ Bitboard b = move_pawns(pawnsOn7) & target;
while (b)
{
- to = pop_1st_bit(&b);
+ Square to = pop_1st_bit(&b);
if (Type == MV_CAPTURE || Type == MV_EVASION || Type == MV_NON_EVASION)
(*mlist++).move = make_promotion(to - Delta, to, QUEEN);
- if (Type == MV_NON_CAPTURE || Type == MV_EVASION || Type == MV_NON_EVASION)
+ if (Type == MV_QUIET || Type == MV_EVASION || Type == MV_NON_EVASION)
{
(*mlist++).move = make_promotion(to - Delta, to, ROOK);
(*mlist++).move = make_promotion(to - Delta, to, BISHOP);
(*mlist++).move = make_promotion(to - Delta, to, KNIGHT);
}
- // Knight-promotion is the only one that can give a check (direct or
- // discovered) not already included in the queen-promotion.
- if ( Type == MV_CHECK
- && bit_is_set(StepAttacksBB[W_KNIGHT][to], ksq))
- (*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.
+ if (Type == MV_QUIET_CHECK && (StepAttacksBB[W_KNIGHT][to] & ksq))
+ (*mlist++).move = make_promotion(to - Delta, to, KNIGHT);
else
(void)ksq; // Silence a warning under MSVC
}
+
return mlist;
}
template
- MoveStack* generate_pawn_moves(const Position& pos, MoveStack* mlist, Bitboard target, Square ksq) {
+ MoveStack* generate_pawn_moves(const Position& pos, MoveStack* mlist, Bitboard target, Square ksq = SQ_NONE) {
- // Calculate our parametrized parameters at compile time, named according to
+ // Compute our parametrized parameters at compile time, named according to
// the point of view of white side.
const Color Them = (Us == WHITE ? BLACK : WHITE);
+ 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);
- Square to;
Bitboard b1, b2, dc1, dc2, emptySquares;
- Bitboard pawns = pos.pieces(PAWN, Us);
- Bitboard pawnsOn7 = pawns & TRank7BB;
- Bitboard pawnsNotOn7 = pawns & ~TRank7BB;
+ Bitboard pawnsOn7 = pos.pieces(PAWN, Us) & TRank7BB;
+ Bitboard pawnsNotOn7 = pos.pieces(PAWN, Us) & ~TRank7BB;
Bitboard enemies = (Type == MV_EVASION ? pos.pieces(Them) & target:
Type == MV_CAPTURE ? target : pos.pieces(Them));
@@ -174,20 +142,19 @@ namespace {
// Single and double pawn pushes, no promotions
if (Type != MV_CAPTURE)
{
- emptySquares = (Type == MV_NON_CAPTURE ? target : pos.empty_squares());
+ emptySquares = (Type == MV_QUIET ? target : ~pos.pieces());
b1 = move_pawns(pawnsNotOn7) & emptySquares;
b2 = move_pawns(b1 & TRank3BB) & emptySquares;
- if (Type == MV_EVASION)
+ if (Type == MV_EVASION) // Consider only blocking squares
{
- b1 &= target; // Consider only blocking squares
+ b1 &= target;
b2 &= target;
}
- if (Type == MV_CHECK)
+ if (Type == MV_QUIET_CHECK)
{
- // Consider only direct checks
b1 &= pos.attacks_from(ksq, Them);
b2 &= pos.attacks_from(ksq, Them);
@@ -195,7 +162,7 @@ namespace {
// 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) // For CHECK type target is dc bitboard
+ if (pawnsNotOn7 & target) // Target is dc bitboard
{
dc1 = move_pawns(pawnsNotOn7 & target) & emptySquares & ~file_bb(ksq);
dc2 = move_pawns(dc1 & TRank3BB) & emptySquares;
@@ -205,15 +172,15 @@ namespace {
}
}
- SERIALIZE_MOVES_D(b1, -UP);
- SERIALIZE_MOVES_D(b2, -UP -UP);
+ SERIALIZE_PAWNS(b1, UP);
+ SERIALIZE_PAWNS(b2, UP + UP);
}
// Promotions and underpromotions
- if (pawnsOn7)
+ if (pawnsOn7 && (Type != MV_EVASION || (target & TRank8BB)))
{
if (Type == MV_CAPTURE)
- emptySquares = pos.empty_squares();
+ emptySquares = ~pos.pieces();
if (Type == MV_EVASION)
emptySquares &= target;
@@ -226,17 +193,20 @@ namespace {
// Standard and en-passant captures
if (Type == MV_CAPTURE || Type == MV_EVASION || Type == MV_NON_EVASION)
{
- mlist = generate_pawn_captures(mlist, pawnsNotOn7, enemies);
- mlist = generate_pawn_captures(mlist, pawnsNotOn7, enemies);
+ b1 = move_pawns(pawnsNotOn7) & enemies;
+ b2 = move_pawns(pawnsNotOn7) & enemies;
+
+ SERIALIZE_PAWNS(b1, RIGHT);
+ SERIALIZE_PAWNS(b2, LEFT);
if (pos.ep_square() != SQ_NONE)
{
- assert(rank_of(pos.ep_square()) == (Us == WHITE ? RANK_6 : RANK_3));
+ assert(rank_of(pos.ep_square()) == relative_rank(Us, RANK_6));
// 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 == MV_EVASION && !bit_is_set(target, pos.ep_square() - UP))
+ if (Type == MV_EVASION && !(target & (pos.ep_square() - UP)))
return mlist;
b1 = pawnsNotOn7 & pos.attacks_from(pos.ep_square(), Them);
@@ -253,97 +223,63 @@ namespace {
template
- inline MoveStack* generate_discovered_checks(const Position& pos, MoveStack* mlist, Square from) {
-
- assert(Pt != QUEEN && Pt != PAWN);
-
- Bitboard b = pos.attacks_from(from) & pos.empty_squares();
-
- if (Pt == KING)
- b &= ~QueenPseudoAttacks[pos.king_square(flip(pos.side_to_move()))];
-
- SERIALIZE_MOVES(b);
- return mlist;
- }
-
-
- template
- inline MoveStack* generate_direct_checks(const Position& pos, MoveStack* mlist, Color us,
- Bitboard dc, Square ksq) {
+ inline MoveStack* generate_direct_checks(const Position& pos, MoveStack* mlist,
+ Color us, const CheckInfo& ci) {
assert(Pt != KING && Pt != PAWN);
- Bitboard checkSqs, b;
+ Bitboard b, target;
Square from;
const Square* pl = pos.piece_list(us, Pt);
- if ((from = *pl++) == SQ_NONE)
- return mlist;
-
- checkSqs = pos.attacks_from(ksq) & pos.empty_squares();
-
- do
+ if (*pl != SQ_NONE)
{
- if ( (Pt == QUEEN && !(QueenPseudoAttacks[from] & checkSqs))
- || (Pt == ROOK && !(RookPseudoAttacks[from] & checkSqs))
- || (Pt == BISHOP && !(BishopPseudoAttacks[from] & checkSqs)))
- continue;
+ target = ci.checkSq[Pt] & ~pos.pieces(); // Non capture checks only
- if (dc && bit_is_set(dc, from))
- continue;
-
- b = pos.attacks_from(from) & checkSqs;
- SERIALIZE_MOVES(b);
-
- } while ((from = *pl++) != SQ_NONE);
-
- return mlist;
- }
-
-
- template<>
- FORCE_INLINE MoveStack* generate_direct_checks(const Position& p, MoveStack* m, Color us, Bitboard dc, Square ksq) {
+ do {
+ from = *pl;
- return (us == WHITE ? generate_pawn_moves(p, m, dc, ksq)
- : generate_pawn_moves(p, m, dc, ksq));
- }
+ if ( (Pt == BISHOP || Pt == ROOK || Pt == QUEEN)
+ && !(PseudoAttacks[Pt][from] & target))
+ continue;
+ if (ci.dcCandidates && (ci.dcCandidates & from))
+ continue;
- template
- FORCE_INLINE MoveStack* generate_piece_moves(const Position& p, MoveStack* m, Color us, Bitboard t) {
+ b = pos.attacks_from(from) & target;
+ SERIALIZE(b);
+ } while (*++pl != SQ_NONE);
+ }
- assert(Pt == PAWN);
- return (us == WHITE ? generate_pawn_moves(p, m, t, SQ_NONE)
- : generate_pawn_moves(p, m, t, SQ_NONE));
+ return mlist;
}
template
- FORCE_INLINE MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) {
+ FORCE_INLINE MoveStack* generate_moves(const Position& pos, MoveStack* mlist,
+ Color us, Bitboard target) {
+ assert(Pt != KING && Pt != PAWN);
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_MOVES(b);
+ SERIALIZE(b);
} while (*++pl != SQ_NONE);
- }
+
return mlist;
}
template<>
- FORCE_INLINE MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) {
-
- Bitboard b;
+ FORCE_INLINE MoveStack* generate_moves(const Position& pos, MoveStack* mlist,
+ Color us, Bitboard target) {
Square from = pos.king_square(us);
-
- b = pos.attacks_from(from) & target;
- SERIALIZE_MOVES(b);
+ Bitboard b = pos.attacks_from(from) & target;
+ SERIALIZE(b);
return mlist;
}
@@ -353,7 +289,7 @@ namespace {
/// generate generates all pseudo-legal captures and queen
/// promotions. Returns a pointer to the end of the move list.
///
-/// generate generates all pseudo-legal non-captures and
+/// generate generates all pseudo-legal non-captures and
/// underpromotions. Returns a pointer to the end of the move list.
///
/// generate generates all pseudo-legal captures and
@@ -362,32 +298,34 @@ namespace {
template
MoveStack* generate(const Position& pos, MoveStack* mlist) {
- assert(Type == MV_CAPTURE || Type == MV_NON_CAPTURE || Type == MV_NON_EVASION);
+ assert(Type == MV_CAPTURE || Type == MV_QUIET || Type == MV_NON_EVASION);
assert(!pos.in_check());
Color us = pos.side_to_move();
Bitboard target;
if (Type == MV_CAPTURE)
- target = pos.pieces(flip(us));
+ target = pos.pieces(~us);
- else if (Type == MV_NON_CAPTURE)
- target = pos.empty_squares();
+ else if (Type == MV_QUIET)
+ target = ~pos.pieces();
else if (Type == MV_NON_EVASION)
- target = pos.pieces(flip(us)) | pos.empty_squares();
+ target = ~pos.pieces(us);
+
+ mlist = (us == WHITE ? generate_pawn_moves(pos, mlist, target)
+ : generate_pawn_moves(pos, mlist, target));
- mlist = generate_piece_moves(pos, mlist, us, target);
- mlist = generate_piece_moves(pos, mlist, us, target);
- mlist = generate_piece_moves(pos, mlist, us, target);
- mlist = generate_piece_moves(pos, mlist, us, target);
- mlist = generate_piece_moves(pos, mlist, us, target);
- mlist = generate_piece_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);
+ mlist = generate_moves(pos, mlist, us, target);
if (Type != MV_CAPTURE && pos.can_castle(us))
{
- mlist = generate_castle_moves(pos, mlist, us);
- mlist = generate_castle_moves(pos, mlist, us);
+ mlist = generate_castle(pos, mlist, us);
+ mlist = generate_castle(pos, mlist, us);
}
return mlist;
@@ -395,47 +333,52 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) {
// 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& pos, MoveStack* mlist);
-/// generate generates all pseudo-legal non-captures and knight
+/// 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) {
+MoveStack* generate(const Position& pos, MoveStack* mlist) {
assert(!pos.in_check());
- Bitboard b, dc;
- Square from;
Color us = pos.side_to_move();
- Square ksq = pos.king_square(flip(us));
+ CheckInfo ci(pos);
+ Bitboard dc = ci.dcCandidates;
- assert(pos.piece_on(ksq) == make_piece(flip(us), KING));
+ while (dc)
+ {
+ Square from = pop_1st_bit(&dc);
+ PieceType pt = type_of(pos.piece_on(from));
+
+ if (pt == PAWN)
+ continue; // Will be generated togheter with direct checks
- // Discovered non-capture checks
- b = dc = pos.discovered_check_candidates();
+ Bitboard b = pos.attacks_from(Piece(pt), from) & ~pos.pieces();
- while (b)
+ if (pt == KING)
+ b &= ~PseudoAttacks[QUEEN][ci.ksq];
+
+ 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))
{
- from = pop_1st_bit(&b);
- switch (type_of(pos.piece_on(from)))
- {
- case PAWN: /* Will be generated togheter with pawns direct checks */ break;
- case KNIGHT: mlist = generate_discovered_checks(pos, mlist, from); break;
- case BISHOP: mlist = generate_discovered_checks(pos, mlist, from); break;
- case ROOK: mlist = generate_discovered_checks(pos, mlist, from); break;
- case KING: mlist = generate_discovered_checks(pos, mlist, from); break;
- default: assert(false); break;
- }
+ mlist = generate_castle(pos, mlist, us);
+ mlist = generate_castle(pos, mlist, us);
}
- // Direct non-capture checks
- mlist = generate_direct_checks(pos, mlist, us, dc, ksq);
- mlist = generate_direct_checks(pos, mlist, us, dc, ksq);
- mlist = generate_direct_checks(pos, mlist, us, dc, ksq);
- mlist = generate_direct_checks(pos, mlist, us, dc, ksq);
- return generate_direct_checks(pos, mlist, us, dc, ksq);
+ return mlist;
}
@@ -451,38 +394,37 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) {
int checkersCnt = 0;
Color us = pos.side_to_move();
Square ksq = pos.king_square(us);
- Bitboard checkers = pos.checkers();
Bitboard sliderAttacks = 0;
+ Bitboard checkers = pos.checkers();
- assert(pos.piece_on(ksq) == make_piece(us, KING));
assert(checkers);
- // Find squares attacked by slider checkers, we will remove
- // them from the king evasions set so to early skip known
- // illegal moves and avoid an useless legality check later.
+ // 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);
- assert(color_of(pos.piece_on(checksq)) == flip(us));
+ assert(color_of(pos.piece_on(checksq)) == ~us);
switch (type_of(pos.piece_on(checksq)))
{
- case BISHOP: sliderAttacks |= BishopPseudoAttacks[checksq]; break;
- case ROOK: sliderAttacks |= RookPseudoAttacks[checksq]; break;
+ case BISHOP: sliderAttacks |= PseudoAttacks[BISHOP][checksq]; break;
+ case ROOK: sliderAttacks |= PseudoAttacks[ROOK][checksq]; break;
case QUEEN:
- // If queen and king are far we can safely remove all the squares attacked
- // in the other direction becuase are not reachable by the king anyway.
- if (squares_between(ksq, checksq) || (RookPseudoAttacks[checksq] & (1ULL << ksq)))
- sliderAttacks |= QueenPseudoAttacks[checksq];
-
- // Otherwise, if king and queen are adjacent and on a diagonal line, 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.
+ // 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 (squares_between(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 |= BishopPseudoAttacks[checksq] | pos.attacks_from(checksq);
+ sliderAttacks |= PseudoAttacks[BISHOP][checksq] | pos.attacks_from(checksq);
default:
break;
@@ -492,25 +434,26 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) {
// Generate evasions for king, capture and non capture moves
b = pos.attacks_from(ksq) & ~pos.pieces(us) & ~sliderAttacks;
from = ksq;
- SERIALIZE_MOVES(b);
+ SERIALIZE(b);
- // Generate evasions for other pieces only if not double check
+ // Generate evasions for other pieces only if not under a double check
if (checkersCnt > 1)
return mlist;
- // Find squares where a blocking evasion or a capture of the
- // checker piece is possible.
+ // Blocking evasions or captures of the checking piece
target = squares_between(checksq, ksq) | checkers;
- mlist = generate_piece_moves(pos, mlist, us, target);
- mlist = generate_piece_moves(pos, mlist, us, target);
- mlist = generate_piece_moves(pos, mlist, us, target);
- mlist = generate_piece_moves(pos, mlist, us, target);
- return generate_piece_moves(pos, mlist, us, target);
+ 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);
}
-/// generate computes a complete list of legal moves in the current position
+/// generate generates all the legal moves in the given position
template<>
MoveStack* generate(const Position& pos, MoveStack* mlist) {
@@ -520,8 +463,6 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) {
last = pos.in_check() ? generate(pos, mlist)
: generate(pos, mlist);
-
- // Remove illegal moves from the list
while (cur != last)
if (!pos.pl_move_is_legal(cur->move, pinned))
cur->move = (--last)->move;