X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=a0c06aa8dc6404f1c4b4df109a7fefa6ae0ef67f;hp=63c1e1fab5987e99408a494e9f58c8848c5c3ad3;hb=99e547f4cb190e462d0c582b731a0fcf25ce1545;hpb=9a1d5f0f1d8a12a85b198688d4f1d636a146eb7a diff --git a/src/movegen.cpp b/src/movegen.cpp index 63c1e1fa..a0c06aa8 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -32,7 +32,7 @@ namespace { template - MoveStack* generate_castle(const Position& pos, MoveStack* mlist, Color us) { + ExtMove* generate_castle(const Position& pos, ExtMove* mlist, Color us) { if (pos.castle_impeded(us, Side) || !pos.can_castle(make_castle_right(us, Side))) return mlist; @@ -68,23 +68,11 @@ namespace { } - template - inline Bitboard move_pawns(Bitboard p) { - - return Delta == DELTA_N ? p << 8 - : Delta == DELTA_S ? p >> 8 - : Delta == DELTA_NE ? (p & ~FileHBB) << 9 - : Delta == DELTA_SE ? (p & ~FileHBB) >> 7 - : Delta == DELTA_NW ? (p & ~FileABB) << 7 - : Delta == DELTA_SW ? (p & ~FileABB) >> 9 : 0; - } - - template - inline MoveStack* generate_promotions(MoveStack* mlist, Bitboard pawnsOn7, - Bitboard target, const CheckInfo* ci) { + inline ExtMove* generate_promotions(ExtMove* mlist, Bitboard pawnsOn7, + Bitboard target, const CheckInfo* ci) { - Bitboard b = move_pawns(pawnsOn7) & target; + Bitboard b = shift_bb(pawnsOn7) & target; while (b) { @@ -113,8 +101,8 @@ namespace { template - MoveStack* generate_pawn_moves(const Position& pos, MoveStack* mlist, - Bitboard target, const CheckInfo* ci) { + ExtMove* generate_pawn_moves(const Position& pos, ExtMove* mlist, + Bitboard target, const CheckInfo* ci) { // Compute our parametrized parameters at compile time, named according to // the point of view of white side. @@ -122,9 +110,9 @@ namespace { const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB); const Bitboard TRank7BB = (Us == WHITE ? Rank7BB : Rank2BB); const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB); - const Square UP = (Us == WHITE ? DELTA_N : DELTA_S); - const Square RIGHT = (Us == WHITE ? DELTA_NE : DELTA_SW); - const Square LEFT = (Us == WHITE ? DELTA_NW : DELTA_SE); + const Square Up = (Us == WHITE ? DELTA_N : DELTA_S); + const Square Right = (Us == WHITE ? DELTA_NE : DELTA_SW); + const Square Left = (Us == WHITE ? DELTA_NW : DELTA_SE); Bitboard b1, b2, dc1, dc2, emptySquares; @@ -139,8 +127,8 @@ namespace { { emptySquares = (Type == QUIETS || Type == QUIET_CHECKS ? target : ~pos.pieces()); - b1 = move_pawns(pawnsNotOn7) & emptySquares; - b2 = move_pawns(b1 & TRank3BB) & emptySquares; + b1 = shift_bb(pawnsNotOn7) & emptySquares; + b2 = shift_bb(b1 & TRank3BB) & emptySquares; if (Type == EVASIONS) // Consider only blocking squares { @@ -159,16 +147,16 @@ namespace { // promotion has been already generated among captures. if (pawnsNotOn7 & ci->dcCandidates) { - dc1 = move_pawns(pawnsNotOn7 & ci->dcCandidates) & emptySquares & ~file_bb(ci->ksq); - dc2 = move_pawns(dc1 & TRank3BB) & emptySquares; + dc1 = shift_bb(pawnsNotOn7 & ci->dcCandidates) & emptySquares & ~file_bb(ci->ksq); + dc2 = shift_bb(dc1 & TRank3BB) & emptySquares; b1 |= dc1; b2 |= dc2; } } - SERIALIZE_PAWNS(b1, UP); - SERIALIZE_PAWNS(b2, UP + UP); + SERIALIZE_PAWNS(b1, Up); + SERIALIZE_PAWNS(b2, Up + Up); } // Promotions and underpromotions @@ -180,19 +168,19 @@ namespace { if (Type == EVASIONS) emptySquares &= target; - mlist = generate_promotions(mlist, pawnsOn7, enemies, ci); - mlist = generate_promotions(mlist, pawnsOn7, enemies, ci); - mlist = generate_promotions(mlist, pawnsOn7, emptySquares, ci); + mlist = generate_promotions(mlist, pawnsOn7, enemies, ci); + mlist = generate_promotions(mlist, pawnsOn7, enemies, ci); + mlist = generate_promotions(mlist, pawnsOn7, emptySquares, ci); } // Standard and en-passant captures if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS) { - b1 = move_pawns(pawnsNotOn7) & enemies; - b2 = move_pawns(pawnsNotOn7) & enemies; + b1 = shift_bb(pawnsNotOn7) & enemies; + b2 = shift_bb(pawnsNotOn7) & enemies; - SERIALIZE_PAWNS(b1, RIGHT); - SERIALIZE_PAWNS(b2, LEFT); + SERIALIZE_PAWNS(b1, Right); + SERIALIZE_PAWNS(b2, Left); if (pos.ep_square() != SQ_NONE) { @@ -201,7 +189,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 == EVASIONS && !(target & (pos.ep_square() - UP))) + if (Type == EVASIONS && !(target & (pos.ep_square() - Up))) return mlist; b1 = pawnsNotOn7 & pos.attacks_from(pos.ep_square(), Them); @@ -218,12 +206,12 @@ namespace { template FORCE_INLINE - MoveStack* generate_moves(const Position& pos, MoveStack* mlist, Color us, - Bitboard target, const CheckInfo* ci) { + ExtMove* generate_moves(const Position& pos, ExtMove* mlist, Color us, + Bitboard target, const CheckInfo* ci) { assert(Pt != KING && Pt != PAWN); - const Square* pl = pos.piece_list(us, Pt); + const Square* pl = pos.list(us); for (Square from = *pl; from != SQ_NONE; from = *++pl) { @@ -250,8 +238,8 @@ namespace { template FORCE_INLINE - MoveStack* generate_all(const Position& pos, MoveStack* mlist, Color us, - Bitboard target, const CheckInfo* ci = NULL) { + ExtMove* generate_all(const Position& pos, ExtMove* mlist, Color us, + Bitboard target, const CheckInfo* ci = NULL) { const bool Checks = Type == QUIET_CHECKS; @@ -301,7 +289,7 @@ namespace { /// non-captures. Returns a pointer to the end of the move list. template -MoveStack* generate(const Position& pos, MoveStack* mlist) { +ExtMove* generate(const Position& pos, ExtMove* mlist) { assert(Type == CAPTURES || Type == QUIETS || Type == NON_EVASIONS); assert(!pos.checkers()); @@ -316,15 +304,15 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { } // Explicit template instantiations -template MoveStack* generate(const Position&, MoveStack*); -template MoveStack* generate(const Position&, MoveStack*); -template MoveStack* generate(const Position&, MoveStack*); +template ExtMove* generate(const Position&, ExtMove*); +template ExtMove* generate(const Position&, ExtMove*); +template ExtMove* generate(const Position&, ExtMove*); /// generate generates all pseudo-legal non-captures and knight /// underpromotions that give check. Returns a pointer to the end of the move list. template<> -MoveStack* generate(const Position& pos, MoveStack* mlist) { +ExtMove* generate(const Position& pos, ExtMove* mlist) { assert(!pos.checkers()); @@ -354,7 +342,7 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { /// generate generates all pseudo-legal check evasions when the side /// to move is in check. Returns a pointer to the end of the move list. template<> -MoveStack* generate(const Position& pos, MoveStack* mlist) { +ExtMove* generate(const Position& pos, ExtMove* mlist) { assert(pos.checkers()); @@ -416,9 +404,9 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { /// generate generates all the legal moves in the given position template<> -MoveStack* generate(const Position& pos, MoveStack* mlist) { +ExtMove* generate(const Position& pos, ExtMove* mlist) { - MoveStack *end, *cur = mlist; + ExtMove *end, *cur = mlist; Bitboard pinned = pos.pinned_pieces(); Square ksq = pos.king_square(pos.side_to_move());