X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovegen.cpp;h=c7a3c29bc04f60816c7867a57f28f0a1d3d28ec2;hb=HEAD;hp=14df1f0504d00b161b2f2ac01251dce71fe06edc;hpb=70a818cbd6784ccfa8503d94bc31dd1dc16dd1ff;p=stockfish
diff --git a/src/movegen.cpp b/src/movegen.cpp
index 14df1f05..69b8fe6a 100644
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -1,6 +1,6 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
- Copyright (C) 2004-2021 The Stockfish developers (see AUTHORS file)
+ Copyright (C) 2004-2024 The Stockfish developers (see AUTHORS file)
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,147 +16,121 @@
along with this program. If not, see .
*/
+#include "movegen.h"
+
#include
+#include
-#include "movegen.h"
+#include "bitboard.h"
#include "position.h"
+namespace Stockfish {
+
namespace {
- template
- ExtMove* make_promotions(ExtMove* moveList, Square to, Square ksq) {
+template
+ExtMove* make_promotions(ExtMove* moveList, [[maybe_unused]] Square to) {
- if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS)
- {
- *moveList++ = make(to - D, to, QUEEN);
- if (attacks_bb(to) & ksq)
- *moveList++ = make(to - D, to, KNIGHT);
- }
+ constexpr bool all = Type == EVASIONS || Type == NON_EVASIONS;
+
+ if constexpr (Type == CAPTURES || all)
+ *moveList++ = Move::make(to - D, to, QUEEN);
- if (Type == QUIETS || Type == EVASIONS || Type == NON_EVASIONS)
+ if constexpr ((Type == CAPTURES && Enemy) || (Type == QUIETS && !Enemy) || all)
{
- *moveList++ = make(to - D, to, ROOK);
- *moveList++ = make(to - D, to, BISHOP);
- if (!(attacks_bb(to) & ksq))
- *moveList++ = make(to - D, to, KNIGHT);
+ *moveList++ = Move::make(to - D, to, ROOK);
+ *moveList++ = Move::make(to - D, to, BISHOP);
+ *moveList++ = Move::make(to - D, to, KNIGHT);
}
return moveList;
- }
+}
- template
- ExtMove* generate_pawn_moves(const Position& pos, ExtMove* moveList, Bitboard target) {
+template
+ExtMove* generate_pawn_moves(const Position& pos, ExtMove* moveList, Bitboard target) {
constexpr Color Them = ~Us;
- constexpr Bitboard TRank7BB = (Us == WHITE ? Rank7BB : Rank2BB);
- constexpr Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB);
+ constexpr Bitboard TRank7BB = (Us == WHITE ? Rank7BB : Rank2BB);
+ constexpr Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB);
constexpr Direction Up = pawn_push(Us);
constexpr Direction UpRight = (Us == WHITE ? NORTH_EAST : SOUTH_WEST);
constexpr Direction UpLeft = (Us == WHITE ? NORTH_WEST : SOUTH_EAST);
- const Square ksq = pos.square(Them);
- Bitboard emptySquares;
+ const Bitboard emptySquares = ~pos.pieces();
+ const Bitboard enemies = Type == EVASIONS ? pos.checkers() : pos.pieces(Them);
- Bitboard pawnsOn7 = pos.pieces(Us, PAWN) & TRank7BB;
+ Bitboard pawnsOn7 = pos.pieces(Us, PAWN) & TRank7BB;
Bitboard pawnsNotOn7 = pos.pieces(Us, PAWN) & ~TRank7BB;
- Bitboard enemies = (Type == EVASIONS ? pos.pieces(Them) & target:
- Type == CAPTURES ? target : pos.pieces(Them));
-
// Single and double pawn pushes, no promotions
- if (Type != CAPTURES)
+ if constexpr (Type != CAPTURES)
{
- emptySquares = (Type == QUIETS || Type == QUIET_CHECKS ? target : ~pos.pieces());
-
- Bitboard b1 = shift(pawnsNotOn7) & emptySquares;
+ Bitboard b1 = shift(pawnsNotOn7) & emptySquares;
Bitboard b2 = shift(b1 & TRank3BB) & emptySquares;
- if (Type == EVASIONS) // Consider only blocking squares
+ if constexpr (Type == EVASIONS) // Consider only blocking squares
{
b1 &= target;
b2 &= target;
}
- if (Type == QUIET_CHECKS)
- {
- b1 &= pawn_attacks_bb(Them, ksq);
- b2 &= pawn_attacks_bb(Them, ksq);
-
- // 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 discovered check
- // promotion has been already generated amongst the captures.
- Bitboard dcCandidateQuiets = pos.blockers_for_king(Them) & pawnsNotOn7;
- if (dcCandidateQuiets)
- {
- Bitboard dc1 = shift(dcCandidateQuiets) & emptySquares & ~file_bb(ksq);
- Bitboard dc2 = shift(dc1 & TRank3BB) & emptySquares;
-
- b1 |= dc1;
- b2 |= dc2;
- }
- }
-
while (b1)
{
- Square to = pop_lsb(&b1);
- *moveList++ = make_move(to - Up, to);
+ Square to = pop_lsb(b1);
+ *moveList++ = Move(to - Up, to);
}
while (b2)
{
- Square to = pop_lsb(&b2);
- *moveList++ = make_move(to - Up - Up, to);
+ Square to = pop_lsb(b2);
+ *moveList++ = Move(to - Up - Up, to);
}
}
// Promotions and underpromotions
if (pawnsOn7)
{
- if (Type == CAPTURES)
- emptySquares = ~pos.pieces();
-
- if (Type == EVASIONS)
- emptySquares &= target;
-
Bitboard b1 = shift(pawnsOn7) & enemies;
- Bitboard b2 = shift(pawnsOn7) & enemies;
- Bitboard b3 = shift(pawnsOn7) & emptySquares;
+ Bitboard b2 = shift(pawnsOn7) & enemies;
+ Bitboard b3 = shift(pawnsOn7) & emptySquares;
+
+ if constexpr (Type == EVASIONS)
+ b3 &= target;
while (b1)
- moveList = make_promotions(moveList, pop_lsb(&b1), ksq);
+ moveList = make_promotions(moveList, pop_lsb(b1));
while (b2)
- moveList = make_promotions(moveList, pop_lsb(&b2), ksq);
+ moveList = make_promotions(moveList, pop_lsb(b2));
while (b3)
- moveList = make_promotions(moveList, pop_lsb(&b3), ksq);
+ moveList = make_promotions(moveList, pop_lsb(b3));
}
// Standard and en passant captures
- if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS)
+ if constexpr (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS)
{
Bitboard b1 = shift(pawnsNotOn7) & enemies;
- Bitboard b2 = shift(pawnsNotOn7) & enemies;
+ Bitboard b2 = shift(pawnsNotOn7) & enemies;
while (b1)
{
- Square to = pop_lsb(&b1);
- *moveList++ = make_move(to - UpRight, to);
+ Square to = pop_lsb(b1);
+ *moveList++ = Move(to - UpRight, to);
}
while (b2)
{
- Square to = pop_lsb(&b2);
- *moveList++ = make_move(to - UpLeft, to);
+ Square to = pop_lsb(b2);
+ *moveList++ = Move(to - UpLeft, to);
}
if (pos.ep_square() != SQ_NONE)
{
assert(rank_of(pos.ep_square()) == relative_rank(Us, RANK_6));
- // An en passant capture cannot resolve a discovered check.
+ // An en passant capture cannot resolve a discovered check
if (Type == EVASIONS && (target & (pos.ep_square() + Up)))
return moveList;
@@ -165,200 +139,118 @@ namespace {
assert(b1);
while (b1)
- *moveList++ = make(pop_lsb(&b1), pos.ep_square());
+ *moveList++ = Move::make(pop_lsb(b1), pos.ep_square());
}
}
return moveList;
- }
+}
- template
- ExtMove* generate_moves(const Position& pos, ExtMove* moveList, Bitboard piecesToMove, Bitboard target) {
+template
+ExtMove* generate_moves(const Position& pos, ExtMove* moveList, Bitboard target) {
static_assert(Pt != KING && Pt != PAWN, "Unsupported piece type in generate_moves()");
- Bitboard bb = piecesToMove & pos.pieces(Pt);
-
- if (!bb)
- return moveList;
-
- [[maybe_unused]] const Bitboard checkSquares = pos.check_squares(Pt);
-
- while (bb) {
- Square from = pop_lsb(&bb);
+ Bitboard bb = pos.pieces(Us, Pt);
- Bitboard b = attacks_bb(from, pos.pieces()) & target;
- if constexpr (Checks)
- b &= checkSquares;
+ while (bb)
+ {
+ Square from = pop_lsb(bb);
+ Bitboard b = attacks_bb(from, pos.pieces()) & target;
while (b)
- *moveList++ = make_move(from, pop_lsb(&b));
+ *moveList++ = Move(from, pop_lsb(b));
}
return moveList;
- }
+}
- template
- ExtMove* generate_all(const Position& pos, ExtMove* moveList) {
+template
+ExtMove* generate_all(const Position& pos, ExtMove* moveList) {
static_assert(Type != LEGAL, "Unsupported type in generate_all()");
- constexpr bool Checks = Type == QUIET_CHECKS; // Reduce template instantiations
- Bitboard target, piecesToMove = pos.pieces(Us);
-
- if(Type == QUIET_CHECKS)
- piecesToMove &= ~pos.blockers_for_king(~Us);
+ const Square ksq = pos.square(Us);
+ Bitboard target;
- switch (Type)
+ // Skip generating non-king moves when in double check
+ if (Type != EVASIONS || !more_than_one(pos.checkers()))
{
- case CAPTURES:
- target = pos.pieces(~Us);
- break;
- case QUIETS:
- case QUIET_CHECKS:
- target = ~pos.pieces();
- break;
- case EVASIONS:
- {
- Square checksq = lsb(pos.checkers());
- target = between_bb(pos.square(Us), checksq) | checksq;
- break;
- }
- case NON_EVASIONS:
- target = ~pos.pieces(Us);
- break;
+ target = Type == EVASIONS ? between_bb(ksq, lsb(pos.checkers()))
+ : Type == NON_EVASIONS ? ~pos.pieces(Us)
+ : Type == CAPTURES ? pos.pieces(~Us)
+ : ~pos.pieces(); // QUIETS
+
+ moveList = generate_pawn_moves(pos, moveList, target);
+ moveList = generate_moves(pos, moveList, target);
+ moveList = generate_moves(pos, moveList, target);
+ moveList = generate_moves(pos, moveList, target);
+ moveList = generate_moves(pos, moveList, target);
}
- moveList = generate_pawn_moves(pos, moveList, target);
- moveList = generate_moves(pos, moveList, piecesToMove, target);
- moveList = generate_moves(pos, moveList, piecesToMove, target);
- moveList = generate_moves< ROOK, Checks>(pos, moveList, piecesToMove, target);
- moveList = generate_moves< QUEEN, Checks>(pos, moveList, piecesToMove, target);
+ Bitboard b = attacks_bb(ksq) & (Type == EVASIONS ? ~pos.pieces(Us) : target);
- if (Type != QUIET_CHECKS && Type != EVASIONS)
- {
- Square ksq = pos.square(Us);
- Bitboard b = attacks_bb(ksq) & target;
- while (b)
- *moveList++ = make_move(ksq, pop_lsb(&b));
+ while (b)
+ *moveList++ = Move(ksq, pop_lsb(b));
- if ((Type != CAPTURES) && pos.can_castle(Us & ANY_CASTLING))
- for (CastlingRights cr : { Us & KING_SIDE, Us & QUEEN_SIDE } )
- if (!pos.castling_impeded(cr) && pos.can_castle(cr))
- *moveList++ = make(ksq, pos.castling_rook_square(cr));
- }
+ if ((Type == QUIETS || Type == NON_EVASIONS) && pos.can_castle(Us & ANY_CASTLING))
+ for (CastlingRights cr : {Us & KING_SIDE, Us & QUEEN_SIDE})
+ if (!pos.castling_impeded(cr) && pos.can_castle(cr))
+ *moveList++ = Move::make(ksq, pos.castling_rook_square(cr));
return moveList;
- }
-
-} // namespace
+}
+} // namespace
-/// Generates all pseudo-legal captures plus queen and checking knight promotions
-/// Generates all pseudo-legal non-captures and underpromotions (except checking knight)
-/// Generates all pseudo-legal captures and non-captures
-///
-/// Returns a pointer to the end of the move list.
+// Generates all pseudo-legal captures plus queen promotions
+// Generates all pseudo-legal non-captures and underpromotions
+// Generates all pseudo-legal check evasions
+// Generates all pseudo-legal captures and non-captures
+//
+// Returns a pointer to the end of the move list.
template
ExtMove* generate(const Position& pos, ExtMove* moveList) {
- static_assert(Type == CAPTURES || Type == QUIETS || Type == NON_EVASIONS, "Unsupported type in generate()");
- assert(!pos.checkers());
+ static_assert(Type != LEGAL, "Unsupported type in generate()");
+ assert((Type == EVASIONS) == bool(pos.checkers()));
- Color us = pos.side_to_move();
+ Color us = pos.side_to_move();
- return us == WHITE ? generate_all(pos, moveList)
- : generate_all(pos, moveList);
+ return us == WHITE ? generate_all(pos, moveList)
+ : generate_all(pos, moveList);
}
// Explicit template instantiations
template ExtMove* generate(const Position&, ExtMove*);
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 giving check,
-/// except castling. Returns a pointer to the end of the move list.
-template<>
-ExtMove* generate(const Position& pos, ExtMove* moveList) {
-
- assert(!pos.checkers());
-
- Color us = pos.side_to_move();
- Bitboard dc = pos.blockers_for_king(~us) & pos.pieces(us) & ~pos.pieces(PAWN);
-
- while (dc)
- {
- Square from = pop_lsb(&dc);
- PieceType pt = type_of(pos.piece_on(from));
-
- Bitboard b = attacks_bb(pt, from, pos.pieces()) & ~pos.pieces();
-
- if (pt == KING)
- b &= ~attacks_bb(pos.square(~us));
-
- while (b)
- *moveList++ = make_move(from, pop_lsb(&b));
- }
-
- return us == WHITE ? generate_all(pos, moveList)
- : generate_all(pos, moveList);
-}
+// generate generates all the legal moves in the given position
-
-/// 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<>
-ExtMove* generate(const Position& pos, ExtMove* moveList) {
-
- assert(pos.checkers());
-
- Color us = pos.side_to_move();
- Square ksq = pos.square(us);
- Bitboard sliderAttacks = 0;
- Bitboard sliders = pos.checkers() & ~pos.pieces(KNIGHT, PAWN);
-
- // 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.
- while (sliders)
- sliderAttacks |= line_bb(ksq, pop_lsb(&sliders)) & ~pos.checkers();
+ExtMove* generate(const Position& pos, ExtMove* moveList) {
- // Generate evasions for king, capture and non capture moves
- Bitboard b = attacks_bb(ksq) & ~pos.pieces(us) & ~sliderAttacks;
- while (b)
- *moveList++ = make_move(ksq, pop_lsb(&b));
+ Color us = pos.side_to_move();
+ Bitboard pinned = pos.blockers_for_king(us) & pos.pieces(us);
+ Square ksq = pos.square(us);
+ ExtMove* cur = moveList;
- if (more_than_one(pos.checkers()))
- return moveList; // Double check, only a king move can save the day
+ moveList =
+ pos.checkers() ? generate(pos, moveList) : generate(pos, moveList);
+ while (cur != moveList)
+ if (((pinned & cur->from_sq()) || cur->from_sq() == ksq || cur->type_of() == EN_PASSANT)
+ && !pos.legal(*cur))
+ *cur = *(--moveList);
+ else
+ ++cur;
- // Generate blocking evasions or captures of the checking piece
- return us == WHITE ? generate_all(pos, moveList)
- : generate_all(pos, moveList);
+ return moveList;
}
-
-/// generate generates all the legal moves in the given position
-
-template<>
-ExtMove* generate(const Position& pos, ExtMove* moveList) {
-
- Color us = pos.side_to_move();
- Bitboard pinned = pos.blockers_for_king(us) & pos.pieces(us);
- Square ksq = pos.square(us);
- ExtMove* cur = moveList;
-
- moveList = pos.checkers() ? generate(pos, moveList)
- : generate(pos, moveList);
- while (cur != moveList)
- if ( (pinned || from_sq(*cur) == ksq || type_of(*cur) == EN_PASSANT)
- && !pos.legal(*cur))
- *cur = (--moveList)->move;
- else
- ++cur;
-
- return moveList;
-}
+} // namespace Stockfish