X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovegen.cpp;h=eb235b1df679320e4c49effd8669ce219dfd30bf;hb=b1fcfe4c5d1fbe7e538268b79f12224f8c4d5012;hp=eb390cd14f224dc9f6c51211279168b9050dae97;hpb=3141490374182551ed26f39ba4e3efb59589f057;p=stockfish diff --git a/src/movegen.cpp b/src/movegen.cpp index eb390cd1..eb235b1d 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,6 +18,7 @@ */ #include +#include #include "bitcount.h" #include "movegen.h" @@ -46,8 +47,7 @@ namespace { template inline MoveStack* generate_discovered_checks(const Position& pos, MoveStack* mlist, Square from) { - assert(Pt != QUEEN); - assert(Pt != PAWN); + assert(Pt != QUEEN && Pt != PAWN); Bitboard b = pos.attacks_from(from) & pos.empty_squares(); @@ -61,8 +61,7 @@ namespace { template inline MoveStack* generate_direct_checks(const Position& pos, MoveStack* mlist, Color us, Bitboard dc, Square ksq) { - assert(Pt != KING); - assert(Pt != PAWN); + assert(Pt != KING && Pt != PAWN); Bitboard checkSqs, b; Square from; @@ -102,8 +101,6 @@ namespace { FORCE_INLINE MoveStack* generate_piece_moves(const Position& p, MoveStack* m, Color us, Bitboard t) { assert(Pt == PAWN); - assert(Type == MV_CAPTURE || Type == MV_NON_CAPTURE || Type == MV_EVASION); - return (us == WHITE ? generate_pawn_moves(p, m, t, SQ_NONE) : generate_pawn_moves(p, m, t, SQ_NONE)); } @@ -152,27 +149,22 @@ namespace { template MoveStack* generate(const Position& pos, MoveStack* mlist) { + assert(Type == MV_CAPTURE || Type == MV_NON_CAPTURE || Type == MV_NON_EVASION); assert(!pos.in_check()); Color us = pos.side_to_move(); Bitboard target; - if (Type == MV_CAPTURE || Type == MV_NON_EVASION) + if (Type == MV_CAPTURE) target = pos.pieces(flip(us)); + else if (Type == MV_NON_CAPTURE) target = pos.empty_squares(); - else - assert(false); - if (Type == MV_NON_EVASION) - { - mlist = generate_piece_moves(pos, mlist, us, target); - mlist = generate_piece_moves(pos, mlist, us, pos.empty_squares()); - target |= pos.empty_squares(); - } - else - mlist = generate_piece_moves(pos, mlist, us, target); + else if (Type == MV_NON_EVASION) + target = pos.pieces(flip(us)) | pos.empty_squares(); + mlist = generate_piece_moves(pos, mlist, us, target); mlist = generate_piece_moves(pos, mlist, us, target); mlist = generate_piece_moves(pos, mlist, us, target); mlist = generate_piece_moves(pos, mlist, us, target); @@ -197,7 +189,7 @@ template MoveStack* generate(const Position& pos, MoveStack* mli template MoveStack* generate(const Position& pos, MoveStack* mlist); -/// generate_non_capture_checks() generates all pseudo-legal non-captures and knight +/// 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) { @@ -237,8 +229,8 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) } -/// generate_evasions() generates all pseudo-legal check evasions when -/// the side to move is in check. Returns a pointer to the end of the move list. +/// 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) { @@ -250,7 +242,7 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { Color us = pos.side_to_move(); Square ksq = pos.king_square(us); Bitboard checkers = pos.checkers(); - Bitboard sliderAttacks = EmptyBoardBB; + Bitboard sliderAttacks = 0; assert(pos.piece_on(ksq) == make_piece(us, KING)); assert(checkers); @@ -340,7 +332,7 @@ namespace { Delta == DELTA_NW ? p << 7 : Delta == DELTA_SW ? p >> 9 : p; } - template + template inline MoveStack* generate_pawn_captures(MoveStack* mlist, Bitboard pawns, Bitboard target) { const Bitboard TFileABB = (Delta == DELTA_NE || Delta == DELTA_SE ? FileABB : FileHBB); @@ -372,21 +364,21 @@ namespace { { to = pop_1st_bit(&b); - if (Type == MV_CAPTURE || Type == MV_EVASION) - (*mlist++).move = make_promotion_move(to - Delta, to, QUEEN); + if (Type == MV_CAPTURE || Type == MV_EVASION || Type == MV_NON_EVASION) + (*mlist++).move = make_promotion(to - Delta, to, QUEEN); - if (Type == MV_NON_CAPTURE || Type == MV_EVASION) + if (Type == MV_NON_CAPTURE || Type == MV_EVASION || Type == MV_NON_EVASION) { - (*mlist++).move = make_promotion_move(to - Delta, to, ROOK); - (*mlist++).move = make_promotion_move(to - Delta, to, BISHOP); - (*mlist++).move = make_promotion_move(to - Delta, to, KNIGHT); + (*mlist++).move = make_promotion(to - Delta, to, ROOK); + (*mlist++).move = make_promotion(to - Delta, to, BISHOP); + (*mlist++).move = make_promotion(to - Delta, to, KNIGHT); } // 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(Delta > 0 ? BLACK : WHITE))) - (*mlist++).move = make_promotion_move(to - Delta, to, KNIGHT); + (*mlist++).move = make_promotion(to - Delta, to, KNIGHT); else (void)pos; // Silence a warning under MSVC } return mlist; @@ -436,10 +428,10 @@ namespace { } // Standard captures - if (Type == MV_CAPTURE || Type == MV_EVASION) + if (Type == MV_CAPTURE || Type == MV_EVASION || Type == MV_NON_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 @@ -471,7 +463,8 @@ namespace { } // En passant captures - if ((Type == MV_CAPTURE || Type == MV_EVASION) && pos.ep_square() != SQ_NONE) + if ( (Type == MV_CAPTURE || Type == MV_EVASION || Type == MV_NON_EVASION) + && pos.ep_square() != SQ_NONE) { assert(Us != WHITE || rank_of(pos.ep_square()) == RANK_6); assert(Us != BLACK || rank_of(pos.ep_square()) == RANK_3); @@ -484,12 +477,12 @@ namespace { b1 = pawns & pos.attacks_from(pos.ep_square(), Them); - assert(b1 != EmptyBoardBB); + assert(b1); while (b1) { to = pop_1st_bit(&b1); - (*mlist++).move = make_enpassant_move(to, pos.ep_square()); + (*mlist++).move = make_enpassant(to, pos.ep_square()); } } return mlist; @@ -516,12 +509,12 @@ namespace { // (including the final square), and all the squares between the rook's initial // and final squares (including the final square), must be vacant except for // the king and castling rook. - for (Square s = Min(kfrom, kto); s <= Max(kfrom, kto); s++) + for (Square s = std::min(kfrom, kto); s <= std::max(kfrom, kto); s++) if ( (s != kfrom && s != rfrom && !pos.square_is_empty(s)) ||(pos.attackers_to(s) & pos.pieces(them))) return mlist; - for (Square s = Min(rfrom, rto); s <= Max(rfrom, rto); s++) + for (Square s = std::min(rfrom, rto); s <= std::max(rfrom, rto); s++) if (s != kfrom && s != rfrom && !pos.square_is_empty(s)) return mlist; @@ -536,7 +529,7 @@ namespace { return mlist; } - (*mlist++).move = make_castle_move(kfrom, rfrom); + (*mlist++).move = make_castle(kfrom, rfrom); return mlist; }