X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=c7c29a4ec5f61bab915c67c1937cc513308e5999;hp=64c6ac50135d83ea121d1b950c315578cb629ef3;hb=b05fbb3733df535a3fdf99e8d832001e57929699;hpb=54f1c383d36f461a740eeaa93856b408e8d3faa3
diff --git a/src/movegen.cpp b/src/movegen.cpp
index 64c6ac50..c7c29a4e 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-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2012 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,125 +17,314 @@
along with this program. If not, see .
*/
+#include
#include
-#include "bitcount.h"
#include "movegen.h"
+#include "position.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
- };
+ enum CastlingSide { KING_SIDE, QUEEN_SIDE };
- template
- MoveStack* generate_castle_moves(const Position&, MoveStack*, Color us);
+ template
+ MoveStack* generate_castle_moves(const Position& pos, MoveStack* mlist, Color us) {
- template
- MoveStack* generate_pawn_moves(const Position&, MoveStack*, Bitboard, Square);
+ const CastleRight CR[] = { Side ? WHITE_OOO : WHITE_OO,
+ Side ? BLACK_OOO : BLACK_OO };
- template
- inline MoveStack* generate_discovered_checks(const Position& pos, MoveStack* mlist, Square from) {
+ if (!pos.can_castle(CR[us]))
+ return mlist;
- assert(Pt != QUEEN);
+ // 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(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));
+
+ 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))
+ return mlist;
- Bitboard b = pos.attacks_from(from) & pos.empty_squares();
- if (Pt == KING)
+ // 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())
{
- Square ksq = pos.king_square(opposite_color(pos.side_to_move()));
- b &= ~QueenPseudoAttacks[ksq];
+ Bitboard occ = pos.occupied_squares();
+ clear_bit(&occ, rfrom);
+ if (pos.attackers_to(kto, occ) & enemies)
+ return mlist;
}
- SERIALIZE_MOVES(b);
+
+ (*mlist++).move = make_castle(kfrom, rfrom);
+
+ if (OnlyChecks && !pos.move_gives_check((mlist - 1)->move, CheckInfo(pos)))
+ mlist--;
+
+ return mlist;
+ }
+
+
+ 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 = move_pawns(pawns) & target & ~TFileABB;
+ SERIALIZE_PAWNS(b, -Delta);
return mlist;
}
+
+ 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 = move_pawns(pawnsOn7) & target;
+
+ if (Delta != DELTA_N && Delta != DELTA_S)
+ b &= ~TFileABB;
+
+ while (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)
+ {
+ (*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_NON_CAPTURE_CHECK && bit_is_set(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) {
+
+ // Calculate 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 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);
+
+ Bitboard b1, b2, dc1, dc2, emptySquares;
+
+ 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));
+
+ // Single and double pawn pushes, no promotions
+ if (Type != MV_CAPTURE)
+ {
+ emptySquares = (Type == MV_NON_CAPTURE ? target : pos.empty_squares());
+
+ b1 = move_pawns(pawnsNotOn7) & emptySquares;
+ b2 = move_pawns(b1 & TRank3BB) & emptySquares;
+
+ if (Type == MV_EVASION) // Consider only blocking squares
+ {
+ b1 &= target;
+ b2 &= target;
+ }
+
+ if (Type == MV_NON_CAPTURE_CHECK)
+ {
+ // Consider only direct checks
+ b1 &= pos.attacks_from(ksq, Them);
+ b2 &= pos.attacks_from(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
+ {
+ dc1 = move_pawns(pawnsNotOn7 & target) & emptySquares & ~file_bb(ksq);
+ dc2 = move_pawns(dc1 & TRank3BB) & emptySquares;
+
+ b1 |= dc1;
+ b2 |= dc2;
+ }
+ }
+
+ SERIALIZE_PAWNS(b1, -UP);
+ SERIALIZE_PAWNS(b2, -UP -UP);
+ }
+
+ // Promotions and underpromotions
+ if (pawnsOn7)
+ {
+ if (Type == MV_CAPTURE)
+ emptySquares = pos.empty_squares();
+
+ if (Type == MV_EVASION)
+ emptySquares &= target;
+
+ mlist = generate_promotions(mlist, pawnsOn7, enemies, ksq);
+ mlist = generate_promotions(mlist, pawnsOn7, enemies, ksq);
+ mlist = generate_promotions(mlist, pawnsOn7, emptySquares, ksq);
+ }
+
+ // 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);
+
+ if (pos.ep_square() != SQ_NONE)
+ {
+ assert(rank_of(pos.ep_square()) == (Us == WHITE ? RANK_6 : RANK_3));
+
+ // 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))
+ return mlist;
+
+ b1 = pawnsNotOn7 & pos.attacks_from(pos.ep_square(), Them);
+
+ assert(b1);
+
+ while (b1)
+ (*mlist++).move = make_enpassant(pop_1st_bit(&b1), pos.ep_square());
+ }
+ }
+
+ return mlist;
+ }
+
+
template
- inline MoveStack* generate_direct_checks(const Position& pos, MoveStack* mlist, Color us,
- Bitboard dc, Square ksq) {
- assert(Pt != KING);
+ inline MoveStack* generate_direct_checks(const Position& pos, MoveStack* mlist,
+ Color us, const CheckInfo& ci) {
+ assert(Pt != KING && Pt != PAWN);
Bitboard checkSqs, b;
Square from;
- const Square* ptr = pos.piece_list_begin(us, Pt);
+ const Square* pl = pos.piece_list(us, Pt);
- if ((from = *ptr++) == SQ_NONE)
+ if ((from = *pl++) == SQ_NONE)
return mlist;
- checkSqs = pos.attacks_from(ksq) & pos.empty_squares();
+ checkSqs = ci.checkSq[Pt] & pos.empty_squares();
do
{
- if ( (Pt == QUEEN && !(QueenPseudoAttacks[from] & checkSqs))
- || (Pt == ROOK && !(RookPseudoAttacks[from] & checkSqs))
- || (Pt == BISHOP && !(BishopPseudoAttacks[from] & checkSqs)))
+ if ( (Pt == BISHOP || Pt == ROOK || Pt == QUEEN)
+ && !(PseudoAttacks[Pt][from] & checkSqs))
continue;
- if (dc && bit_is_set(dc, from))
+ if (ci.dcCandidates && bit_is_set(ci.dcCandidates, from))
continue;
b = pos.attacks_from(from) & checkSqs;
- SERIALIZE_MOVES(b);
+ SERIALIZE(b);
- } while ((from = *ptr++) != SQ_NONE);
+ } 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) {
+ FORCE_INLINE MoveStack* generate_direct_checks(const Position& p, MoveStack* m,
+ Color us, const CheckInfo& ci) {
- return (us == WHITE ? generate_pawn_moves(p, m, dc, ksq)
- : generate_pawn_moves(p, m, dc, ksq));
+ return us == WHITE ? generate_pawn_moves(p, m, ci.dcCandidates, ci.ksq)
+ : generate_pawn_moves(p, m, ci.dcCandidates, ci.ksq);
}
+
template
FORCE_INLINE MoveStack* generate_piece_moves(const Position& p, MoveStack* m, Color us, Bitboard t) {
assert(Pt == PAWN);
- assert(Type == MV_CAPTURE || Type == MV_NON_CAPTURE || Type == MV_EVASION);
-
- return (us == WHITE ? generate_pawn_moves(p, m, t, SQ_NONE)
- : generate_pawn_moves(p, m, t, SQ_NONE));
+ return us == WHITE ? generate_pawn_moves(p, m, t, SQ_NONE)
+ : generate_pawn_moves(p, m, t, SQ_NONE);
}
+
template
FORCE_INLINE MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) {
Bitboard b;
Square from;
- const Square* ptr = pos.piece_list_begin(us, Pt);
+ const Square* pl = pos.piece_list(us, Pt);
- if (*ptr != SQ_NONE)
+ if (*pl != SQ_NONE)
{
do {
- from = *ptr;
+ from = *pl;
b = pos.attacks_from(from) & target;
- SERIALIZE_MOVES(b);
- } while (*++ptr != SQ_NONE);
+ 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;
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;
}
-}
+} // namespace
/// generate generates all pseudo-legal captures and queen
@@ -150,41 +339,32 @@ namespace {
template
MoveStack* generate(const Position& pos, MoveStack* mlist) {
- assert(pos.is_ok());
- assert(!pos.is_check());
+ assert(Type == MV_CAPTURE || Type == MV_NON_CAPTURE || Type == MV_NON_EVASION);
+ assert(!pos.in_check());
Color us = pos.side_to_move();
Bitboard target;
- if (Type == MV_CAPTURE || Type == MV_NON_EVASION)
- target = pos.pieces_of_color(opposite_color(us));
+ if (Type == MV_CAPTURE)
+ target = pos.pieces(flip(us));
+
else if (Type == MV_NON_CAPTURE)
target = pos.empty_squares();
- else
- assert(false);
- if (Type == MV_NON_EVASION)
- {
- mlist = generate_piece_moves(pos, mlist, us, target);
- mlist = generate_piece_moves(pos, mlist, us, pos.empty_squares());
- target |= pos.empty_squares();
- }
- else
- mlist = generate_piece_moves(pos, mlist, us, target);
+ else if (Type == MV_NON_EVASION)
+ target = pos.pieces(flip(us)) | pos.empty_squares();
+ 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);
- if (Type != MV_CAPTURE)
+ if (Type != MV_CAPTURE && pos.can_castle(us))
{
- if (pos.can_castle_kingside(us))
- mlist = generate_castle_moves(pos, mlist, us);
-
- if (pos.can_castle_queenside(us))
- mlist = generate_castle_moves(pos, mlist, us);
+ mlist = generate_castle_moves(pos, mlist, us);
+ mlist = generate_castle_moves(pos, mlist, us);
}
return mlist;
@@ -196,104 +376,108 @@ template MoveStack* generate(const Position& pos, MoveStack* mli
template MoveStack* generate(const Position& pos, MoveStack* mlist);
-/// generate_non_capture_checks() 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) {
- assert(pos.is_ok());
- assert(!pos.is_check());
+ assert(!pos.in_check());
- Bitboard b, dc;
- Square from;
Color us = pos.side_to_move();
- Square ksq = pos.king_square(opposite_color(us));
+ CheckInfo ci(pos);
+ Bitboard dc = ci.dcCandidates;
- assert(pos.piece_on(ksq) == make_piece(opposite_color(us), KING));
+ while (dc)
+ {
+ Square from = pop_1st_bit(&dc);
+ PieceType pt = type_of(pos.piece_on(from));
- // Discovered non-capture checks
- b = dc = pos.discovered_check_candidates(us);
+ if (pt == PAWN)
+ continue; // Will be generated togheter with direct checks
- while (b)
+ Bitboard b = pos.attacks_from(Piece(pt), from) & pos.empty_squares();
+
+ if (pt == KING)
+ b &= ~PseudoAttacks[QUEEN][ci.ksq];
+
+ SERIALIZE(b);
+ }
+
+ 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);
+ mlist = generate_direct_checks(pos, mlist, us, ci);
+
+ if (pos.can_castle(us))
{
- from = pop_1st_bit(&b);
- switch (pos.type_of_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_moves(pos, mlist, us);
+ mlist = generate_castle_moves(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;
}
-/// generate_evasions() generates all pseudo-legal check evasions when
-/// the side to move is in check. Returns a pointer to the end of the move list.
+/// 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) {
- assert(pos.is_ok());
- assert(pos.is_check());
+ 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 sliderAttacks = EmptyBoardBB;
- 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(pos.color_of_piece_on(checksq) == opposite_color(us));
+ assert(color_of(pos.piece_on(checksq)) == flip(us));
- switch (pos.type_of_piece_on(checksq))
+ 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:
- // In case of a queen remove also squares attacked in the other direction to
- // avoid possible illegal moves when queen and king are on adjacent squares.
- if (RookPseudoAttacks[checksq] & (1ULL << ksq))
- sliderAttacks |= RookPseudoAttacks[checksq] | pos.attacks_from(checksq);
+ // 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) || !bit_is_set(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;
}
} while (b);
// Generate evasions for king, capture and non capture moves
- b = pos.attacks_from(ksq) & ~pos.pieces_of_color(us) & ~sliderAttacks;
+ 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);
@@ -304,28 +488,16 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) {
}
-/// generate computes a complete list of legal
-/// or pseudo-legal moves in the current position.
-template<>
-MoveStack* generate(const Position& pos, MoveStack* mlist) {
-
- assert(pos.is_ok());
-
- return pos.is_check() ? generate(pos, mlist)
- : generate(pos, mlist);
-}
+/// generate generates all the legal moves in the given position
template<>
MoveStack* generate(const Position& pos, MoveStack* mlist) {
- assert(pos.is_ok());
-
MoveStack *last, *cur = mlist;
- Bitboard pinned = pos.pinned_pieces(pos.side_to_move());
+ Bitboard pinned = pos.pinned_pieces();
- last = generate(pos, mlist);
-
- // Remove illegal moves from the list
+ 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;
@@ -334,209 +506,3 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) {
return last;
}
-
-
-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;
-
- // Captures in the a1-h8 (a8-h1 for black) diagonal or in the h1-a8 (h8-a1 for black)
- b = move_pawns(pawns) & target & ~TFileABB;
- SERIALIZE_MOVES_D(b, -Delta);
- return mlist;
- }
-
- template
- inline MoveStack* generate_promotions(const Position& pos, MoveStack* mlist, Bitboard pawnsOn7, Bitboard target) {
-
- const Bitboard TFileABB = (Delta == DELTA_NE || Delta == DELTA_SE ? FileABB : FileHBB);
-
- Bitboard b;
- Square to;
-
- // Promotions and under-promotions, both captures and non-captures
- b = move_pawns(pawnsOn7) & target;
-
- if (Delta != DELTA_N && Delta != DELTA_S)
- b &= ~TFileABB;
-
- while (b)
- {
- to = pop_1st_bit(&b);
-
- if (Type == MV_CAPTURE || Type == MV_EVASION)
- (*mlist++).move = make_promotion_move(to - Delta, to, QUEEN);
-
- if (Type == MV_NON_CAPTURE || Type == MV_EVASION)
- {
- (*mlist++).move = make_promotion_move(to - Delta, to, ROOK);
- (*mlist++).move = make_promotion_move(to - Delta, to, BISHOP);
- (*mlist++).move = make_promotion_move(to - Delta, to, KNIGHT);
- }
-
- // This is the only possible under promotion that can give a check
- // not already included in the queen-promotion.
- if ( Type == MV_CHECK
- && bit_is_set(pos.attacks_from(to), pos.king_square(opposite_color(Us))))
- (*mlist++).move = make_promotion_move(to - Delta, to, KNIGHT);
- else (void)pos; // Silence a warning under MSVC
- }
- return mlist;
- }
-
- template
- MoveStack* generate_pawn_moves(const Position& pos, MoveStack* mlist, Bitboard target, Square ksq) {
-
- // Calculate 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 TRank7BB = (Us == WHITE ? Rank7BB : Rank2BB);
- const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB);
- const Square TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S);
- const Square TDELTA_NE = (Us == WHITE ? DELTA_NE : DELTA_SE);
- const Square TDELTA_NW = (Us == WHITE ? DELTA_NW : DELTA_SW);
-
- Square to;
- Bitboard b1, b2, dc1, dc2, pawnPushes, emptySquares;
- Bitboard pawns = pos.pieces(PAWN, Us);
- Bitboard pawnsOn7 = pawns & TRank7BB;
- Bitboard enemyPieces = (Type == MV_CAPTURE ? target : pos.pieces_of_color(Them));
-
- // Pre-calculate pawn pushes before changing emptySquares definition
- if (Type != MV_CAPTURE)
- {
- emptySquares = (Type == MV_NON_CAPTURE ? target : pos.empty_squares());
- pawnPushes = move_pawns(pawns & ~TRank7BB) & emptySquares;
- }
-
- if (Type == MV_EVASION)
- {
- emptySquares &= target; // Only blocking squares
- enemyPieces &= target; // Capture only the checker piece
- }
-
- // Promotions and underpromotions
- if (pawnsOn7)
- {
- if (Type == MV_CAPTURE)
- emptySquares = pos.empty_squares();
-
- pawns &= ~TRank7BB;
- mlist = generate_promotions(pos, mlist, pawnsOn7, enemyPieces);
- mlist = generate_promotions(pos, mlist, pawnsOn7, enemyPieces);
- mlist = generate_promotions(pos, mlist, pawnsOn7, emptySquares);
- }
-
- // Standard captures
- if (Type == MV_CAPTURE || Type == MV_EVASION)
- {
- mlist = generate_pawn_captures(mlist, pawns, enemyPieces);
- mlist = generate_pawn_captures(mlist, pawns, enemyPieces);
- }
-
- // Single and double pawn pushes
- if (Type != MV_CAPTURE)
- {
- b1 = pawnPushes & emptySquares;
- b2 = move_pawns(pawnPushes & TRank3BB) & emptySquares;
-
- if (Type == MV_CHECK)
- {
- // Consider only pawn moves which give direct checks
- b1 &= pos.attacks_from(ksq, Them);
- b2 &= pos.attacks_from(ksq, Them);
-
- // Add pawn moves which gives 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.
- if (pawns & target) // For CHECK type target is dc bitboard
- {
- dc1 = move_pawns(pawns & target & ~file_bb(ksq)) & emptySquares;
- dc2 = move_pawns(dc1 & TRank3BB) & emptySquares;
-
- b1 |= dc1;
- b2 |= dc2;
- }
- }
- SERIALIZE_MOVES_D(b1, -TDELTA_N);
- SERIALIZE_MOVES_D(b2, -TDELTA_N -TDELTA_N);
- }
-
- // En passant captures
- if ((Type == MV_CAPTURE || Type == MV_EVASION) && pos.ep_square() != SQ_NONE)
- {
- assert(Us != WHITE || square_rank(pos.ep_square()) == RANK_6);
- assert(Us != BLACK || square_rank(pos.ep_square()) == RANK_3);
-
- // 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() - TDELTA_N))
- return mlist;
-
- b1 = pawns & pos.attacks_from(pos.ep_square(), Them);
-
- assert(b1 != EmptyBoardBB);
-
- while (b1)
- {
- to = pop_1st_bit(&b1);
- (*mlist++).move = make_ep_move(to, pos.ep_square());
- }
- }
- return mlist;
- }
-
- template
- MoveStack* generate_castle_moves(const Position& pos, MoveStack* mlist, Color us) {
-
- Color them = opposite_color(us);
- Square ksq = pos.king_square(us);
-
- assert(pos.piece_on(ksq) == make_piece(us, KING));
-
- Square rsq = (Side == KING_SIDE ? pos.initial_kr_square(us) : pos.initial_qr_square(us));
- Square s1 = relative_square(us, Side == KING_SIDE ? SQ_G1 : SQ_C1);
- Square s2 = relative_square(us, Side == KING_SIDE ? SQ_F1 : SQ_D1);
- Square s;
- bool illegal = false;
-
- assert(pos.piece_on(rsq) == make_piece(us, ROOK));
-
- // It is a bit complicated to correctly handle Chess960
- for (s = Min(ksq, s1); s <= Max(ksq, s1); s++)
- if ( (s != ksq && s != rsq && pos.square_is_occupied(s))
- ||(pos.attackers_to(s) & pos.pieces_of_color(them)))
- illegal = true;
-
- for (s = Min(rsq, s2); s <= Max(rsq, s2); s++)
- if (s != ksq && s != rsq && pos.square_is_occupied(s))
- illegal = true;
-
- if ( Side == QUEEN_SIDE
- && square_file(rsq) == FILE_B
- && ( pos.piece_on(relative_square(us, SQ_A1)) == make_piece(them, ROOK)
- || pos.piece_on(relative_square(us, SQ_A1)) == make_piece(them, QUEEN)))
- illegal = true;
-
- if (!illegal)
- (*mlist++).move = make_castle_move(ksq, rsq);
-
- return mlist;
- }
-
-} // namespace