// Simple macro to wrap a very common while loop, no facny, no flexibility,
// hardcoded list name 'mlist' and from square 'from'.
-#define SERIALIZE_MOVES(b) while (b) (*mlist++).move = make_move(from, pop_1st_bit<false>(&b))
+#define SERIALIZE_MOVES(b) while (b) (*mlist++).move = make_move(from, pop_1st_bit(&b))
////
//// Local definitions
/// generate_captures generates() all pseudo-legal captures and queen
-/// promotions. The return value is the number of moves generated.
+/// promotions. The return value is the number of moves generated.
int generate_captures(const Position& pos, MoveStack* mlist) {
// The checking pawn cannot be a discovered (bishop) check candidate
// otherwise we were in check also before last double push move.
assert(!bit_is_set(pos.discovered_check_candidates(them), checksq));
- assert(count_1s<false>(b1) == 1 || count_1s<false>(b1) == 2);
+ assert(count_1s(b1) == 1 || count_1s(b1) == 2);
b1 &= ~pinned;
while (b1)
assert(pinned == pos.pinned_pieces(pos.side_to_move()));
Color us = pos.side_to_move();
- Color them = opposite_color(us);
Square from = move_from(m);
Piece pc = pos.piece_on(from);
if (color_of_piece(pc) != us)
return false;
+ Color them = opposite_color(us);
Square to = move_to(m);
// En passant moves
// be a promotion.
if ( ( (square_rank(to) == RANK_8 && us == WHITE)
||(square_rank(to) == RANK_1 && us != WHITE))
- && !move_promotion(m))
+ && !move_is_promotion(m))
return false;
// Proceed according to the square delta between the source and
// Luckly we can handle all the other pieces in one go
return ( pos.piece_attacks_square(pos.piece_on(from), from, to)
&& pos.pl_move_is_legal(m, pinned)
- && !move_promotion(m));
+ && !move_is_promotion(m));
}
// Direct checks. These are possible only for pawns on neighboring files
// and in the two ranks that, after the push, are in front of the enemy king.
b1 = pawns & neighboring_files_bb(ksq) & ~dc;
- b2 = rank_bb(ksq + 2 * TDELTA_S) | rank_bb(ksq + 3 * TDELTA_S);
- b1 &= b2;
- if (!b1)
+
+ // We can get false positives if (ksq + x) is not in [0,63] range but
+ // is not a problem, they will be filtered out later.
+ b2 = b1 & (rank_bb(ksq + 2 * TDELTA_S) | rank_bb(ksq + 3 * TDELTA_S));
+ if (!b2)
return mlist;
// Direct checks, single pawn pushes
Bitboard blockSquares, MoveStack* mlist) {
// Calculate our parametrized parameters at compile time
- const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB);
+ const Rank TRANK_8 = (Us == WHITE ? RANK_8 : RANK_1);
const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB);
const SquareDelta TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S);
assert(pos.piece_on(to) == EMPTY);
- if (square_rank(to) == TRank8BB)
+ if (square_rank(to) == TRANK_8)
{
(*mlist++).move = make_promotion_move(to - TDELTA_N, to, QUEEN);
(*mlist++).move = make_promotion_move(to - TDELTA_N, to, ROOK);