X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=90d0135a4d0dbe246aa38daa54b94d28820d5ad4;hp=e6c52ce5aceeed80c4603e4df362fba03210772c;hb=ad1f28bc1c1c5426fb8ab246f5d43ad57002b4d5;hpb=f3799aa750cd5d78ca5e253e4d1b7aa49d94284d diff --git a/src/movegen.cpp b/src/movegen.cpp index e6c52ce5..90d0135a 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -21,6 +21,7 @@ #include "bitcount.h" #include "movegen.h" +#include "position.h" // Simple macro to wrap a very common while loop, no facny, no flexibility, // hardcoded list name 'mlist' and from square 'from'. @@ -46,13 +47,13 @@ namespace { inline MoveStack* generate_discovered_checks(const Position& pos, MoveStack* mlist, Square from) { assert(Pt != QUEEN); + assert(Pt != PAWN); Bitboard b = pos.attacks_from(from) & pos.empty_squares(); + if (Pt == KING) - { - Square ksq = pos.king_square(opposite_color(pos.side_to_move())); - b &= ~QueenPseudoAttacks[ksq]; - } + b &= ~QueenPseudoAttacks[pos.king_square(opposite_color(pos.side_to_move()))]; + SERIALIZE_MOVES(b); return mlist; } @@ -61,6 +62,7 @@ namespace { inline MoveStack* generate_direct_checks(const Position& pos, MoveStack* mlist, Color us, Bitboard dc, Square ksq) { assert(Pt != KING); + assert(Pt != PAWN); Bitboard checkSqs, b; Square from; @@ -150,7 +152,6 @@ namespace { template MoveStack* generate(const Position& pos, MoveStack* mlist) { - assert(pos.is_ok()); assert(!pos.in_check()); Color us = pos.side_to_move(); @@ -201,7 +202,6 @@ template MoveStack* generate(const Position& pos, MoveStack* mli template<> MoveStack* generate(const Position& pos, MoveStack* mlist) { - assert(pos.is_ok()); assert(!pos.in_check()); Bitboard b, dc; @@ -212,7 +212,7 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) assert(pos.piece_on(ksq) == make_piece(opposite_color(us), KING)); // Discovered non-capture checks - b = dc = pos.discovered_check_candidates(us); + b = dc = pos.discovered_check_candidates(); while (b) { @@ -242,7 +242,6 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) template<> MoveStack* generate(const Position& pos, MoveStack* mlist) { - assert(pos.is_ok()); assert(pos.in_check()); Bitboard b, target; @@ -314,10 +313,8 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { template<> MoveStack* generate(const Position& pos, MoveStack* mlist) { - assert(pos.is_ok()); - MoveStack *last, *cur = mlist; - Bitboard pinned = pos.pinned_pieces(pos.side_to_move()); + Bitboard pinned = pos.pinned_pieces(); last = pos.in_check() ? generate(pos, mlist) : generate(pos, mlist); @@ -357,7 +354,7 @@ namespace { return mlist; } - template + template inline MoveStack* generate_promotions(const Position& pos, MoveStack* mlist, Bitboard pawnsOn7, Bitboard target) { const Bitboard TFileABB = (Delta == DELTA_NE || Delta == DELTA_SE ? FileABB : FileHBB); @@ -388,7 +385,7 @@ namespace { // This is the only possible under promotion that can give a check // not already included in the queen-promotion. if ( Type == MV_CHECK - && bit_is_set(pos.attacks_from(to), pos.king_square(opposite_color(Us)))) + && bit_is_set(pos.attacks_from(to), pos.king_square(Delta > 0 ? BLACK : WHITE))) (*mlist++).move = make_promotion_move(to - Delta, to, KNIGHT); else (void)pos; // Silence a warning under MSVC } @@ -403,9 +400,9 @@ namespace { const Color Them = (Us == WHITE ? BLACK : WHITE); const Bitboard TRank7BB = (Us == WHITE ? Rank7BB : Rank2BB); const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB); - const Square TDELTA_N = (Us == WHITE ? DELTA_N : DELTA_S); - const Square TDELTA_NE = (Us == WHITE ? DELTA_NE : DELTA_SE); - const Square TDELTA_NW = (Us == WHITE ? DELTA_NW : DELTA_SW); + const Square UP = (Us == WHITE ? DELTA_N : DELTA_S); + const Square RIGHT_UP = (Us == WHITE ? DELTA_NE : DELTA_SW); + const Square LEFT_UP = (Us == WHITE ? DELTA_NW : DELTA_SE); Square to; Bitboard b1, b2, dc1, dc2, pawnPushes, emptySquares; @@ -417,7 +414,7 @@ namespace { if (Type != MV_CAPTURE) { emptySquares = (Type == MV_NON_CAPTURE ? target : pos.empty_squares()); - pawnPushes = move_pawns(pawns & ~TRank7BB) & emptySquares; + pawnPushes = move_pawns(pawns & ~TRank7BB) & emptySquares; } if (Type == MV_EVASION) @@ -433,23 +430,23 @@ namespace { emptySquares = pos.empty_squares(); pawns &= ~TRank7BB; - mlist = generate_promotions(pos, mlist, pawnsOn7, enemyPieces); - mlist = generate_promotions(pos, mlist, pawnsOn7, enemyPieces); - mlist = generate_promotions(pos, mlist, pawnsOn7, emptySquares); + mlist = generate_promotions(pos, mlist, pawnsOn7, enemyPieces); + mlist = generate_promotions(pos, mlist, pawnsOn7, enemyPieces); + mlist = generate_promotions(pos, mlist, pawnsOn7, emptySquares); } // Standard captures if (Type == MV_CAPTURE || Type == MV_EVASION) { - mlist = generate_pawn_captures(mlist, pawns, enemyPieces); - mlist = generate_pawn_captures(mlist, pawns, enemyPieces); + mlist = generate_pawn_captures(mlist, pawns, enemyPieces); + mlist = generate_pawn_captures(mlist, pawns, enemyPieces); } // Single and double pawn pushes if (Type != MV_CAPTURE) { b1 = (Type != MV_EVASION ? pawnPushes : pawnPushes & emptySquares); - b2 = move_pawns(pawnPushes & TRank3BB) & emptySquares; + b2 = move_pawns(pawnPushes & TRank3BB) & emptySquares; if (Type == MV_CHECK) { @@ -462,15 +459,15 @@ namespace { // don't generate captures. if (pawns & target) // For CHECK type target is dc bitboard { - dc1 = move_pawns(pawns & target & ~file_bb(ksq)) & emptySquares; - dc2 = move_pawns(dc1 & TRank3BB) & emptySquares; + dc1 = move_pawns(pawns & target & ~file_bb(ksq)) & emptySquares; + dc2 = move_pawns(dc1 & TRank3BB) & emptySquares; b1 |= dc1; b2 |= dc2; } } - SERIALIZE_MOVES_D(b1, -TDELTA_N); - SERIALIZE_MOVES_D(b2, -TDELTA_N -TDELTA_N); + SERIALIZE_MOVES_D(b1, -UP); + SERIALIZE_MOVES_D(b2, -UP -UP); } // En passant captures @@ -482,7 +479,7 @@ namespace { // An en passant capture can be an evasion only if the checking piece // is the double pushed pawn and so is in the target. Otherwise this // is a discovery check and we are forced to do otherwise. - if (Type == MV_EVASION && !bit_is_set(target, pos.ep_square() - TDELTA_N)) + if (Type == MV_EVASION && !bit_is_set(target, pos.ep_square() - UP)) return mlist; b1 = pawns & pos.attacks_from(pos.ep_square(), Them);