Use move assignment in movegen.h

[stockfish] / src / movepick.cpp

diff --git a/src/movepick.cpp b/src/movepick.cpp
index 1f4ef1952d0a0c469ba654f31512c3c3966e7712..3b636b935d431ac1af263b6e1ede2fc882fb3e23 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -55,7 +55,7 @@ namespace {
   inline Move pick_best(ExtMove* begin, ExtMove* end)
   {
       std::swap(*begin, *std::max_element(begin, end));
-      return begin->move;
+      return *begin;
   }
 
 } // namespace
@@ -201,28 +201,13 @@ void MovePicker::generate_next_stage() {
 
   case KILLERS_S1:
       cur = killers;
-      endMoves = cur + 2;
-
-      killers[0].move = ss->killers[0];
-      killers[1].move = 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].move
-              && countermoves[i] != killers[1].move)
-              (endMoves++)->move = countermoves[i];
-
-      for (int i = 0; i < 2; ++i)
-          if (   followupmoves[i] != killers[0].move
-              && followupmoves[i] != killers[1].move
-              && followupmoves[i] != killers[2].move
-              && followupmoves[i] != killers[3].move)
-              (endMoves++)->move = followupmoves[i];
+      endMoves = cur + 6;
+      killers[0] = ss->killers[0];
+      killers[1] = ss->killers[1];
+      killers[2] = countermoves[0];
+      killers[3] = countermoves[1];
+      killers[4] = followupmoves[0];
+      killers[5] = followupmoves[1];
       break;
 
   case QUIETS_1_S1:
@@ -260,7 +245,7 @@ void MovePicker::generate_next_stage() {
       /* Fall through */
 
   case STOP:
-      endMoves = cur + 1; // Avoid another next_phase() call
+      endMoves = cur + 1; // Avoid another generate_next_stage() call
       break;
 
   default:
@@ -297,7 +282,7 @@ Move MovePicker::next_move<false>() {
                   return move;
 
               // Losing capture, move it to the tail of the array
-              (endBadCaptures--)->move = move;
+              *endBadCaptures-- = move;
           }
           break;
 
@@ -307,18 +292,24 @@ Move MovePicker::next_move<false>() {
               &&  move != ttMove
               &&  pos.pseudo_legal(move)
               && !pos.capture(move))
+          {
+              for (int i = 0; i < cur - 1 - killers; i++) // Skip duplicated
+                  if (move == killers[i])
+                      goto skip;
               return move;
+          }
+      skip:
           break;
 
       case QUIETS_1_S1: case QUIETS_2_S1:
           move = *cur++;
           if (   move != ttMove
-              && move != killers[0].move
-              && move != killers[1].move
-              && move != killers[2].move
-              && move != killers[3].move
-              && move != killers[4].move
-              && move != killers[5].move)
+              && move != killers[0]
+              && move != killers[1]
+              && move != killers[2]
+              && move != killers[3]
+              && move != killers[4]
+              && move != killers[5])
               return move;
           break;