diff --git a/src/movepick.cpp b/src/movepick.cpp index 7fe8971b..d0ea367a 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -76,6 +76,8 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, Search::Stack* s) Square prevSq = to_sq((ss-1)->currentMove); countermove = pos.this_thread()->counterMoves[pos.piece_on(prevSq)][prevSq]; + killers[0] = ss->killers[0]; + killers[1] = ss->killers[1]; stage = pos.checkers() ? EVASION : MAIN_SEARCH; ttMove = ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE; @@ -210,7 +212,7 @@ Move MovePicker::next_move(bool skipQuiets) { } ++stage; - move = ss->killers[0]; // First killer move + move = killers[0]; // First killer move if ( move != MOVE_NONE && move != ttMove && pos.pseudo_legal(move) @@ -219,7 +221,7 @@ Move MovePicker::next_move(bool skipQuiets) { case KILLERS: ++stage; - move = ss->killers[1]; // Second killer move + move = killers[1]; // Second killer move if ( move != MOVE_NONE && move != ttMove && pos.pseudo_legal(move) @@ -231,8 +233,8 @@ Move MovePicker::next_move(bool skipQuiets) { move = countermove; if ( move != MOVE_NONE && move != ttMove - && move != ss->killers[0] - && move != ss->killers[1] + && move != killers[0] + && move != killers[1] && pos.pseudo_legal(move) && !pos.capture(move)) return move; @@ -251,8 +253,8 @@ Move MovePicker::next_move(bool skipQuiets) { move = *cur++; if ( move != ttMove - && move != ss->killers[0] - && move != ss->killers[1] + && move != killers[0] + && move != killers[1] && move != countermove) return move; } diff --git a/src/movepick.h b/src/movepick.h index 1a81dbde..ae2ee381 100644 --- a/src/movepick.h +++ b/src/movepick.h @@ -111,6 +111,7 @@ private: const Position& pos; const Search::Stack* ss; + Move killers[2]; Move countermove; Depth depth; Move ttMove;