X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovegen.cpp;h=9b4cc130b2268fb0e6029b9bf2b547741ac46bf9;hb=e5077dc11e8047eb8ce32a166a73e433a7e19b15;hp=018b770b72b87cecf831f4ab588f62e94cee9316;hpb=2ff2b5972799c2cb1b68e2d82e35b9b3c7c6996d;p=stockfish
diff --git a/src/movegen.cpp b/src/movegen.cpp
index 018b770b..9b4cc130 100644
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -17,16 +17,10 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
-
#include
#include "bitcount.h"
#include "movegen.h"
-#include "types.h"
// Simple macro to wrap a very common while loop, no facny, no flexibility,
// hardcoded list name 'mlist' and from square 'from'.
@@ -35,10 +29,6 @@
// 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); }
-////
-//// Local definitions
-////
-
namespace {
enum CastlingSide {
@@ -46,19 +36,19 @@ namespace {
QUEEN_SIDE
};
- template
+ template
MoveStack* generate_castle_moves(const Position&, MoveStack*, Color us);
- template
+ template
MoveStack* generate_pawn_moves(const Position&, MoveStack*, Bitboard, Square);
- template
+ template
inline MoveStack* generate_discovered_checks(const Position& pos, MoveStack* mlist, Square from) {
- assert(Piece != QUEEN);
+ assert(Pt != QUEEN);
- Bitboard b = pos.attacks_from(from) & pos.empty_squares();
- if (Piece == KING)
+ Bitboard b = pos.attacks_from(from) & pos.empty_squares();
+ if (Pt == KING)
{
Square ksq = pos.king_square(opposite_color(pos.side_to_move()));
b &= ~QueenPseudoAttacks[ksq];
@@ -67,31 +57,31 @@ namespace {
return mlist;
}
- template
+ template
inline MoveStack* generate_direct_checks(const Position& pos, MoveStack* mlist, Color us,
Bitboard dc, Square ksq) {
- assert(Piece != KING);
+ assert(Pt != KING);
Bitboard checkSqs, b;
Square from;
- const Square* ptr = pos.piece_list_begin(us, Piece);
+ const Square* ptr = pos.piece_list_begin(us, Pt);
if ((from = *ptr++) == SQ_NONE)
return mlist;
- checkSqs = pos.attacks_from(ksq) & pos.empty_squares();
+ checkSqs = pos.attacks_from(ksq) & pos.empty_squares();
do
{
- if ( (Piece == QUEEN && !(QueenPseudoAttacks[from] & checkSqs))
- || (Piece == ROOK && !(RookPseudoAttacks[from] & checkSqs))
- || (Piece == BISHOP && !(BishopPseudoAttacks[from] & checkSqs)))
+ if ( (Pt == QUEEN && !(QueenPseudoAttacks[from] & checkSqs))
+ || (Pt == ROOK && !(RookPseudoAttacks[from] & checkSqs))
+ || (Pt == BISHOP && !(BishopPseudoAttacks[from] & checkSqs)))
continue;
if (dc && bit_is_set(dc, from))
continue;
- b = pos.attacks_from(from) & checkSqs;
+ b = pos.attacks_from(from) & checkSqs;
SERIALIZE_MOVES(b);
} while ((from = *ptr++) != SQ_NONE);
@@ -106,28 +96,28 @@ namespace {
: generate_pawn_moves(p, m, dc, ksq));
}
- template
+ template
FORCE_INLINE MoveStack* generate_piece_moves(const Position& p, MoveStack* m, Color us, Bitboard t) {
- assert(Piece == PAWN);
+ 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));
}
- template
+ 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, Piece);
+ const Square* ptr = pos.piece_list_begin(us, Pt);
if (*ptr != SQ_NONE)
{
do {
from = *ptr;
- b = pos.attacks_from(from) & target;
+ b = pos.attacks_from(from) & target;
SERIALIZE_MOVES(b);
} while (*++ptr != SQ_NONE);
}
@@ -147,10 +137,6 @@ namespace {
}
-////
-//// Functions
-////
-
/// generate generates all pseudo-legal captures and queen
/// promotions. Returns a pointer to the end of the move list.
@@ -165,13 +151,13 @@ template
MoveStack* generate(const Position& pos, MoveStack* mlist) {
assert(pos.is_ok());
- assert(!pos.is_check());
+ 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));
+ target = pos.pieces(opposite_color(us));
else if (Type == MV_NON_CAPTURE)
target = pos.empty_squares();
else
@@ -192,19 +178,19 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) {
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))
+ if (pos.can_castle(us == WHITE ? WHITE_OO : BLACK_OO))
mlist = generate_castle_moves(pos, mlist, us);
- if (pos.can_castle_queenside(us))
+ if (pos.can_castle(us == WHITE ? WHITE_OOO : BLACK_OOO))
mlist = generate_castle_moves(pos, mlist, us);
}
return mlist;
}
-// Explicit template instantiation
+// Explicit template instantiations
template MoveStack* generate(const Position& pos, MoveStack* mlist);
template MoveStack* generate(const Position& pos, MoveStack* mlist);
template MoveStack* generate(const Position& pos, MoveStack* mlist);
@@ -216,7 +202,7 @@ 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;
@@ -231,7 +217,7 @@ MoveStack* generate(const Position& pos, MoveStack* mlist)
while (b)
{
from = pop_1st_bit(&b);
- switch (pos.type_of_piece_on(from))
+ switch (piece_type(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;
@@ -257,7 +243,7 @@ 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;
@@ -279,26 +265,31 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) {
checkersCnt++;
checksq = pop_1st_bit(&b);
- assert(pos.color_of_piece_on(checksq) == opposite_color(us));
+ assert(piece_color(pos.piece_on(checksq)) == opposite_color(us));
- switch (pos.type_of_piece_on(checksq))
+ switch (piece_type(pos.piece_on(checksq)))
{
case BISHOP: sliderAttacks |= BishopPseudoAttacks[checksq]; break;
case ROOK: sliderAttacks |= RookPseudoAttacks[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 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) || (RookPseudoAttacks[checksq] & (1ULL << ksq)))
+ sliderAttacks |= QueenPseudoAttacks[checksq];
+
+ // Otherwise, if king and queen are adjacent and on a diagonal line, 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);
+
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);
@@ -318,16 +309,7 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) {
}
-/// generate computes a complete list of legal
-/// or pseudo-legal moves in the current position.
-template<>
-inline MoveStack* generate(const Position& pos, MoveStack* mlist) {
-
- assert(pos.is_ok());
-
- return pos.is_check() ? generate(pos, mlist)
- : generate(pos, mlist);
-}
+/// generate computes a complete list of legal moves in the current position
template<>
MoveStack* generate(const Position& pos, MoveStack* mlist) {
@@ -337,129 +319,20 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) {
MoveStack *last, *cur = mlist;
Bitboard pinned = pos.pinned_pieces(pos.side_to_move());
- last = generate(pos, mlist);
+ last = pos.in_check() ? generate(pos, mlist)
+ : generate(pos, mlist);
// Remove illegal moves from the list
while (cur != last)
- if (pos.pl_move_is_legal(cur->move, pinned))
- cur++;
- else
+ if (!pos.pl_move_is_legal(cur->move, pinned))
cur->move = (--last)->move;
+ else
+ cur++;
return last;
}
-/// move_is_legal() takes a position and a (not necessarily pseudo-legal)
-/// move and tests whether the move is legal. This version is not very fast
-/// and should be used only in non time-critical paths.
-
-bool move_is_legal(const Position& pos, const Move m) {
-
- MoveStack mlist[MOVES_MAX];
- MoveStack *cur, *last = generate(pos, mlist);
-
- for (cur = mlist; cur != last; cur++)
- if (cur->move == m)
- return pos.pl_move_is_legal(m, pos.pinned_pieces(pos.side_to_move()));
-
- return false;
-}
-
-
-/// Fast version of move_is_legal() that takes a position a move and a
-/// bitboard of pinned pieces as input, and tests whether the move is legal.
-
-bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) {
-
- assert(pos.is_ok());
- assert(pinned == pos.pinned_pieces(pos.side_to_move()));
-
- Color us = pos.side_to_move();
- Color them = opposite_color(us);
- Square from = move_from(m);
- Square to = move_to(m);
- Piece pc = pos.piece_on(from);
-
- // Use a slower but simpler function for uncommon cases
- if (move_is_special(m))
- return move_is_legal(pos, m);
-
- // If the from square is not occupied by a piece belonging to the side to
- // move, the move is obviously not legal.
- if (color_of_piece(pc) != us)
- return false;
-
- // The destination square cannot be occupied by a friendly piece
- if (pos.color_of_piece_on(to) == us)
- return false;
-
- // Handle the special case of a pawn move
- if (type_of_piece(pc) == PAWN)
- {
- // Move direction must be compatible with pawn color
- int direction = to - from;
- if ((us == WHITE) != (direction > 0))
- return false;
-
- // We have already handled promotion moves, so destination
- // cannot be on the 8/1th rank.
- if (square_rank(to) == RANK_8 || square_rank(to) == RANK_1)
- return false;
-
- // Proceed according to the square delta between the origin and
- // destination squares.
- switch (direction)
- {
- case DELTA_NW:
- case DELTA_NE:
- case DELTA_SW:
- case DELTA_SE:
- // Capture. The destination square must be occupied by an enemy
- // piece (en passant captures was handled earlier).
- if (pos.color_of_piece_on(to) != them)
- return false;
- break;
-
- case DELTA_N:
- case DELTA_S:
- // Pawn push. The destination square must be empty.
- if (!pos.square_is_empty(to))
- return false;
- break;
-
- case DELTA_NN:
- // Double white pawn push. The destination square must be on the fourth
- // rank, and both the destination square and the square between the
- // source and destination squares must be empty.
- if ( square_rank(to) != RANK_4
- || !pos.square_is_empty(to)
- || !pos.square_is_empty(from + DELTA_N))
- return false;
- break;
-
- case DELTA_SS:
- // Double black pawn push. The destination square must be on the fifth
- // rank, and both the destination square and the square between the
- // source and destination squares must be empty.
- if ( square_rank(to) != RANK_5
- || !pos.square_is_empty(to)
- || !pos.square_is_empty(from + DELTA_S))
- return false;
- break;
-
- default:
- return false;
- }
- }
- else if (!bit_is_set(pos.attacks_from(pc, from), to))
- return false;
-
- // The move is pseudo-legal, check if it is also legal
- return pos.is_check() ? pos.pl_move_is_evasion(m, pinned) : pos.pl_move_is_legal(m, pinned);
-}
-
-
namespace {
template
@@ -538,7 +411,7 @@ namespace {
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));
+ Bitboard enemyPieces = (Type == MV_CAPTURE ? target : pos.pieces(Them));
// Pre-calculate pawn pushes before changing emptySquares definition
if (Type != MV_CAPTURE)
@@ -575,7 +448,7 @@ namespace {
// Single and double pawn pushes
if (Type != MV_CAPTURE)
{
- b1 = pawnPushes & emptySquares;
+ b1 = (Type != MV_EVASION ? pawnPushes : pawnPushes & emptySquares);
b2 = move_pawns(pawnPushes & TRank3BB) & emptySquares;
if (Type == MV_CHECK)
@@ -630,10 +503,11 @@ namespace {
Color them = opposite_color(us);
Square ksq = pos.king_square(us);
+ CastleRight f = CastleRight((Side == KING_SIDE ? WHITE_OO : WHITE_OOO) << 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 rsq = pos.castle_rook_square(f);
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;
@@ -643,12 +517,12 @@ namespace {
// 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)))
+ if ( (s != ksq && s != rsq && !pos.square_is_empty(s))
+ ||(pos.attackers_to(s) & pos.pieces(them)))
illegal = true;
for (s = Min(rsq, s2); s <= Max(rsq, s2); s++)
- if (s != ksq && s != rsq && pos.square_is_occupied(s))
+ if (s != ksq && s != rsq && !pos.square_is_empty(s))
illegal = true;
if ( Side == QUEEN_SIDE