X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmovegen.cpp;h=5308e45ddfbdd9e6d2dd36f89c8fd91e6c38fa28;hb=9c8c4ff46f87d202b8c9b09c5b51c2b4f81b31d2;hp=8b0f20c7f7df213c7569bd65c9aecf0df2906a09;hpb=cf247e7e30c5d821be27078a68236b40f2d2f7a0;p=stockfish
diff --git a/src/movegen.cpp b/src/movegen.cpp
index 8b0f20c7..5308e45d 100644
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -17,19 +17,18 @@
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'.
+/// Simple macro to wrap a very common while loop, no facny, no flexibility,
+/// hardcoded names 'mlist' and '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
+/// 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); }
namespace {
@@ -99,29 +98,29 @@ namespace {
template
inline MoveStack* generate_pawn_captures(MoveStack* mlist, Bitboard pawns, Bitboard target) {
- const Bitboard EdgeFileBB = ( Delta == DELTA_NE
- || Delta == DELTA_SE ? FileABB : FileHBB);
+ const Bitboard TFileABB = ( Delta == DELTA_NE
+ || Delta == DELTA_SE ? FileABB : FileHBB);
Bitboard b;
Square to;
- b = move_pawns(pawns) & target & ~EdgeFileBB;
+ 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) {
+ inline MoveStack* generate_promotions(MoveStack* mlist, Bitboard pawnsOn7, Bitboard target, Square ksq) {
- const Bitboard EdgeFileBB = ( Delta == DELTA_NE
- || Delta == DELTA_SE ? FileABB : FileHBB);
+ 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 &= ~EdgeFileBB;
+ b &= ~TFileABB;
while (b)
{
@@ -137,16 +136,13 @@ namespace {
(*mlist++).move = make_promotion(to - Delta, to, KNIGHT);
}
- // Knight under promotion is the only one that can give a check not
- // already included in the queen-promotion.
- if (Type == MV_CHECK)
- {
- Square ksq = pos.king_square(Delta > 0 ? BLACK : WHITE);
- if (bit_is_set(pos.attacks_from(to), ksq))
+ // 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)pos; // Silence a warning under MSVC
+ (void)ksq; // Silence a warning under MSVC
}
return mlist;
}
@@ -155,119 +151,102 @@ namespace {
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_UP = (Us == WHITE ? DELTA_NE : DELTA_SW);
- const Square LEFT_UP = (Us == WHITE ? DELTA_NW : DELTA_SE);
+ // 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);
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(Them));
+ Bitboard b1, b2, dc1, dc2, emptySquares;
- // 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;
- }
+ Bitboard pawns = pos.pieces(PAWN, Us);
+ Bitboard pawnsOn7 = pawns & TRank7BB;
+ Bitboard pawnsNotOn7 = pawns & ~TRank7BB;
- if (Type == MV_EVASION)
- {
- emptySquares &= target; // Only blocking squares
- enemyPieces &= target; // Capture only the checker piece
- }
+ Bitboard enemies = (Type == MV_EVASION ? pos.pieces(Them) & target:
+ Type == MV_CAPTURE ? target : pos.pieces(Them));
- // Promotions and underpromotions
- if (pawnsOn7)
+ // Single and double pawn pushes, no promotions
+ if (Type != MV_CAPTURE)
{
- 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);
- }
+ emptySquares = (Type == MV_NON_CAPTURE ? target : pos.empty_squares());
- // Standard captures
- if (Type == MV_CAPTURE || Type == MV_EVASION || Type == MV_NON_EVASION)
- {
- mlist = generate_pawn_captures(mlist, pawns, enemyPieces);
- mlist = generate_pawn_captures(mlist, pawns, enemyPieces);
- }
+ b1 = move_pawns(pawnsNotOn7) & emptySquares;
+ b2 = move_pawns(b1 & TRank3BB) & emptySquares;
- // Single and double pawn pushes
- if (Type != MV_CAPTURE)
- {
- b1 = (Type != MV_EVASION ? pawnPushes : pawnPushes & emptySquares);
- b2 = move_pawns(pawnPushes & TRank3BB) & emptySquares;
+ if (Type == MV_EVASION) // Consider only blocking squares
+ {
+ b1 &= target;
+ b2 &= target;
+ }
- if (Type == MV_CHECK)
+ if (Type == MV_NON_CAPTURE_CHECK)
{
- // Consider only pawn moves which give direct checks
+ // Consider only 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
+ // 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.
- if (pawns & target) // For CHECK type target is dc bitboard
+ // 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(pawns & target & ~file_bb(ksq)) & emptySquares;
+ dc1 = move_pawns(pawnsNotOn7 & target) & emptySquares & ~file_bb(ksq);
dc2 = move_pawns(dc1 & TRank3BB) & emptySquares;
b1 |= dc1;
b2 |= dc2;
}
}
+
SERIALIZE_MOVES_D(b1, -UP);
SERIALIZE_MOVES_D(b2, -UP -UP);
}
- // En passant captures
- if ( (Type == MV_CAPTURE || Type == MV_EVASION || Type == MV_NON_EVASION)
- && pos.ep_square() != SQ_NONE)
+ // Promotions and underpromotions
+ if (pawnsOn7)
{
- assert(Us != WHITE || rank_of(pos.ep_square()) == RANK_6);
- assert(Us != BLACK || rank_of(pos.ep_square()) == RANK_3);
+ if (Type == MV_CAPTURE)
+ emptySquares = pos.empty_squares();
- // 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;
+ if (Type == MV_EVASION)
+ emptySquares &= target;
- b1 = pawns & pos.attacks_from(pos.ep_square(), Them);
+ mlist = generate_promotions(mlist, pawnsOn7, enemies, ksq);
+ mlist = generate_promotions(mlist, pawnsOn7, enemies, ksq);
+ mlist = generate_promotions(mlist, pawnsOn7, emptySquares, ksq);
+ }
- assert(b1);
+ // 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);
- while (b1)
+ if (pos.ep_square() != SQ_NONE)
{
- to = pop_1st_bit(&b1);
- (*mlist++).move = make_enpassant(to, pos.ep_square());
- }
- }
- return mlist;
- }
-
+ assert(rank_of(pos.ep_square()) == (Us == WHITE ? RANK_6 : RANK_3));
- template
- inline MoveStack* generate_discovered_checks(const Position& pos, MoveStack* mlist, Square from) {
+ // 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;
- assert(Pt != QUEEN && Pt != PAWN);
+ b1 = pawnsNotOn7 & pos.attacks_from(pos.ep_square(), Them);
- Bitboard b = pos.attacks_from(from) & pos.empty_squares();
+ assert(b1);
- if (Pt == KING)
- b &= ~QueenPseudoAttacks[pos.king_square(flip(pos.side_to_move()))];
+ while (b1)
+ (*mlist++).move = make_enpassant(pop_1st_bit(&b1), pos.ep_square());
+ }
+ }
- SERIALIZE_MOVES(b);
return mlist;
}
@@ -308,8 +287,8 @@ namespace {
template<>
FORCE_INLINE MoveStack* generate_direct_checks(const Position& p, MoveStack* m, Color us, Bitboard dc, Square ksq) {
- 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, dc, ksq)
+ : generate_pawn_moves(p, m, dc, ksq));
}
@@ -413,6 +392,7 @@ MoveStack* generate(const Position& pos, MoveStack* mlist)
Bitboard b, dc;
Square from;
+ PieceType pt;
Color us = pos.side_to_move();
Square ksq = pos.king_square(flip(us));
@@ -424,15 +404,17 @@ MoveStack* generate(const Position& pos, MoveStack* mlist)
while (b)
{
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;
- }
+ pt = type_of(pos.piece_on(from));
+
+ if (pt == PAWN)
+ continue; // Will be generated togheter with direct checks
+
+ b = pos.attacks_from(Piece(pt), from) & pos.empty_squares();
+
+ if (pt == KING)
+ b &= ~QueenPseudoAttacks[ksq];
+
+ SERIALIZE_MOVES(b);
}
// Direct non-capture checks
@@ -515,7 +497,7 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) {
}
-/// generate computes a complete list of legal moves in the current position
+/// generate generates all legal moves in the current position
template<>
MoveStack* generate(const Position& pos, MoveStack* mlist) {