/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
- Copyright (C) 2004-2008 Tord Romstad (Glaurung author) Copyright (C) 2008 Marco Costalba
+ Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
+ Copyright (C) 2008-2009 Marco Costalba
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
template<Color Us, Rank, Bitboard, SquareDelta>
MoveStack* generate_pawn_blocking_evasions(const Position&, Bitboard, Bitboard, MoveStack*);
- template<Color, Color, Bitboard, SquareDelta, SquareDelta, SquareDelta>
+ template<Color Us>
MoveStack* generate_pawn_captures(const Position& pos, MoveStack* mlist);
- template<Color, Color, Bitboard, Bitboard, SquareDelta, SquareDelta, SquareDelta>
+ template<Color Us, SquareDelta Diagonal>
+ MoveStack* generate_pawn_captures_diagonal(MoveStack* mlist, Bitboard pawns, Bitboard enemyPieces);
+
+ template<Color Us>
MoveStack* generate_pawn_noncaptures(const Position& pos, MoveStack* mlist);
- template<Color, Color, Bitboard, Bitboard, SquareDelta>
+ template<Color Us>
MoveStack* generate_pawn_checks(const Position&, Bitboard, Square, MoveStack*);
template<Color Us, SquareDelta Direction>
return Us == WHITE ? p << 9 : p >> 7;
else if (Direction == DELTA_NW)
return Us == WHITE ? p << 7 : p >> 9;
-
- assert(false);
- return p;
+ else
+ return p;
}
// Template generate_piece_checks() with specializations
template<>
inline MoveStack* generate_piece_checks<PAWN>(const Position& p, MoveStack* m, Color us, Bitboard dc, Square ksq) {
- if (us == WHITE)
- return generate_pawn_checks<WHITE, BLACK, Rank8BB, Rank3BB, DELTA_N>(p, dc, ksq, m);
- else
- return generate_pawn_checks<BLACK, WHITE, Rank1BB, Rank6BB, DELTA_S>(p, dc, ksq, m);
-
+ return (us == WHITE ? generate_pawn_checks<WHITE>(p, dc, ksq, m)
+ : generate_pawn_checks<BLACK>(p, dc, ksq, m));
}
// Template generate_piece_moves() with specializations and overloads
assert(Piece == PAWN);
if (Type == CAPTURE)
- return (us == WHITE ? generate_pawn_captures<WHITE, BLACK, Rank8BB, DELTA_NE, DELTA_NW, DELTA_N>(p, m)
- : generate_pawn_captures<BLACK, WHITE, Rank1BB, DELTA_SE, DELTA_SW, DELTA_S>(p, m));
+ return (us == WHITE ? generate_pawn_captures<WHITE>(p, m)
+ : generate_pawn_captures<BLACK>(p, m));
else
- return (us == WHITE ? generate_pawn_noncaptures<WHITE, BLACK, Rank8BB, Rank3BB, DELTA_NE, DELTA_NW, DELTA_N>(p, m)
- : generate_pawn_noncaptures<BLACK, WHITE, Rank1BB, Rank6BB, DELTA_SE, DELTA_SW, DELTA_S>(p, m));
+ return (us == WHITE ? generate_pawn_noncaptures<WHITE>(p, m)
+ : generate_pawn_noncaptures<BLACK>(p, m));
}
template<PieceType>
}
-/// generate_checks() generates all pseudo-legal non-capturing, non-promoting
-/// checks. It returns the number of generated moves.
+/// generate_non_capture_checks() generates all pseudo-legal non-capturing,
+/// non-promoting checks. It returns the number of generated moves.
-int generate_checks(const Position& pos, MoveStack* mlist, Bitboard dc) {
+int generate_non_capture_checks(const Position& pos, MoveStack* mlist, Bitboard dc) {
assert(pos.is_ok());
assert(!pos.is_check());
// Proceed according to the type of the moving piece.
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;
+
// If the destination square is on the 8/1th rank, the move must
// be a promotion.
if ( ( (square_rank(to) == RANK_8 && us == WHITE)
// Proceed according to the square delta between the source and
// destionation squares.
- switch (to - from)
+ switch (direction)
{
case DELTA_NW:
case DELTA_NE:
return mlist;
}
- template<Color Us, Color Them, Bitboard TRank8BB, SquareDelta TDELTA_NE,
- SquareDelta TDELTA_NW, SquareDelta TDELTA_N
- >
- MoveStack* generate_pawn_captures(const Position& pos, MoveStack* mlist) {
+ template<Color Us, SquareDelta Diagonal>
+ MoveStack* generate_pawn_captures_diagonal(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);
Square to;
- Bitboard pawns = pos.pawns(Us);
- Bitboard enemyPieces = pos.pieces_of_color(Them);
- // Captures in the a1-h8 (a8-h1 for black) direction
- Bitboard b1 = move_pawns<Us, DELTA_NE>(pawns) & ~FileABB & enemyPieces;
+ // Captures in the a1-h8 (a8-h1 for black) diagonal or in the h1-a8 (h8-a1 for black)
+ Bitboard b1 = move_pawns<Us, Diagonal>(pawns) & ~TFileABB & enemyPieces;
// Capturing promotions
Bitboard b2 = b1 & TRank8BB;
while (b2)
{
to = pop_1st_bit(&b2);
- (*mlist++).move = make_promotion_move(to - TDELTA_NE, to, QUEEN);
+ (*mlist++).move = make_promotion_move(to - TTDELTA_NE, to, QUEEN);
}
// Capturing non-promotions
while (b2)
{
to = pop_1st_bit(&b2);
- (*mlist++).move = make_move(to - TDELTA_NE, to);
+ (*mlist++).move = make_move(to - TTDELTA_NE, to);
}
+ return mlist;
+ }
- // Captures in the h1-a8 (h8-a1 for black) direction
- b1 = move_pawns<Us, DELTA_NW>(pawns) & ~FileHBB & enemyPieces;
+ template<Color Us>
+ MoveStack* generate_pawn_captures(const Position& pos, MoveStack* mlist) {
- // Capturing promotions
- b2 = b1 & TRank8BB;
- while (b2)
- {
- to = pop_1st_bit(&b2);
- (*mlist++).move = make_promotion_move(to - TDELTA_NW, to, QUEEN);
- }
+ // Calculate our parametrized parameters at compile time
+ const Color Them = (Us == WHITE ? BLACK : WHITE);
+ const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB);
+ const SquareDelta TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S);
- // Capturing non-promotions
- b2 = b1 & ~TRank8BB;
- while (b2)
- {
- to = pop_1st_bit(&b2);
- (*mlist++).move = make_move(to - TDELTA_NW, to);
- }
+ Square to;
+ Bitboard pawns = pos.pawns(Us);
+ Bitboard enemyPieces = pos.pieces_of_color(opposite_color(Us));
+
+ // Standard captures and capturing promotions in both directions
+ mlist = generate_pawn_captures_diagonal<Us, DELTA_NE>(mlist, pawns, enemyPieces);
+ mlist = generate_pawn_captures_diagonal<Us, DELTA_NW>(mlist, pawns, enemyPieces);
// Non-capturing promotions
- b1 = move_pawns<Us, DELTA_N>(pawns) & pos.empty_squares() & TRank8BB;
+ Bitboard b1 = move_pawns<Us, DELTA_N>(pawns) & pos.empty_squares() & TRank8BB;
while (b1)
{
to = pop_1st_bit(&b1);
return mlist;
}
- template<Color Us, Color Them, Bitboard TRank8BB, Bitboard TRank3BB,
- SquareDelta TDELTA_NE, SquareDelta TDELTA_NW, SquareDelta TDELTA_N
- >
+ template<Color Us>
MoveStack* generate_pawn_noncaptures(const Position& pos, MoveStack* mlist) {
- Bitboard pawns = pos.pawns(Us);
- Bitboard enemyPieces = pos.pieces_of_color(Them);
- Bitboard emptySquares = pos.empty_squares();
+ // Calculate our parametrized parameters at compile time
+ const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB);
+ const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB);
+ const SquareDelta TDELTA_NE = (Us == WHITE ? DELTA_NE : DELTA_SE);
+ const SquareDelta TDELTA_NW = (Us == WHITE ? DELTA_NW : DELTA_SW);
+ const SquareDelta TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S);
+
Bitboard b1, b2;
Square to;
+ Bitboard pawns = pos.pawns(Us);
+ Bitboard enemyPieces = pos.pieces_of_color(opposite_color(Us));
+ Bitboard emptySquares = pos.empty_squares();
// Underpromotion captures in the a1-h8 (a8-h1 for black) direction
b1 = move_pawns<Us, DELTA_NE>(pawns) & ~FileABB & enemyPieces & TRank8BB;
}
- template<Color Us, Color Them, Bitboard TRank8BB, Bitboard TRank3BB, SquareDelta TDELTA_N>
+ template<Color Us>
MoveStack* generate_pawn_checks(const Position& pos, Bitboard dc, Square ksq, MoveStack* mlist)
{
- // Find all friendly pawns not on the enemy king's file
+ // Calculate our parametrized parameters at compile time
+ const Color Them = (Us == WHITE ? BLACK : WHITE);
+ const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB);
+ const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB);
+ const SquareDelta TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S);
+
Bitboard b1, b2, b3;
Bitboard empty = pos.empty_squares();
+ Bitboard pawns = pos.pawns(Us);
- if (dc != EmptyBoardBB)
+ if (dc & pawns)
{
// 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.
- b1 = pos.pawns(Us) & ~file_bb(ksq);
+ b1 = pawns & ~file_bb(ksq);
// Discovered checks, single pawn pushes, no promotions
b2 = b3 = move_pawns<Us, DELTA_N>(b1 & dc) & empty & ~TRank8BB;
// Direct checks. These are possible only for pawns on neighboring files
// of the enemy king.
- b1 = pos.pawns(Us) & neighboring_files_bb(ksq) & ~dc;
+ b1 = pawns & neighboring_files_bb(ksq) & ~dc;
// Direct checks, single pawn pushes
b2 = move_pawns<Us, DELTA_N>(b1) & empty;
return mlist;
Bitboard checkSqs = pos.piece_attacks<Piece>(ksq) & pos.empty_squares();
+ if (!checkSqs)
+ return mlist;
+
while (b)
{
Square from = pop_1st_bit(&b);
+ if ( (Piece == QUEEN && !(QueenPseudoAttacks[from] & checkSqs))
+ || (Piece == ROOK && !(RookPseudoAttacks[from] & checkSqs))
+ || (Piece == BISHOP && !(BishopPseudoAttacks[from] & checkSqs)))
+ continue;
+
Bitboard bb = pos.piece_attacks<Piece>(from) & checkSqs;
SERIALIZE_MOVES(bb);
}
projects / stockfish / blobdiff