: generate_pawn_moves<BLACK, Type>(p, m));
}
- // Template generate_piece_checks with specializations
+ // Templates for non-capture checks generation
+
+ template<PieceType Piece>
+ MoveStack* generate_discovered_checks(const Position& pos, Square from, MoveStack* mlist);
+
template<PieceType>
- MoveStack* generate_piece_checks(const Position&, MoveStack*, Color, Bitboard, Square);
+ MoveStack* generate_direct_checks(const Position&, MoveStack*, Color, Bitboard, Square);
template<>
- inline MoveStack* generate_piece_checks<PAWN>(const Position& p, MoveStack* m, Color us, Bitboard dc, Square ksq) {
+ inline MoveStack* generate_direct_checks<PAWN>(const Position& p, MoveStack* m, Color us, Bitboard dc, Square ksq) {
return (us == WHITE ? generate_pawn_moves<WHITE, CHECK>(p, m, dc, ksq)
: generate_pawn_moves<BLACK, CHECK>(p, m, dc, ksq));
assert(pos.piece_on(ksq) == piece_of_color_and_type(opposite_color(us), KING));
- // Pieces moves
- mlist = generate_piece_checks<PAWN>(pos, mlist, us, dc, ksq);
- mlist = generate_piece_checks<KNIGHT>(pos, mlist, us, dc, ksq);
- mlist = generate_piece_checks<BISHOP>(pos, mlist, us, dc, ksq);
- mlist = generate_piece_checks<ROOK>(pos, mlist, us, dc, ksq);
- mlist = generate_piece_checks<QUEEN>(pos, mlist, us, dc, ksq);
- mlist = generate_piece_checks<KING>(pos, mlist, us, dc, ksq);
+ // Discovered non-capture checks
+ Bitboard b = dc;
+ while (b)
+ {
+ Square from = pop_1st_bit(&b);
+ switch (pos.type_of_piece_on(from))
+ {
+ case PAWN: /* Will be generated togheter with pawns direct checks */ break;
+ case KNIGHT: mlist = generate_discovered_checks<KNIGHT>(pos, from, mlist); break;
+ case BISHOP: mlist = generate_discovered_checks<BISHOP>(pos, from, mlist); break;
+ case ROOK: mlist = generate_discovered_checks<ROOK>(pos, from, mlist); break;
+ case KING: mlist = generate_discovered_checks<KING>(pos, from, mlist); break;
+ default: assert(false); break;
+ }
+ }
+
+ // Direct non-capture checks
+ mlist = generate_direct_checks<PAWN>(pos, mlist, us, dc, ksq);
+ mlist = generate_direct_checks<KNIGHT>(pos, mlist, us, dc, ksq);
+ mlist = generate_direct_checks<BISHOP>(pos, mlist, us, dc, ksq);
+ mlist = generate_direct_checks<ROOK>(pos, mlist, us, dc, ksq);
+ mlist = generate_direct_checks<QUEEN>(pos, mlist, us, dc, ksq);
// Castling moves that give check. Very rare but nice to have!
if ( pos.can_castle_queenside(us)
Square from;
Bitboard b;
+ const Square* ptr = pos.piece_list_begin(us, Piece);
- for (int i = 0, e = pos.piece_count(us, Piece); i < e; i++)
+ while ((from = *ptr++) != SQ_NONE)
{
- from = pos.piece_list(us, Piece, i);
b = pos.attacks_from<Piece>(from) & target;
SERIALIZE_MOVES(b);
}
Color us, Bitboard target, Bitboard pinned) {
Square from;
Bitboard b;
+ const Square* ptr = pos.piece_list_begin(us, Piece);
- for (int i = 0, e = pos.piece_count(us, Piece); i < e; i++)
+ while ((from = *ptr++) != SQ_NONE)
{
- from = pos.piece_list(us, Piece, i);
if (pinned && bit_is_set(pinned, from))
continue;
Bitboard b1, b2, dcPawns1, dcPawns2;
Square to;
Bitboard pawns = (Type == EVASION ? pos.pieces(PAWN, Us) & ~dcp : pos.pieces(PAWN, Us));
- Bitboard emptySquares = pos.empty_squares();
bool possiblePromotion = pawns & TRank7BB;
if (Type == CAPTURE)
// Underpromotion pawn pushes. Also queen promotions for evasions and captures.
b1 = move_pawns<Us, DELTA_N>(pp) & TRank8BB;
- b1 &= (Type == EVASION ? blockSquares : emptySquares);
+ b1 &= (Type == EVASION ? blockSquares : pos.empty_squares());
while (b1)
{
}
}
- if (Type == CAPTURE)
+ if (Type != CAPTURE)
{
- // En passant captures
- if (pos.ep_square() != SQ_NONE)
+ Bitboard emptySquares = pos.empty_squares();
+ dcPawns1 = dcPawns2 = EmptyBoardBB;
+ if (Type == CHECK && (pawns & dcp))
{
- assert(Us != WHITE || square_rank(pos.ep_square()) == RANK_6);
- assert(Us != BLACK || square_rank(pos.ep_square()) == RANK_3);
+ // 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.
+ dcPawns1 = move_pawns<Us, DELTA_N>(pawns & dcp & ~file_bb(ksq)) & emptySquares & ~TRank8BB;
+ dcPawns2 = move_pawns<Us, DELTA_N>(dcPawns1 & TRank3BB) & emptySquares;
+ }
- Bitboard b1 = pawns & pos.attacks_from<PAWN>(pos.ep_square(), Them);
- assert(b1 != EmptyBoardBB);
+ // Single pawn pushes
+ b1 = move_pawns<Us, DELTA_N>(pawns) & emptySquares & ~TRank8BB;
+ b2 = (Type == CHECK ? (b1 & pos.attacks_from<PAWN>(ksq, Them)) | dcPawns1 :
+ (Type == EVASION ? b1 & blockSquares : b1));
+ SERIALIZE_MOVES_D(b2, -TDELTA_N);
+
+ // Double pawn pushes
+ b1 = move_pawns<Us, DELTA_N>(b1 & TRank3BB) & emptySquares;
+ b2 = (Type == CHECK ? (b1 & pos.attacks_from<PAWN>(ksq, Them)) | dcPawns2 :
+ (Type == EVASION ? b1 & blockSquares : b1));
+ SERIALIZE_MOVES_D(b2, -TDELTA_N -TDELTA_N);
+ }
+ else if (pos.ep_square() != SQ_NONE) // En passant captures
+ {
+ assert(Us != WHITE || square_rank(pos.ep_square()) == RANK_6);
+ assert(Us != BLACK || square_rank(pos.ep_square()) == RANK_3);
- while (b1)
- {
- to = pop_1st_bit(&b1);
- (*mlist++).move = make_ep_move(to, pos.ep_square());
- }
+ b1 = pawns & pos.attacks_from<PAWN>(pos.ep_square(), Them);
+ assert(b1 != EmptyBoardBB);
+
+ while (b1)
+ {
+ to = pop_1st_bit(&b1);
+ (*mlist++).move = make_ep_move(to, pos.ep_square());
}
- return mlist;
}
+ return mlist;
+ }
+
+ template<PieceType Piece>
+ MoveStack* generate_discovered_checks(const Position& pos, Square from, MoveStack* mlist) {
- dcPawns1 = dcPawns2 = EmptyBoardBB;
- if (Type == CHECK && (pawns & dcp))
+ assert(Piece != QUEEN);
+
+ Bitboard b = pos.attacks_from<Piece>(from) & pos.empty_squares();
+ if (Piece == KING)
{
- // 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.
- dcPawns1 = move_pawns<Us, DELTA_N>(pawns & dcp & ~file_bb(ksq)) & emptySquares & ~TRank8BB;
- dcPawns2 = move_pawns<Us, DELTA_N>(dcPawns1 & TRank3BB) & emptySquares;
+ Square ksq = pos.king_square(opposite_color(pos.side_to_move()));
+ b &= ~QueenPseudoAttacks[ksq];
}
-
- // Single pawn pushes
- b1 = move_pawns<Us, DELTA_N>(pawns) & emptySquares & ~TRank8BB;
- b2 = (Type == CHECK ? (b1 & pos.attacks_from<PAWN>(ksq, Them)) | dcPawns1 :
- (Type == EVASION ? b1 & blockSquares : b1));
- SERIALIZE_MOVES_D(b2, -TDELTA_N);
-
- // Double pawn pushes
- b1 = move_pawns<Us, DELTA_N>(b1 & TRank3BB) & emptySquares;
- b2 = (Type == CHECK ? (b1 & pos.attacks_from<PAWN>(ksq, Them)) | dcPawns2 :
- (Type == EVASION ? b1 & blockSquares : b1));
- SERIALIZE_MOVES_D(b2, -TDELTA_N -TDELTA_N);
+ SERIALIZE_MOVES(b);
return mlist;
}
template<PieceType Piece>
- MoveStack* generate_piece_checks(const Position& pos, MoveStack* mlist, Color us,
+ MoveStack* generate_direct_checks(const Position& pos, MoveStack* mlist, Color us,
Bitboard dc, Square ksq) {
+ assert(Piece != KING);
- Bitboard target = pos.pieces(Piece, us);
-
- // Discovered non-capture checks
- Bitboard b = target & dc;
-
- assert(Piece != QUEEN || !b);
-
- while (b)
- {
- Square from = pop_1st_bit(&b);
- Bitboard bb = pos.attacks_from<Piece>(from) & pos.empty_squares();
- if (Piece == KING)
- bb &= ~QueenPseudoAttacks[ksq];
-
- SERIALIZE_MOVES(bb);
- }
+ Square from;
+ Bitboard checkSqs;
+ const Square* ptr = pos.piece_list_begin(us, Piece);
- // Direct non-capture checks
- b = target & ~dc;
- Bitboard checkSqs = pos.attacks_from<Piece>(ksq) & pos.empty_squares();
- if (Piece == KING || !checkSqs)
+ if ((from = *ptr++) == SQ_NONE)
return mlist;
- while (b)
+ checkSqs = pos.attacks_from<Piece>(ksq) & pos.empty_squares();
+
+ do
{
- Square from = pop_1st_bit(&b);
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;
+
Bitboard bb = pos.attacks_from<Piece>(from) & checkSqs;
SERIALIZE_MOVES(bb);
- }
+
+ } while ((from = *ptr++) != SQ_NONE);
+
return mlist;
}