X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovegen.cpp;h=cda43b3a5824af177645a75a2066d0c5bcf7d10b;hb=fe53a18f7a149f7e6d1a9dde8a7478692ef82997;hp=bb81aeac07897655e155437b65506439b333f61a;hpb=6b9a70ace8073f5ff4c50b4dd5ddc041cf9c819f;p=stockfish
diff --git a/src/movegen.cpp b/src/movegen.cpp
index bb81aeac..cda43b3a 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,31 +16,37 @@
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)
+ if constexpr (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS)
{
*moveList++ = make(to - D, to, QUEEN);
- if (attacks_bb(to) & ksq)
+ if constexpr (Enemy && Type == CAPTURES)
+ {
+ *moveList++ = make(to - D, to, ROOK);
+ *moveList++ = make(to - D, to, BISHOP);
*moveList++ = make(to - D, to, KNIGHT);
+ }
}
- if (Type == QUIETS || Type == EVASIONS || Type == NON_EVASIONS)
+ if constexpr ((Type == QUIETS && !Enemy) || Type == EVASIONS || Type == NON_EVASIONS)
{
*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;
@@ -57,31 +63,31 @@ namespace {
constexpr Direction UpRight = (Us == WHITE ? NORTH_EAST : SOUTH_WEST);
constexpr Direction UpLeft = (Us == WHITE ? NORTH_WEST : SOUTH_EAST);
- const Square ksq = pos.square(Them);
- const Bitboard emptySquares = Type == QUIETS || Type == QUIET_CHECKS ? target : ~pos.pieces();
- const Bitboard enemies = Type == EVASIONS ? pos.checkers()
- : Type == CAPTURES ? target : pos.pieces(Them);
+ const Bitboard emptySquares = ~pos.pieces();
+ const Bitboard enemies = Type == EVASIONS ? pos.checkers()
+ : pos.pieces(Them);
Bitboard pawnsOn7 = pos.pieces(Us, PAWN) & TRank7BB;
Bitboard pawnsNotOn7 = pos.pieces(Us, PAWN) & ~TRank7BB;
// Single and double pawn pushes, no promotions
- if (Type != CAPTURES)
+ if constexpr (Type != CAPTURES)
{
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)
{
// 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< Up>(dcCandidatePawns);
b2 &= pawn_attacks_bb(Them, ksq) | shift(dcCandidatePawns);
@@ -107,21 +113,21 @@ namespace {
Bitboard b2 = shift(pawnsOn7) & enemies;
Bitboard b3 = shift(pawnsOn7) & emptySquares;
- if (Type == EVASIONS)
+ 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;
@@ -206,6 +212,7 @@ namespace {
moveList = generate_moves(pos, moveList, target);
moveList = generate_moves(pos, moveList, target);
}
+
if (!Checks || pos.blockers_for_king(~Us) & ksq)
{
Bitboard b = attacks_bb(ksq) & (Type == EVASIONS ? ~pos.pieces(Us) : target);
@@ -227,11 +234,12 @@ 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 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.
@@ -239,7 +247,7 @@ template
ExtMove* generate(const Position& pos, ExtMove* moveList) {
static_assert(Type != LEGAL, "Unsupported type in generate()");
- assert((Type == EVASIONS) == (bool)pos.checkers());
+ assert((Type == EVASIONS) == bool(pos.checkers()));
Color us = pos.side_to_move();
@@ -268,7 +276,7 @@ ExtMove* generate(const Position& pos, ExtMove* 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)
+ if ( ((pinned & from_sq(*cur)) || from_sq(*cur) == ksq || type_of(*cur) == EN_PASSANT)
&& !pos.legal(*cur))
*cur = (--moveList)->move;
else