- curMove = killers;
- lastMove = curMove + 2;
- return;
-
- case NONCAPTURES_1_S1:
- lastNonCapture = lastMove = generate<MV_NON_CAPTURE>(pos, moves);
- score_noncaptures();
- lastMove = std::partition(curMove, lastMove, has_positive_score);
- sort<MoveStack>(curMove, lastMove);
- return;
-
- case NONCAPTURES_2_S1:
- curMove = lastMove;
- lastMove = lastNonCapture;
+ cur = killers;
+ endMoves = cur + 2;
+
+ killers[0] = ss->killers[0];
+ killers[1] = ss->killers[1];
+ killers[2].move = killers[3].move = MOVE_NONE;
+ killers[4].move = killers[5].move = MOVE_NONE;
+
+ // In SMP case countermoves[] and followupmoves[] could have duplicated entries
+ // in rare cases (less than 1 out of a million). This is harmless.
+
+ // Be sure countermoves and followupmoves are different from killers
+ for (int i = 0; i < 2; ++i)
+ if ( countermoves[i] != killers[0]
+ && countermoves[i] != killers[1])
+ *endMoves++ = countermoves[i];
+
+ for (int i = 0; i < 2; ++i)
+ if ( followupmoves[i] != killers[0]
+ && followupmoves[i] != killers[1]
+ && followupmoves[i] != killers[2]
+ && followupmoves[i] != killers[3])
+ *endMoves++ = followupmoves[i];
+ break;
+
+ case QUIETS_1_S1:
+ endQuiets = endMoves = generate<QUIETS>(pos, moves);
+ score<QUIETS>();
+ endMoves = std::partition(cur, endMoves, [](const ExtMove& m) { return m.value > VALUE_ZERO; });
+ insertion_sort(cur, endMoves);
+ break;
+
+ case QUIETS_2_S1:
+ cur = endMoves;
+ endMoves = endQuiets;