X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fmovegen.cpp;h=0056ce384dfff017f45d164d442d746a62649943;hb=f427acbd2787cdf0373d081a3a20019b5eb253c6;hp=4b36360c56ae7a13c67178e14d495b320897b531;hpb=7a68916ff992115d8013e7ce31850aec558d8ac5;p=stockfish
diff --git a/src/movegen.cpp b/src/movegen.cpp
index 4b36360c..0056ce38 100644
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -1,7 +1,7 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2009 Marco Costalba
+ Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,11 +17,6 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
-
#include
#include "bitcount.h"
@@ -34,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 {
@@ -45,105 +36,174 @@ namespace {
QUEEN_SIDE
};
- enum MoveType {
- CAPTURE,
- NON_CAPTURE,
- CHECK,
- EVASION
- };
-
- // Helper templates
template
- MoveStack* generate_castle_moves(const Position&, MoveStack*);
+ MoveStack* generate_castle_moves(const Position&, MoveStack*, Color us);
template
MoveStack* generate_pawn_moves(const Position&, MoveStack*, Bitboard, Square);
- // Template generate_piece_moves (captures and non-captures) with specializations and overloads
- template
- MoveStack* generate_piece_moves(const Position&, MoveStack*, Color, Bitboard);
+ template
+ inline MoveStack* generate_discovered_checks(const Position& pos, MoveStack* mlist, Square from) {
+
+ assert(Piece != QUEEN);
+
+ Bitboard b = pos.attacks_from(from) & pos.empty_squares();
+ if (Piece == KING)
+ {
+ Square ksq = pos.king_square(opposite_color(pos.side_to_move()));
+ b &= ~QueenPseudoAttacks[ksq];
+ }
+ SERIALIZE_MOVES(b);
+ return mlist;
+ }
+
+ template
+ inline MoveStack* generate_direct_checks(const Position& pos, MoveStack* mlist, Color us,
+ Bitboard dc, Square ksq) {
+ assert(Piece != KING);
+
+ Bitboard checkSqs, b;
+ Square from;
+ const Square* ptr = pos.piece_list_begin(us, Piece);
+
+ if ((from = *ptr++) == SQ_NONE)
+ return mlist;
+
+ 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)))
+ continue;
+
+ if (dc && bit_is_set(dc, from))
+ continue;
+
+ b = pos.attacks_from(from) & checkSqs;
+ SERIALIZE_MOVES(b);
+
+ } while ((from = *ptr++) != SQ_NONE);
+
+ return mlist;
+ }
template<>
- MoveStack* generate_piece_moves(const Position&, MoveStack*, Color, Bitboard);
+ 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));
+ }
template
- inline MoveStack* generate_piece_moves(const Position& p, MoveStack* m, Color us, Bitboard t) {
+ FORCE_INLINE MoveStack* generate_piece_moves(const Position& p, MoveStack* m, Color us, Bitboard t) {
assert(Piece == PAWN);
- assert(Type == CAPTURE || Type == NON_CAPTURE || Type == EVASION);
+ 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));
}
- // Templates for non-capture checks generation
-
template
- MoveStack* generate_discovered_checks(const Position&, MoveStack*, Square);
+ FORCE_INLINE MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) {
- template
- MoveStack* generate_direct_checks(const Position&, MoveStack*, Color, Bitboard, Square);
+ Bitboard b;
+ Square from;
+ const Square* ptr = pos.piece_list_begin(us, Piece);
+
+ if (*ptr != SQ_NONE)
+ {
+ do {
+ from = *ptr;
+ b = pos.attacks_from(from) & target;
+ SERIALIZE_MOVES(b);
+ } while (*++ptr != SQ_NONE);
+ }
+ return mlist;
+ }
template<>
- inline MoveStack* generate_direct_checks(const Position& p, MoveStack* m, Color us, Bitboard dc, Square ksq) {
+ FORCE_INLINE MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) {
+
+ Bitboard b;
+ Square from = pos.king_square(us);
- return (us == WHITE ? generate_pawn_moves(p, m, dc, ksq)
- : generate_pawn_moves(p, m, dc, ksq));
+ b = pos.attacks_from(from) & target;
+ SERIALIZE_MOVES(b);
+ return mlist;
}
-}
+}
////
//// Functions
////
-/// generate_captures() generates all pseudo-legal captures and queen
+/// generate generates all pseudo-legal captures and queen
/// promotions. Returns a pointer to the end of the move list.
+///
+/// generate generates all pseudo-legal non-captures and
+/// underpromotions. Returns a pointer to the end of the move list.
+///
+/// generate generates all pseudo-legal captures and
+/// non-captures. Returns a pointer to the end of the move list.
-MoveStack* generate_captures(const Position& pos, MoveStack* mlist) {
+template
+MoveStack* generate(const Position& pos, MoveStack* mlist) {
assert(pos.is_ok());
assert(!pos.is_check());
Color us = pos.side_to_move();
- Bitboard target = pos.pieces_of_color(opposite_color(us));
+ Bitboard target;
- mlist = generate_piece_moves(pos, mlist, us, target);
- mlist = generate_piece_moves(pos, mlist, us, target);
- mlist = generate_piece_moves(pos, mlist, us, target);
- mlist = generate_piece_moves(pos, mlist, us, target);
- mlist = generate_piece_moves(pos, mlist, us, target);
- return generate_piece_moves(pos, mlist, us, target);
-}
-
-
-/// generate_noncaptures() generates all pseudo-legal non-captures and
-/// underpromotions. Returns a pointer to the end of the move list.
-
-MoveStack* generate_noncaptures(const Position& pos, MoveStack* mlist) {
-
- assert(pos.is_ok());
- assert(!pos.is_check());
+ if (Type == MV_CAPTURE || Type == MV_NON_EVASION)
+ target = pos.pieces_of_color(opposite_color(us));
+ else if (Type == MV_NON_CAPTURE)
+ target = pos.empty_squares();
+ else
+ assert(false);
- Color us = pos.side_to_move();
- Bitboard target = pos.empty_squares();
+ if (Type == MV_NON_EVASION)
+ {
+ mlist = generate_piece_moves(pos, mlist, us, target);
+ mlist = generate_piece_moves(pos, mlist, us, pos.empty_squares());
+ target |= pos.empty_squares();
+ }
+ else
+ mlist = generate_piece_moves(pos, mlist, us, target);
- mlist = generate_piece_moves(pos, mlist, us, target);
mlist = generate_piece_moves(pos, mlist, us, target);
mlist = generate_piece_moves(pos, mlist, us, target);
mlist = generate_piece_moves(pos, mlist, us, target);
mlist = generate_piece_moves(pos, mlist, us, target);
mlist = generate_piece_moves(pos, mlist, us, target);
- mlist = generate_castle_moves(pos, mlist);
- return generate_castle_moves(pos, mlist);
+
+ if (Type != MV_CAPTURE)
+ {
+ if (pos.can_castle_kingside(us))
+ mlist = generate_castle_moves(pos, mlist, us);
+
+ if (pos.can_castle_queenside(us))
+ mlist = generate_castle_moves(pos, mlist, us);
+ }
+
+ return mlist;
}
+// Explicit template instantiation
+template MoveStack* generate(const Position& pos, MoveStack* mlist);
+template MoveStack* generate(const Position& pos, MoveStack* mlist);
+template MoveStack* generate(const Position& pos, MoveStack* mlist);
+
/// generate_non_capture_checks() generates all pseudo-legal non-captures and knight
/// underpromotions that give check. Returns a pointer to the end of the move list.
-
-MoveStack* generate_non_capture_checks(const Position& pos, MoveStack* mlist) {
+template<>
+MoveStack* generate(const Position& pos, MoveStack* mlist) {
assert(pos.is_ok());
assert(!pos.is_check());
@@ -153,7 +213,7 @@ MoveStack* generate_non_capture_checks(const Position& pos, MoveStack* mlist) {
Color us = pos.side_to_move();
Square ksq = pos.king_square(opposite_color(us));
- assert(pos.piece_on(ksq) == piece_of_color_and_type(opposite_color(us), KING));
+ assert(pos.piece_on(ksq) == make_piece(opposite_color(us), KING));
// Discovered non-capture checks
b = dc = pos.discovered_check_candidates(us);
@@ -183,8 +243,8 @@ MoveStack* generate_non_capture_checks(const Position& pos, MoveStack* mlist) {
/// generate_evasions() generates all pseudo-legal check evasions when
/// the side to move is in check. Returns a pointer to the end of the move list.
-
-MoveStack* generate_evasions(const Position& pos, MoveStack* mlist) {
+template<>
+MoveStack* generate(const Position& pos, MoveStack* mlist) {
assert(pos.is_ok());
assert(pos.is_check());
@@ -197,7 +257,7 @@ MoveStack* generate_evasions(const Position& pos, MoveStack* mlist) {
Bitboard checkers = pos.checkers();
Bitboard sliderAttacks = EmptyBoardBB;
- assert(pos.piece_on(ksq) == piece_of_color_and_type(us, KING));
+ assert(pos.piece_on(ksq) == make_piece(us, KING));
assert(checkers);
// Find squares attacked by slider checkers, we will remove
@@ -218,7 +278,7 @@ MoveStack* generate_evasions(const Position& pos, MoveStack* mlist) {
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 (direction_is_straight(checksq, ksq))
+ if (RookPseudoAttacks[checksq] & (1ULL << ksq))
sliderAttacks |= RookPseudoAttacks[checksq] | pos.attacks_from(checksq);
else
sliderAttacks |= BishopPseudoAttacks[checksq] | pos.attacks_from(checksq);
@@ -240,7 +300,7 @@ MoveStack* generate_evasions(const Position& pos, MoveStack* mlist) {
// checker piece is possible.
target = squares_between(checksq, ksq) | checkers;
- mlist = generate_piece_moves(pos, mlist, us, target);
+ mlist = generate_piece_moves(pos, mlist, us, target);
mlist = generate_piece_moves(pos, mlist, us, target);
mlist = generate_piece_moves(pos, mlist, us, target);
mlist = generate_piece_moves(pos, mlist, us, target);
@@ -248,25 +308,26 @@ MoveStack* generate_evasions(const Position& pos, MoveStack* mlist) {
}
-/// generate_moves() computes a complete list of legal or pseudo-legal moves in
-/// the current position. This function is not very fast, and should be used
-/// only in non time-critical paths.
+/// 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);
+}
-MoveStack* generate_moves(const Position& pos, MoveStack* mlist, bool pseudoLegal) {
+template<>
+MoveStack* generate(const Position& pos, MoveStack* mlist) {
assert(pos.is_ok());
MoveStack *last, *cur = mlist;
Bitboard pinned = pos.pinned_pieces(pos.side_to_move());
- // Generate pseudo-legal moves
- if (pos.is_check())
- last = generate_evasions(pos, mlist);
- else
- last = generate_noncaptures(pos, generate_captures(pos, mlist));
-
- if (pseudoLegal)
- return last;
+ last = generate(pos, mlist);
// Remove illegal moves from the list
while (cur != last)
@@ -285,8 +346,8 @@ MoveStack* generate_moves(const Position& pos, MoveStack* mlist, bool pseudoLega
bool move_is_legal(const Position& pos, const Move m) {
- MoveStack mlist[256];
- MoveStack *cur, *last = generate_moves(pos, mlist, true);
+ MoveStack mlist[MOVES_MAX];
+ MoveStack *cur, *last = generate(pos, mlist);
for (cur = mlist; cur != last; cur++)
if (cur->move == m)
@@ -302,7 +363,6 @@ bool move_is_legal(const Position& pos, const Move m) {
bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) {
assert(pos.is_ok());
- assert(move_is_ok(m));
assert(pinned == pos.pinned_pieces(pos.side_to_move()));
Color us = pos.side_to_move();
@@ -312,7 +372,7 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) {
Piece pc = pos.piece_on(from);
// Use a slower but simpler function for uncommon cases
- if (move_is_ep(m) || move_is_castle(m))
+ 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
@@ -332,10 +392,9 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) {
if ((us == WHITE) != (direction > 0))
return false;
- // A pawn move is a promotion iff the destination square is
- // on the 8/1th rank.
- if (( (square_rank(to) == RANK_8 && us == WHITE)
- ||(square_rank(to) == RANK_1 && us != WHITE)) != bool(move_is_promotion(m)))
+ // 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
@@ -382,191 +441,146 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) {
default:
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);
}
+ else if (!bit_is_set(pos.attacks_from(pc, from), to))
+ return false;
- // Luckly we can handle all the other pieces in one go
- return bit_is_set(pos.attacks_from(pc, from), to)
- && (pos.is_check() ? pos.pl_move_is_evasion(m, pinned) : pos.pl_move_is_legal(m, pinned))
- && !move_is_promotion(m);
+ // 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
- 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);
+ template
+ inline Bitboard move_pawns(Bitboard p) {
- while ((from = *ptr++) != SQ_NONE)
- {
- b = pos.attacks_from(from) & target;
- SERIALIZE_MOVES(b);
- }
- return mlist;
+ return Delta == DELTA_N ? p << 8 : Delta == DELTA_S ? p >> 8 :
+ Delta == DELTA_NE ? p << 9 : Delta == DELTA_SE ? p >> 7 :
+ Delta == DELTA_NW ? p << 7 : Delta == DELTA_SW ? p >> 9 : p;
}
- template<>
- MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) {
+ template
+ inline MoveStack* generate_pawn_captures(MoveStack* mlist, Bitboard pawns, Bitboard target) {
+
+ const Bitboard TFileABB = (Delta == DELTA_NE || Delta == DELTA_SE ? FileABB : FileHBB);
Bitboard b;
- Square from = pos.king_square(us);
+ Square to;
- b = pos.attacks_from(from) & target;
- SERIALIZE_MOVES(b);
+ // Captures in the a1-h8 (a8-h1 for black) diagonal or in the h1-a8 (h8-a1 for black)
+ b = move_pawns(pawns) & target & ~TFileABB;
+ SERIALIZE_MOVES_D(b, -Delta);
return mlist;
}
- template
- inline Bitboard move_pawns(Bitboard p) {
+ template
+ inline MoveStack* generate_promotions(const Position& pos, MoveStack* mlist, Bitboard pawnsOn7, Bitboard target) {
- if (Direction == DELTA_N)
- return Us == WHITE ? p << 8 : p >> 8;
- else if (Direction == DELTA_NE)
- return Us == WHITE ? p << 9 : p >> 7;
- else if (Direction == DELTA_NW)
- return Us == WHITE ? p << 7 : p >> 9;
- else
- return p;
- }
-
- template
- inline MoveStack* generate_pawn_captures(MoveStack* mlist, Bitboard pawns, Bitboard enemyPieces) {
-
- // Calculate our parametrized parameters at compile time
- const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB);
- const Bitboard TFileABB = (Diagonal == DELTA_NE ? FileABB : FileHBB);
- const SquareDelta TDELTA_NE = (Us == WHITE ? DELTA_NE : DELTA_SE);
- const SquareDelta TDELTA_NW = (Us == WHITE ? DELTA_NW : DELTA_SW);
- const SquareDelta TTDELTA_NE = (Diagonal == DELTA_NE ? TDELTA_NE : TDELTA_NW);
+ const Bitboard TFileABB = (Delta == DELTA_NE || Delta == DELTA_SE ? FileABB : FileHBB);
- Bitboard b1, b2;
+ Bitboard b;
Square to;
- // Captures in the a1-h8 (a8-h1 for black) diagonal or in the h1-a8 (h8-a1 for black)
- b1 = move_pawns(pawns) & ~TFileABB & enemyPieces;
+ // Promotions and under-promotions, both captures and non-captures
+ b = move_pawns(pawnsOn7) & target;
- // Capturing promotions and under-promotions
- if (b1 & TRank8BB)
- {
- b2 = b1 & TRank8BB;
- b1 &= ~TRank8BB;
- while (b2)
- {
- to = pop_1st_bit(&b2);
+ if (Delta != DELTA_N && Delta != DELTA_S)
+ b &= ~TFileABB;
- if (Type == CAPTURE || Type == EVASION)
- (*mlist++).move = make_promotion_move(to - TTDELTA_NE, to, QUEEN);
+ while (b)
+ {
+ to = pop_1st_bit(&b);
- if (Type == NON_CAPTURE || Type == EVASION)
- {
- (*mlist++).move = make_promotion_move(to - TTDELTA_NE, to, ROOK);
- (*mlist++).move = make_promotion_move(to - TTDELTA_NE, to, BISHOP);
- (*mlist++).move = make_promotion_move(to - TTDELTA_NE, to, KNIGHT);
- }
+ if (Type == MV_CAPTURE || Type == MV_EVASION)
+ (*mlist++).move = make_promotion_move(to - Delta, to, QUEEN);
- // This is the only possible under promotion that can give a check
- // not already included in the queen-promotion. It is not sure that
- // the promoted knight will give check, but it doesn't worth to verify.
- if (Type == CHECK)
- (*mlist++).move = make_promotion_move(to - TTDELTA_NE, to, KNIGHT);
+ if (Type == MV_NON_CAPTURE || Type == MV_EVASION)
+ {
+ (*mlist++).move = make_promotion_move(to - Delta, to, ROOK);
+ (*mlist++).move = make_promotion_move(to - Delta, to, BISHOP);
+ (*mlist++).move = make_promotion_move(to - Delta, to, KNIGHT);
}
- }
-
- // Serialize standard captures
- if (Type == CAPTURE || Type == EVASION)
- SERIALIZE_MOVES_D(b1, -TTDELTA_NE);
+ // This is the only possible under promotion that can give a check
+ // not already included in the queen-promotion.
+ if ( Type == MV_CHECK
+ && bit_is_set(pos.attacks_from(to), pos.king_square(opposite_color(Us))))
+ (*mlist++).move = make_promotion_move(to - Delta, to, KNIGHT);
+ else (void)pos; // Silence a warning under MSVC
+ }
return mlist;
}
template
MoveStack* generate_pawn_moves(const Position& pos, MoveStack* mlist, Bitboard target, Square ksq) {
- // Calculate our parametrized parameters at compile time
- const Color Them = (Us == WHITE ? BLACK : WHITE);
- const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB);
- const Bitboard TRank7BB = (Us == WHITE ? Rank7BB : Rank2BB);
- const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB);
- const SquareDelta TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S);
+ // 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 TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S);
+ const Square TDELTA_NE = (Us == WHITE ? DELTA_NE : DELTA_SE);
+ const Square TDELTA_NW = (Us == WHITE ? DELTA_NW : DELTA_SW);
Square to;
- Bitboard b1, b2, enemyPieces, emptySquares;
+ 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));
- // Standard captures and capturing promotions and underpromotions
- if (Type == CAPTURE || Type == EVASION || (pawns & TRank7BB))
+ // Pre-calculate pawn pushes before changing emptySquares definition
+ if (Type != MV_CAPTURE)
{
- enemyPieces = (Type == CAPTURE ? target : pos.pieces_of_color(opposite_color(Us)));
-
- if (Type == EVASION)
- enemyPieces &= target; // Capture only the checker piece
-
- mlist = generate_pawn_captures(mlist, pawns, enemyPieces);
- mlist = generate_pawn_captures(mlist, pawns, enemyPieces);
+ emptySquares = (Type == MV_NON_CAPTURE ? target : pos.empty_squares());
+ pawnPushes = move_pawns(pawns & ~TRank7BB) & emptySquares;
}
- // Non-capturing promotions and underpromotions
- if (pawns & TRank7BB)
+ if (Type == MV_EVASION)
{
- b1 = move_pawns(pawns) & TRank8BB & pos.empty_squares();
-
- if (Type == EVASION)
- b1 &= target; // Only blocking promotion pushes
-
- while (b1)
- {
- to = pop_1st_bit(&b1);
-
- if (Type == CAPTURE || Type == EVASION)
- (*mlist++).move = make_promotion_move(to - TDELTA_N, to, QUEEN);
+ emptySquares &= target; // Only blocking squares
+ enemyPieces &= target; // Capture only the checker piece
+ }
- if (Type == NON_CAPTURE || Type == EVASION)
- {
- (*mlist++).move = make_promotion_move(to - TDELTA_N, to, ROOK);
- (*mlist++).move = make_promotion_move(to - TDELTA_N, to, BISHOP);
- (*mlist++).move = make_promotion_move(to - TDELTA_N, to, KNIGHT);
- }
+ // Promotions and underpromotions
+ if (pawnsOn7)
+ {
+ if (Type == MV_CAPTURE)
+ emptySquares = pos.empty_squares();
- // This is the only possible under promotion that can give a check
- // not already included in the queen-promotion.
- if (Type == CHECK && bit_is_set(pos.attacks_from(to), pos.king_square(Them)))
- (*mlist++).move = make_promotion_move(to - TDELTA_N, to, KNIGHT);
- }
+ pawns &= ~TRank7BB;
+ mlist = generate_promotions(pos, mlist, pawnsOn7, enemyPieces);
+ mlist = generate_promotions(pos, mlist, pawnsOn7, enemyPieces);
+ mlist = generate_promotions(pos, mlist, pawnsOn7, emptySquares);
}
- // Standard pawn pushes and double pushes
- if (Type != CAPTURE)
+ // Standard captures
+ if (Type == MV_CAPTURE || Type == MV_EVASION)
{
- emptySquares = (Type == NON_CAPTURE ? target : pos.empty_squares());
+ mlist = generate_pawn_captures(mlist, pawns, enemyPieces);
+ mlist = generate_pawn_captures(mlist, pawns, enemyPieces);
+ }
- // Single and double pawn pushes
- b1 = move_pawns(pawns) & emptySquares & ~TRank8BB;
- b2 = move_pawns(b1 & TRank3BB) & emptySquares;
+ // Single and double pawn pushes
+ if (Type != MV_CAPTURE)
+ {
+ b1 = pawnPushes & emptySquares;
+ b2 = move_pawns(pawnPushes & TRank3BB) & emptySquares;
- // Filter out unwanted pushes according to the move type
- if (Type == EVASION)
- {
- b1 &= target;
- b2 &= target;
- }
- else if (Type == CHECK)
+ if (Type == MV_CHECK)
{
- // Pawn moves which give direct cheks
+ // Consider only pawn moves which give direct checks
b1 &= pos.attacks_from(ksq, Them);
b2 &= pos.attacks_from(ksq, Them);
- // Pawn moves which gives 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.
+ // Add pawn moves which gives 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
{
- Bitboard dc1 = move_pawns(pawns & target & ~file_bb(ksq)) & emptySquares & ~TRank8BB;
- Bitboard dc2 = move_pawns(dc1 & TRank3BB) & emptySquares;
+ dc1 = move_pawns(pawns & target & ~file_bb(ksq)) & emptySquares;
+ dc2 = move_pawns(dc1 & TRank3BB) & emptySquares;
b1 |= dc1;
b2 |= dc2;
@@ -577,7 +591,7 @@ namespace {
}
// En passant captures
- if ((Type == CAPTURE || Type == EVASION) && pos.ep_square() != SQ_NONE)
+ if ((Type == MV_CAPTURE || Type == MV_EVASION) && pos.ep_square() != SQ_NONE)
{
assert(Us != WHITE || square_rank(pos.ep_square()) == RANK_6);
assert(Us != BLACK || square_rank(pos.ep_square()) == RANK_3);
@@ -585,7 +599,7 @@ namespace {
// 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 == EVASION && !bit_is_set(target, pos.ep_square() - TDELTA_N))
+ if (Type == MV_EVASION && !bit_is_set(target, pos.ep_square() - TDELTA_N))
return mlist;
b1 = pawns & pos.attacks_from(pos.ep_square(), Them);
@@ -601,93 +615,42 @@ namespace {
return mlist;
}
- template
- MoveStack* generate_discovered_checks(const Position& pos, MoveStack* mlist, Square from) {
-
- assert(Piece != QUEEN);
-
- Bitboard b = pos.attacks_from(from) & pos.empty_squares();
- if (Piece == KING)
- {
- Square ksq = pos.king_square(opposite_color(pos.side_to_move()));
- b &= ~QueenPseudoAttacks[ksq];
- }
- SERIALIZE_MOVES(b);
- return mlist;
- }
-
- template
- MoveStack* generate_direct_checks(const Position& pos, MoveStack* mlist, Color us,
- Bitboard dc, Square ksq) {
- assert(Piece != KING);
-
- Bitboard checkSqs, b;
- Square from;
- const Square* ptr = pos.piece_list_begin(us, Piece);
-
- if ((from = *ptr++) == SQ_NONE)
- return mlist;
-
- 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)))
- continue;
-
- if (dc && bit_is_set(dc, from))
- continue;
-
- b = pos.attacks_from(from) & checkSqs;
- SERIALIZE_MOVES(b);
-
- } while ((from = *ptr++) != SQ_NONE);
-
- return mlist;
- }
-
template
- MoveStack* generate_castle_moves(const Position& pos, MoveStack* mlist) {
+ MoveStack* generate_castle_moves(const Position& pos, MoveStack* mlist, Color us) {
- Color us = pos.side_to_move();
+ Color them = opposite_color(us);
+ Square ksq = pos.king_square(us);
- if ( (Side == KING_SIDE && pos.can_castle_kingside(us))
- ||(Side == QUEEN_SIDE && pos.can_castle_queenside(us)))
- {
- Color them = opposite_color(us);
- Square ksq = pos.king_square(us);
+ assert(pos.piece_on(ksq) == make_piece(us, KING));
- assert(pos.piece_on(ksq) == piece_of_color_and_type(us, KING));
+ Square rsq = (Side == KING_SIDE ? pos.initial_kr_square(us) : pos.initial_qr_square(us));
+ 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;
+ bool illegal = false;
- Square rsq = (Side == KING_SIDE ? pos.initial_kr_square(us) : pos.initial_qr_square(us));
- 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;
- bool illegal = false;
+ assert(pos.piece_on(rsq) == make_piece(us, ROOK));
- assert(pos.piece_on(rsq) == piece_of_color_and_type(us, ROOK));
+ // 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)))
+ illegal = true;
- // 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)))
- illegal = true;
+ for (s = Min(rsq, s2); s <= Max(rsq, s2); s++)
+ if (s != ksq && s != rsq && pos.square_is_occupied(s))
+ illegal = true;
- for (s = Min(rsq, s2); s <= Max(rsq, s2); s++)
- if (s != ksq && s != rsq && pos.square_is_occupied(s))
- illegal = true;
+ if ( Side == QUEEN_SIDE
+ && square_file(rsq) == FILE_B
+ && ( pos.piece_on(relative_square(us, SQ_A1)) == make_piece(them, ROOK)
+ || pos.piece_on(relative_square(us, SQ_A1)) == make_piece(them, QUEEN)))
+ illegal = true;
- if ( Side == QUEEN_SIDE
- && square_file(rsq) == FILE_B
- && ( pos.piece_on(relative_square(us, SQ_A1)) == piece_of_color_and_type(them, ROOK)
- || pos.piece_on(relative_square(us, SQ_A1)) == piece_of_color_and_type(them, QUEEN)))
- illegal = true;
+ if (!illegal)
+ (*mlist++).move = make_castle_move(ksq, rsq);
- if (!illegal)
- (*mlist++).move = make_castle_move(ksq, rsq);
- }
return mlist;
}
-}
+
+} // namespace