X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=742a91f739b8c0f7097068b52feadb376d3afb4f;hp=3dfd8f6a488bd2348ec6d0486d5801f57ee99a69;hb=d7161c1ce6d3a515b1d0ca2589763607279fc6ec;hpb=ad1bb084ddde99261bcc20261a5ccee3bfb2abc7 diff --git a/src/movegen.cpp b/src/movegen.cpp index 3dfd8f6a..742a91f7 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -32,29 +32,15 @@ namespace { - inline Bitboard forward_white(Bitboard b) { return b << 8; } - inline Bitboard forward_right_white(Bitboard b) { return b << 9; } - inline Bitboard forward_left_white(Bitboard b) { return b << 7; } - - inline Bitboard forward_black(Bitboard b) { return b >> 8; } - inline Bitboard forward_right_black(Bitboard b) { return b >> 7; } - inline Bitboard forward_left_black(Bitboard b) { return b >> 9; } - - struct PawnOffsets { + struct PawnParams { Bitboard Rank3BB, Rank8BB; Rank RANK_8; SquareDelta DELTA_N, DELTA_NE, DELTA_NW; Color us, them; - typedef Bitboard (*Shift_fn)(Bitboard b); - Shift_fn forward, forward_left, forward_right; }; - - const PawnOffsets WhitePawnOffsets = { Rank3BB, Rank8BB, RANK_8, DELTA_N, DELTA_NE, DELTA_NW, WHITE, BLACK, - &forward_white, forward_left_white, forward_right_white }; - - const PawnOffsets BlackPawnOffsets = { Rank6BB, Rank1BB, RANK_1, DELTA_S, DELTA_SE, DELTA_SW, BLACK, WHITE, - &forward_black, &forward_left_black, &forward_right_black }; + const PawnParams WhitePawnParams = { Rank3BB, Rank8BB, RANK_8, DELTA_N, DELTA_NE, DELTA_NW, WHITE, BLACK }; + const PawnParams BlackPawnParams = { Rank6BB, Rank1BB, RANK_1, DELTA_S, DELTA_SE, DELTA_SW, BLACK, WHITE }; int generate_castle_moves(const Position&, MoveStack*, Color); @@ -640,66 +626,66 @@ namespace { template int generate_pawn_captures(const Position& pos, MoveStack* mlist) { - static const PawnOffsets ofs = (C == WHITE ? WhitePawnOffsets : BlackPawnOffsets); + static const PawnParams PP = (C == WHITE ? WhitePawnParams : BlackPawnParams); - Bitboard pawns = pos.pawns(ofs.us); - Bitboard enemyPieces = pos.pieces_of_color(ofs.them); + Bitboard pawns = pos.pawns(PP.us); + Bitboard enemyPieces = pos.pieces_of_color(PP.them); Square sq; int n = 0; // Captures in the a1-h8 (a8-h1 for black) direction - Bitboard b1 = (ofs.forward_right)(pawns) & ~FileABB & enemyPieces; + Bitboard b1 = (C == WHITE ? pawns << 9 : pawns >> 7) & ~FileABB & enemyPieces; // Capturing promotions - Bitboard b2 = b1 & ofs.Rank8BB; + Bitboard b2 = b1 & PP.Rank8BB; while (b2) { sq = pop_1st_bit(&b2); - mlist[n++].move = make_promotion_move(sq - ofs.DELTA_NE, sq, QUEEN); + mlist[n++].move = make_promotion_move(sq - PP.DELTA_NE, sq, QUEEN); } // Capturing non-promotions - b2 = b1 & ~ofs.Rank8BB; + b2 = b1 & ~PP.Rank8BB; while (b2) { sq = pop_1st_bit(&b2); - mlist[n++].move = make_move(sq - ofs.DELTA_NE, sq); + mlist[n++].move = make_move(sq - PP.DELTA_NE, sq); } // Captures in the h1-a8 (h8-a1 for black) direction - b1 = (ofs.forward_left)(pawns) & ~FileHBB & enemyPieces; + b1 = (C == WHITE ? pawns << 7 : pawns >> 9) & ~FileHBB & enemyPieces; // Capturing promotions - b2 = b1 & ofs.Rank8BB; + b2 = b1 & PP.Rank8BB; while (b2) { sq = pop_1st_bit(&b2); - mlist[n++].move = make_promotion_move(sq - ofs.DELTA_NW, sq, QUEEN); + mlist[n++].move = make_promotion_move(sq - PP.DELTA_NW, sq, QUEEN); } // Capturing non-promotions - b2 = b1 & ~ofs.Rank8BB; + b2 = b1 & ~PP.Rank8BB; while (b2) { sq = pop_1st_bit(&b2); - mlist[n++].move = make_move(sq - ofs.DELTA_NW, sq); + mlist[n++].move = make_move(sq - PP.DELTA_NW, sq); } // Non-capturing promotions - b1 = (ofs.forward)(pawns) & pos.empty_squares() & Rank8BB; + b1 = (C == WHITE ? pawns << 8 : pawns >> 8) & pos.empty_squares() & Rank8BB; while (b1) { sq = pop_1st_bit(&b1); - mlist[n++].move = make_promotion_move(sq - ofs.DELTA_N, sq, QUEEN); + mlist[n++].move = make_promotion_move(sq - PP.DELTA_N, sq, QUEEN); } // En passant captures if (pos.ep_square() != SQ_NONE) { - assert(ofs.us != WHITE || square_rank(pos.ep_square()) == RANK_6); - assert(ofs.us != BLACK || square_rank(pos.ep_square()) == RANK_3); + assert(PP.us != WHITE || square_rank(pos.ep_square()) == RANK_6); + assert(PP.us != BLACK || square_rank(pos.ep_square()) == RANK_3); - b1 = pawns & pos.pawn_attacks(ofs.them, pos.ep_square()); + b1 = pawns & pos.pawn_attacks(PP.them, pos.ep_square()); assert(b1 != EmptyBoardBB); while (b1) @@ -715,124 +701,58 @@ namespace { template int generate_pawn_noncaptures(const Position& pos, MoveStack* mlist) { - static const PawnOffsets ofs = (C == WHITE ? WhitePawnOffsets : BlackPawnOffsets); + static const PawnParams PP = (C == WHITE ? WhitePawnParams : BlackPawnParams); - Bitboard pawns = pos.pawns(ofs.us); - Bitboard enemyPieces = pos.pieces_of_color(ofs.them); + Bitboard pawns = pos.pawns(PP.us); + Bitboard enemyPieces = pos.pieces_of_color(PP.them); Bitboard emptySquares = pos.empty_squares(); Bitboard b1, b2; Square sq; int n = 0; // Underpromotion captures in the a1-h8 (a8-h1 for black) direction - b1 = ofs.forward_right(pawns) & ~FileABB & enemyPieces & ofs.Rank8BB; + b1 = (C == WHITE ? pawns << 9 : pawns >> 7) & ~FileABB & enemyPieces & PP.Rank8BB; while (b1) { sq = pop_1st_bit(&b1); - mlist[n++].move = make_promotion_move(sq - ofs.DELTA_NE, sq, ROOK); - mlist[n++].move = make_promotion_move(sq - ofs.DELTA_NE, sq, BISHOP); - mlist[n++].move = make_promotion_move(sq - ofs.DELTA_NE, sq, KNIGHT); + mlist[n++].move = make_promotion_move(sq - PP.DELTA_NE, sq, ROOK); + mlist[n++].move = make_promotion_move(sq - PP.DELTA_NE, sq, BISHOP); + mlist[n++].move = make_promotion_move(sq - PP.DELTA_NE, sq, KNIGHT); } // Underpromotion captures in the h1-a8 (h8-a1 for black) direction - b1 = ofs.forward_left(pawns) & ~FileHBB & enemyPieces & ofs.Rank8BB; + b1 = (C == WHITE ? pawns << 7 : pawns >> 9) & ~FileHBB & enemyPieces & PP.Rank8BB; while (b1) { sq = pop_1st_bit(&b1); - mlist[n++].move = make_promotion_move(sq - ofs.DELTA_NW, sq, ROOK); - mlist[n++].move = make_promotion_move(sq - ofs.DELTA_NW, sq, BISHOP); - mlist[n++].move = make_promotion_move(sq - ofs.DELTA_NW, sq, KNIGHT); + mlist[n++].move = make_promotion_move(sq - PP.DELTA_NW, sq, ROOK); + mlist[n++].move = make_promotion_move(sq - PP.DELTA_NW, sq, BISHOP); + mlist[n++].move = make_promotion_move(sq - PP.DELTA_NW, sq, KNIGHT); } // Single pawn pushes - b1 = ofs.forward(pawns) & emptySquares; - b2 = b1 & ofs.Rank8BB; + b1 = (C == WHITE ? pawns << 8 : pawns >> 8) & emptySquares; + b2 = b1 & PP.Rank8BB; while (b2) { sq = pop_1st_bit(&b2); - mlist[n++].move = make_promotion_move(sq - ofs.DELTA_N, sq, ROOK); - mlist[n++].move = make_promotion_move(sq - ofs.DELTA_N, sq, BISHOP); - mlist[n++].move = make_promotion_move(sq - ofs.DELTA_N, sq, KNIGHT); + mlist[n++].move = make_promotion_move(sq - PP.DELTA_N, sq, ROOK); + mlist[n++].move = make_promotion_move(sq - PP.DELTA_N, sq, BISHOP); + mlist[n++].move = make_promotion_move(sq - PP.DELTA_N, sq, KNIGHT); } - b2 = b1 & ~ofs.Rank8BB; + b2 = b1 & ~PP.Rank8BB; while (b2) { sq = pop_1st_bit(&b2); - mlist[n++].move = make_move(sq - ofs.DELTA_N, sq); + mlist[n++].move = make_move(sq - PP.DELTA_N, sq); } // Double pawn pushes - b2 = (ofs.forward(b1 & ofs.Rank3BB)) & emptySquares; + b2 = (C == WHITE ? (b1 & PP.Rank3BB) << 8 : (b1 & PP.Rank3BB) >> 8) & emptySquares; while (b2) { sq = pop_1st_bit(&b2); - mlist[n++].move = make_move(sq - ofs.DELTA_N - ofs.DELTA_N, sq); - } - return n; - } - - - int generate_castle_moves(const Position &pos, MoveStack *mlist, Color us) { - - int n = 0; - - if (pos.can_castle(us)) - { - Color them = opposite_color(us); - Square ksq = pos.king_square(us); - - assert(pos.piece_on(ksq) == king_of_color(us)); - - if (pos.can_castle_kingside(us)) - { - Square rsq = pos.initial_kr_square(us); - Square g1 = relative_square(us, SQ_G1); - Square f1 = relative_square(us, SQ_F1); - Square s; - bool illegal = false; - - assert(pos.piece_on(rsq) == rook_of_color(us)); - - for (s = Min(ksq, g1); s <= Max(ksq, g1); s++) - if ( (s != ksq && s != rsq && pos.square_is_occupied(s)) - || pos.square_is_attacked(s, them)) - illegal = true; - - for (s = Min(rsq, f1); s <= Max(rsq, f1); s++) - if (s != ksq && s != rsq && pos.square_is_occupied(s)) - illegal = true; - - if (!illegal) - mlist[n++].move = make_castle_move(ksq, rsq); - } - - if (pos.can_castle_queenside(us)) - { - Square rsq = pos.initial_qr_square(us); - Square c1 = relative_square(us, SQ_C1); - Square d1 = relative_square(us, SQ_D1); - Square s; - bool illegal = false; - - assert(pos.piece_on(rsq) == rook_of_color(us)); - - for (s = Min(ksq, c1); s <= Max(ksq, c1); s++) - if ( (s != ksq && s != rsq && pos.square_is_occupied(s)) - || pos.square_is_attacked(s, them)) - illegal = true; - - for (s = Min(rsq, d1); s <= Max(rsq, d1); s++) - if (s != ksq && s != rsq && pos.square_is_occupied(s)) - illegal = true; - - if ( square_file(rsq) == FILE_B - && ( pos.piece_on(relative_square(us, SQ_A1)) == rook_of_color(them) - || pos.piece_on(relative_square(us, SQ_A1)) == queen_of_color(them))) - illegal = true; - - if (!illegal) - mlist[n++].move = make_castle_move(ksq, rsq); - } + mlist[n++].move = make_move(sq - PP.DELTA_N - PP.DELTA_N, sq); } return n; } @@ -841,7 +761,7 @@ namespace { template int generate_pawn_checks(const Position& pos, Bitboard dc, Square ksq, MoveStack* mlist, int n) { - static const PawnOffsets ofs = (C == WHITE ? WhitePawnOffsets : BlackPawnOffsets); + static const PawnParams PP = (C == WHITE ? WhitePawnParams : BlackPawnParams); // Pawn moves which give discovered check. This is possible only if the // pawn is not on the same file as the enemy king, because we don't @@ -852,19 +772,19 @@ namespace { Bitboard b1 = pos.pawns(pos.side_to_move()) & ~file_bb(ksq), b2, b3; // Discovered checks, single pawn pushes - b2 = b3 = (ofs.forward)(b1 & dc) & ~ofs.Rank8BB & empty; + b2 = b3 = (C == WHITE ? (b1 & dc) << 8 : (b1 & dc) >> 8) & ~PP.Rank8BB & empty; while (b3) { Square to = pop_1st_bit(&b3); - mlist[n++].move = make_move(to - ofs.DELTA_N, to); + mlist[n++].move = make_move(to - PP.DELTA_N, to); } // Discovered checks, double pawn pushes - b3 = (ofs.forward)(b2 & ofs.Rank3BB) & empty; + b3 = (C == WHITE ? (b2 & PP.Rank3BB) << 8 : (b2 & PP.Rank3BB) >> 8) & empty; while (b3) { Square to = pop_1st_bit(&b3); - mlist[n++].move = make_move(to - ofs.DELTA_N - ofs.DELTA_N, to); + mlist[n++].move = make_move(to - PP.DELTA_N - PP.DELTA_N, to); } // Direct checks. These are possible only for pawns on neighboring files @@ -873,20 +793,23 @@ namespace { b1 &= (~dc & neighboring_files_bb(ksq)); // FIXME why ~dc ?? // Direct checks, single pawn pushes - b2 = (ofs.forward)(b1) & empty; - b3 = b2 & pos.pawn_attacks(ofs.them, ksq); + b2 = (C == WHITE ? b1 << 8 : b1 >> 8) & empty; + b3 = b2 & pos.pawn_attacks(PP.them, ksq); while (b3) { Square to = pop_1st_bit(&b3); - mlist[n++].move = make_move(to - ofs.DELTA_N, to); + mlist[n++].move = make_move(to - PP.DELTA_N, to); } // Direct checks, double pawn pushes - b3 = (ofs.forward)(b2 & ofs.Rank3BB) & empty & pos.pawn_attacks(ofs.them, ksq); + b3 = (C == WHITE ? (b2 & PP.Rank3BB) << 8 : (b2 & PP.Rank3BB) >> 8) + & empty + & pos.pawn_attacks(PP.them, ksq); + while (b3) { Square to = pop_1st_bit(&b3); - mlist[n++].move = make_move(to - ofs.DELTA_N - ofs.DELTA_N, to); + mlist[n++].move = make_move(to - PP.DELTA_N - PP.DELTA_N, to); } return n; } @@ -895,41 +818,108 @@ namespace { int generate_pawn_blocking_evasions(const Position& pos, Bitboard not_pinned, Bitboard blockSquares, MoveStack* mlist, int n) { - static const PawnOffsets ofs = (C == WHITE ? WhitePawnOffsets : BlackPawnOffsets); + static const PawnParams PP = (C == WHITE ? WhitePawnParams : BlackPawnParams); // Find non-pinned pawns - Bitboard b1 = pos.pawns(ofs.us) & not_pinned; + Bitboard b1 = pos.pawns(PP.us) & not_pinned; // Single pawn pushes. We don't have to AND with empty squares here, // because the blocking squares will always be empty. - Bitboard b2 = (ofs.forward)(b1) & blockSquares; + Bitboard b2 = (C == WHITE ? b1 << 8 : b1 >> 8) & blockSquares; while (b2) { Square to = pop_1st_bit(&b2); assert(pos.piece_on(to) == EMPTY); - if (square_rank(to) == ofs.RANK_8) + if (square_rank(to) == PP.RANK_8) { - mlist[n++].move = make_promotion_move(to - ofs.DELTA_N, to, QUEEN); - mlist[n++].move = make_promotion_move(to - ofs.DELTA_N, to, ROOK); - mlist[n++].move = make_promotion_move(to - ofs.DELTA_N, to, BISHOP); - mlist[n++].move = make_promotion_move(to - ofs.DELTA_N, to, KNIGHT); + mlist[n++].move = make_promotion_move(to - PP.DELTA_N, to, QUEEN); + mlist[n++].move = make_promotion_move(to - PP.DELTA_N, to, ROOK); + mlist[n++].move = make_promotion_move(to - PP.DELTA_N, to, BISHOP); + mlist[n++].move = make_promotion_move(to - PP.DELTA_N, to, KNIGHT); } else - mlist[n++].move = make_move(to - ofs.DELTA_N, to); + mlist[n++].move = make_move(to - PP.DELTA_N, to); } // Double pawn pushes - b2 = (ofs.forward)((ofs.forward)(b1) & pos.empty_squares() & ofs.Rank3BB) & blockSquares; + b2 = (C == WHITE ? b1 << 8 : b1 >> 8) & pos.empty_squares() & PP.Rank3BB; + b2 = (C == WHITE ? b2 << 8 : b2 >> 8) & blockSquares;; while (b2) { Square to = pop_1st_bit(&b2); assert(pos.piece_on(to) == EMPTY); - assert(ofs.us != WHITE || square_rank(to) == RANK_4); - assert(ofs.us != BLACK || square_rank(to) == RANK_5); + assert(PP.us != WHITE || square_rank(to) == RANK_4); + assert(PP.us != BLACK || square_rank(to) == RANK_5); + + mlist[n++].move = make_move(to - PP.DELTA_N - PP.DELTA_N, to); + } + return n; + } + + + int generate_castle_moves(const Position &pos, MoveStack *mlist, Color us) { + + int n = 0; + + if (pos.can_castle(us)) + { + Color them = opposite_color(us); + Square ksq = pos.king_square(us); + + assert(pos.piece_on(ksq) == king_of_color(us)); + + if (pos.can_castle_kingside(us)) + { + Square rsq = pos.initial_kr_square(us); + Square g1 = relative_square(us, SQ_G1); + Square f1 = relative_square(us, SQ_F1); + Square s; + bool illegal = false; + + assert(pos.piece_on(rsq) == rook_of_color(us)); + + for (s = Min(ksq, g1); s <= Max(ksq, g1); s++) + if ( (s != ksq && s != rsq && pos.square_is_occupied(s)) + || pos.square_is_attacked(s, them)) + illegal = true; + + for (s = Min(rsq, f1); s <= Max(rsq, f1); s++) + if (s != ksq && s != rsq && pos.square_is_occupied(s)) + illegal = true; + + if (!illegal) + mlist[n++].move = make_castle_move(ksq, rsq); + } + + if (pos.can_castle_queenside(us)) + { + Square rsq = pos.initial_qr_square(us); + Square c1 = relative_square(us, SQ_C1); + Square d1 = relative_square(us, SQ_D1); + Square s; + bool illegal = false; + + assert(pos.piece_on(rsq) == rook_of_color(us)); - mlist[n++].move = make_move(to - ofs.DELTA_N - ofs.DELTA_N, to); + for (s = Min(ksq, c1); s <= Max(ksq, c1); s++) + if ( (s != ksq && s != rsq && pos.square_is_occupied(s)) + || pos.square_is_attacked(s, them)) + illegal = true; + + for (s = Min(rsq, d1); s <= Max(rsq, d1); s++) + if (s != ksq && s != rsq && pos.square_is_occupied(s)) + illegal = true; + + if ( square_file(rsq) == FILE_B + && ( pos.piece_on(relative_square(us, SQ_A1)) == rook_of_color(them) + || pos.piece_on(relative_square(us, SQ_A1)) == queen_of_color(them))) + illegal = true; + + if (!illegal) + mlist[n++].move = make_castle_move(ksq, rsq); + } } return n; }