kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-05-02 01:29:36 +00:00
Code Issues Releases Wiki Activity

Final touches to generate_evasions()

Browse source 
Small code tidy up and a little optimization
to avoid calling generate_piece_blocking_evasions()
when blockSquares is empty (30% of cases).

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2009-02-11 17:21:03 +01:00
parent ff60dafe8d
commit 33c608e140
1 changed files with 40 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/movegen.cpp
View file

@ -201,8 +201,7 @@ int generate_checks(const Position& pos, MoveStack* mlist, Bitboard dc) {
/// generate_evasions() generates all check evasions when the side to move is /// generate_evasions() generates all check evasions when the side to move is
/// in check. Unlike the other move generation functions, this one generates /// in check. Unlike the other move generation functions, this one generates
/// only legal moves. It returns the number of generated moves. This /// only legal moves. It returns the number of generated moves.
/// function is very ugly, and needs cleaning up some time later. FIXME
int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) { int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) {
@ -218,8 +217,8 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) {
assert(pos.piece_on(ksq) == king_of_color(us)); assert(pos.piece_on(ksq) == king_of_color(us));
// The bitboard of occupied pieces without our king // The bitboard of occupied pieces without our king
Bitboard b2 = pos.occupied_squares(); Bitboard b_noKing = pos.occupied_squares();
clear_bit(&b2, ksq); clear_bit(&b_noKing, ksq);
// Find squares attacked by slider checkers, we will // Find squares attacked by slider checkers, we will
// remove them from king evasions set so to avoid a couple // remove them from king evasions set so to avoid a couple
@ -231,14 +230,14 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) {
while (b) while (b)
{ {
from = pop_1st_bit(&b); from = pop_1st_bit(&b);
checkersAttacks |= bishop_attacks_bb(from, b2); checkersAttacks |= bishop_attacks_bb(from, b_noKing);
} }
b = checkers & (pos.queens() | pos.rooks()); b = checkers & (pos.queens() | pos.rooks());
while (b) while (b)
{ {
from = pop_1st_bit(&b); from = pop_1st_bit(&b);
checkersAttacks |= rook_attacks_bb(from, b2); checkersAttacks |= rook_attacks_bb(from, b_noKing);
} }
// Generate evasions for king // Generate evasions for king
@ -247,7 +246,7 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) {
{ {
to = pop_1st_bit(&b1); to = pop_1st_bit(&b1);
// Note that we can use square_is_attacked() only because we // Note that we can use square_is_attacked() only because we
// have already removed sliders checkers. // have already removed slider checkers.
if (!pos.square_is_attacked(to, them)) if (!pos.square_is_attacked(to, them))
(*mlist++).move = make_move(ksq, to); (*mlist++).move = make_move(ksq, to);
} }
@ -297,6 +296,8 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) {
assert((pos.occupied_squares() & blockSquares) == EmptyBoardBB); assert((pos.occupied_squares() & blockSquares) == EmptyBoardBB);
if (blockSquares != EmptyBoardBB)
{
// Pieces moves // Pieces moves
mlist = generate_piece_blocking_evasions<PAWN>(pos, mlist, us, pinned, blockSquares); mlist = generate_piece_blocking_evasions<PAWN>(pos, mlist, us, pinned, blockSquares);
mlist = generate_piece_blocking_evasions<KNIGHT>(pos, mlist, us, pinned, blockSquares); mlist = generate_piece_blocking_evasions<KNIGHT>(pos, mlist, us, pinned, blockSquares);
@ -304,8 +305,9 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) {
mlist = generate_piece_blocking_evasions<ROOK>(pos, mlist, us, pinned, blockSquares); mlist = generate_piece_blocking_evasions<ROOK>(pos, mlist, us, pinned, blockSquares);
mlist = generate_piece_blocking_evasions<QUEEN>(pos, mlist, us, pinned, blockSquares); mlist = generate_piece_blocking_evasions<QUEEN>(pos, mlist, us, pinned, blockSquares);
} }
}
// Finally, the ugly special case of en passant captures. An en passant // Finally, the special case of en passant captures. An en passant
// capture can only be a check evasion if the check is not a discovered // capture can only be a check evasion if the check is not a discovered
// check. If pos.ep_square() is set, the last move made must have been // check. If pos.ep_square() is set, the last move made must have been
// a double pawn push. If, furthermore, the checking piece is a pawn, // a double pawn push. If, furthermore, the checking piece is a pawn,