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

Small tweak to generate_castle_moves()

Browse source 
Move the castling condition test out of the
function. This avoids a function call most of
the times.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2011-01-07 15:17:28 +01:00
parent 57b3ca916f
commit 44fbbeafc9
1 changed files with 35 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
src/movegen.cpp
View file

@ -46,7 +46,7 @@ namespace {
}; };
template<CastlingSide Side> template<CastlingSide Side>
MoveStack* generate_castle_moves(const Position&, MoveStack*); MoveStack* generate_castle_moves(const Position&, MoveStack*, Color us);
template<Color Us, MoveType Type> template<Color Us, MoveType Type>
MoveStack* generate_pawn_moves(const Position&, MoveStack*, Bitboard, Square); MoveStack* generate_pawn_moves(const Position&, MoveStack*, Bitboard, Square);
@ -193,8 +193,11 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) {
if (T != MV_CAPTURE) if (T != MV_CAPTURE)
{ {
mlist = generate_castle_moves<KING_SIDE>(pos, mlist); if (pos.can_castle_kingside(us))
mlist = generate_castle_moves<QUEEN_SIDE>(pos, mlist); mlist = generate_castle_moves<KING_SIDE>(pos, mlist, us);
if (pos.can_castle_queenside(us))
mlist = generate_castle_moves<QUEEN_SIDE>(pos, mlist, us);
} }
return mlist; return mlist;
@ -622,45 +625,41 @@ namespace {
} }
template<CastlingSide Side> template<CastlingSide Side>
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)) assert(pos.piece_on(ksq) == piece_of_color_and_type(us, KING));
||(Side == QUEEN_SIDE && pos.can_castle_queenside(us)))
{
Color them = opposite_color(us);
Square ksq = pos.king_square(us);
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)); assert(pos.piece_on(rsq) == piece_of_color_and_type(us, ROOK));
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) == 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++)
// It is a bit complicated to correctly handle Chess960 if ( (s != ksq && s != rsq && pos.square_is_occupied(s))
for (s = Min(ksq, s1); s <= Max(ksq, s1); s++) ||(pos.attackers_to(s) & pos.pieces_of_color(them)))
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;
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; illegal = true;
if (!illegal) for (s = Min(rsq, s2); s <= Max(rsq, s2); s++)
(*mlist++).move = make_castle_move(ksq, rsq); 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)) == 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);
return mlist; return mlist;
} }
}
} // namespace