Join all capture init stages in MovePicker

Passed STC:
LLR: 2.96 (-2.94,2.94) [-3.00,1.00]
Total: 16789 W: 3685 L: 3554 D: 9550
http://tests.stockfishchess.org/tests/view/5a91a8bb0ebc590297cc875b

Passed LTC:
LLR: 2.96 (-2.94,2.94) [-3.00,1.00]
Total: 21293 W: 3527 L: 3407 D: 14359
http://tests.stockfishchess.org/tests/view/5a920a730ebc590297cc87ba

No functional change

diff --git a/src/movepick.cpp b/src/movepick.cpp
index b4cae3a07ac0194ef39f7259ad0ed41a3eaeee53..51d85192a7c4df8b9c0cfdd0ea0c3adfb7b9ff13 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -27,7 +27,7 @@ namespace {
   enum Stages {
     MAIN_SEARCH, CAPTURES_INIT, GOOD_CAPTURES, KILLERS, COUNTERMOVE, QUIET_INIT, QUIET, BAD_CAPTURES,
     EVASION, EVASIONS_INIT, ALL_EVASIONS,
   enum Stages {
     MAIN_SEARCH, CAPTURES_INIT, GOOD_CAPTURES, KILLERS, COUNTERMOVE, QUIET_INIT, QUIET, BAD_CAPTURES,
     EVASION, EVASIONS_INIT, ALL_EVASIONS,

-    PROBCUT, PROBCUT_INIT, PROBCUT_CAPTURES,
+    PROBCUT, PROBCUT_CAPTURES_INIT, PROBCUT_CAPTURES,

     QSEARCH, QCAPTURES_INIT, QCAPTURES, QCHECKS, QSEARCH_RECAPTURES, QRECAPTURES
   };
 
     QSEARCH, QCAPTURES_INIT, QCAPTURES, QCHECKS, QSEARCH_RECAPTURES, QRECAPTURES
   };
 


@@ -161,11 +161,16 @@ Move MovePicker::next_move(bool skipQuiets) {
       return ttMove;
 
   case CAPTURES_INIT:
       return ttMove;
 
   case CAPTURES_INIT:

+  case PROBCUT_CAPTURES_INIT:
+  case QCAPTURES_INIT:
+  case QSEARCH_RECAPTURES:

       endBadCaptures = cur = moves;
       endMoves = generate<CAPTURES>(pos, cur);
       score<CAPTURES>();
       ++stage;
       endBadCaptures = cur = moves;
       endMoves = generate<CAPTURES>(pos, cur);
       score<CAPTURES>();
       ++stage;

-      /* fallthrough */
+
+      // Rebranch at the top of the switch via a recursive call
+      return next_move(skipQuiets);

 
   case GOOD_CAPTURES:
       while (cur < endMoves)
 
   case GOOD_CAPTURES:
       while (cur < endMoves)


@@ -257,13 +262,6 @@ Move MovePicker::next_move(bool skipQuiets) {
       }
       break;
 
       }
       break;
 

-  case PROBCUT_INIT:
-      cur = moves;
-      endMoves = generate<CAPTURES>(pos, cur);
-      score<CAPTURES>();
-      ++stage;
-      /* fallthrough */
-

   case PROBCUT_CAPTURES:
       while (cur < endMoves)
       {
   case PROBCUT_CAPTURES:
       while (cur < endMoves)
       {


@@ -274,13 +272,6 @@ Move MovePicker::next_move(bool skipQuiets) {
       }
       break;
 
       }
       break;
 

-  case QCAPTURES_INIT:
-      cur = moves;
-      endMoves = generate<CAPTURES>(pos, cur);
-      score<CAPTURES>();
-      ++stage;
-      /* fallthrough */
-

   case QCAPTURES:
       while (cur < endMoves)
       {
   case QCAPTURES:
       while (cur < endMoves)
       {


@@ -304,12 +295,6 @@ Move MovePicker::next_move(bool skipQuiets) {
       }
       break;
 
       }
       break;
 

-  case QSEARCH_RECAPTURES:
-      cur = moves;
-      endMoves = generate<CAPTURES>(pos, cur);
-      ++stage;
-      /* fallthrough */
-

   case QRECAPTURES:
       while (cur < endMoves)
       {
   case QRECAPTURES:
       while (cur < endMoves)
       {