X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=cc1518a078de7d48064e93cbd23e8ad6b95b54be;hp=bd9d0b6240989bbe0921009d4b7d7c1477b09fd9;hb=HEAD;hpb=32d781769db9f017405fe422bfdc702069fb0422
diff --git a/src/movegen.cpp b/src/movegen.cpp
index bd9d0b62..7d6856bb 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-2023 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,99 +16,85 @@
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)
- {
+ constexpr bool all = Type == EVASIONS || Type == NON_EVASIONS;
+
+ if constexpr (Type == CAPTURES || all)
*moveList++ = make(to - D, to, QUEEN);
- if (attacks_bb(to) & ksq)
- *moveList++ = make(to - D, to, KNIGHT);
- }
- 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++ = 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.checkers()
- : 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)
+ if constexpr (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;
- }
+ // To make a quiet check, you either make a direct check by pushing a pawn
+ // or push a blocker pawn that is not on the same file as the enemy king.
+ // Discovered check promotion has been already generated amongst the captures.
+ Square ksq = pos.square(Them);
+ Bitboard dcCandidatePawns = pos.blockers_for_king(Them) & ~file_bb(ksq);
+ b1 &= pawn_attacks_bb(Them, ksq) | shift(dcCandidatePawns);
+ b2 &= pawn_attacks_bb(Them, ksq) | shift(dcCandidatePawns);
}
while (b1)
{
- Square to = pop_lsb(b1);
+ Square to = pop_lsb(b1);
*moveList++ = make_move(to - Up, to);
}
while (b2)
{
- Square to = pop_lsb(b2);
+ Square to = pop_lsb(b2);
*moveList++ = make_move(to - Up - Up, to);
}
}
@@ -116,41 +102,38 @@ namespace {
// 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);
+ Square to = pop_lsb(b1);
*moveList++ = make_move(to - UpRight, to);
}
while (b2)
{
- Square to = pop_lsb(b2);
+ Square to = pop_lsb(b2);
*moveList++ = make_move(to - UpLeft, to);
}
@@ -172,11 +155,11 @@ namespace {
}
return moveList;
- }
+}
- template
- ExtMove* generate_moves(const Position& pos, ExtMove* moveList, 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()");
@@ -184,9 +167,10 @@ namespace {
while (bb)
{
- Square from = pop_lsb(bb);
+ Square from = pop_lsb(bb);
+ Bitboard b = attacks_bb(from, pos.pieces()) & target;
- Bitboard b = attacks_bb(from, pos.pieces()) & target;
+ // To check, you either move freely a blocker or make a direct check.
if (Checks && (Pt == QUEEN || !(pos.blockers_for_king(~Us) & from)))
b &= pos.check_squares(Pt);
@@ -195,33 +179,33 @@ namespace {
}
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
- const Square ksq = pos.square(Us);
- Bitboard target;
-
- if (Type == EVASIONS && more_than_one(pos.checkers()))
- goto kingMoves; // Double check, only a king move can save the day
+ constexpr bool Checks = Type == QUIET_CHECKS; // Reduce template instantiations
+ const Square ksq = pos.square(Us);
+ Bitboard target;
- target = Type == EVASIONS ? between_bb(ksq, lsb(pos.checkers()))
- : Type == NON_EVASIONS ? ~pos.pieces( Us)
- : Type == CAPTURES ? pos.pieces(~Us)
- : ~pos.pieces( ); // QUIETS || QUIET_CHECKS
-
- 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);
+ // Skip generating non-king moves when in double check
+ if (Type != EVASIONS || !more_than_one(pos.checkers()))
+ {
+ target = Type == EVASIONS ? between_bb(ksq, lsb(pos.checkers()))
+ : Type == NON_EVASIONS ? ~pos.pieces(Us)
+ : Type == CAPTURES ? pos.pieces(~Us)
+ : ~pos.pieces(); // QUIETS || QUIET_CHECKS
+
+ 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);
+ }
-kingMoves:
if (!Checks || pos.blockers_for_king(~Us) & ksq)
{
Bitboard b = attacks_bb(ksq) & (Type == EVASIONS ? ~pos.pieces(Us) : target);
@@ -232,35 +216,35 @@ kingMoves:
*moveList++ = make_move(ksq, pop_lsb(b));
if ((Type == QUIETS || Type == NON_EVASIONS) && pos.can_castle(Us & ANY_CASTLING))
- for (CastlingRights cr : { Us & KING_SIDE, Us & QUEEN_SIDE } )
+ 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));
}
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 check evasions when the side to move is in check
-/// Generates all pseudo-legal non-captures giving check, except castling
-/// 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
+// Generates all pseudo-legal non-captures giving check,
+// except castling and promotions
+//
+// Returns a pointer to the end of the move list.
template
ExtMove* generate(const Position& pos, ExtMove* moveList) {
- static_assert(Type != LEGAL, "Unsupported type in generate()");
- assert((Type == EVASIONS) == (bool)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
@@ -271,26 +255,26 @@ template ExtMove* generate(const Position&, ExtMove*);
template ExtMove* generate(const Position&, ExtMove*);
-/// generate generates all the legal moves in the given position
+// 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 && pinned & from_sq(*cur)) || from_sq(*cur) == ksq || type_of(*cur) == EN_PASSANT)
- && !pos.legal(*cur))
- *cur = (--moveList)->move;
- else
- ++cur;
-
- return 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)) || from_sq(*cur) == ksq || type_of(*cur) == EN_PASSANT)
+ && !pos.legal(*cur))
+ *cur = (--moveList)->move;
+ else
+ ++cur;
+
+ return moveList;
}
-} // namespace Stockfish
+} // namespace Stockfish