Document index[] and pieceList[] are not invariants

[stockfish] / src / movepick.cpp

diff --git a/src/movepick.cpp b/src/movepick.cpp
index 6b7483eb99c0a782f529b71cbb950e8aaa7a791a..5c0f4f5b775c57f811a382746936b519043c9710 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -61,10 +61,12 @@ namespace {
 
 MovePicker::MovePicker(const Position& p, Move ttm, Depth d,
                        const History& h, SearchStack* ss) : pos(p), H(h) {
+  int searchTT = ttm;
   ttMoves[0].move = ttm;
   if (ss)
   {
       ttMoves[1].move = (ss->mateKiller == ttm)? MOVE_NONE : ss->mateKiller;
+      searchTT |= ttMoves[1].move;
       killers[0].move = ss->killers[0];
       killers[1].move = ss->killers[1];
   } else
@@ -81,11 +83,11 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d,
   if (p.is_check())
       phasePtr = EvasionsPhaseTable;
   else if (d > Depth(0))
-      phasePtr = MainSearchPhaseTable;
+      phasePtr = MainSearchPhaseTable + !searchTT;
   else if (d == Depth(0))
-      phasePtr = QsearchWithChecksPhaseTable;
+      phasePtr = QsearchWithChecksPhaseTable + !searchTT;
   else
-      phasePtr = QsearchWithoutChecksPhaseTable;
+      phasePtr = QsearchWithoutChecksPhaseTable + !searchTT;
 
   phasePtr--;
   go_next_phase();
@@ -150,6 +152,7 @@ void MovePicker::go_next_phase() {
       return;
 
   case PH_STOP:
+      lastMove = curMove + 1; // hack to be friendly for get_next_move()
       return;
 
   default:
@@ -247,24 +250,23 @@ Move MovePicker::get_next_move() {
   assert(!pos.is_check() || *phasePtr == PH_EVASIONS || *phasePtr == PH_STOP);
   assert( pos.is_check() || *phasePtr != PH_EVASIONS);
 
+  Move move;
+
   while (true)
   {
-      switch (phase) {
+      while (curMove != lastMove)
+      {
+          move = (curMove++)->move;
+
+          switch (phase) {
 
-      case PH_TT_MOVES:
-          while (curMove != lastMove)
-          {
-              Move move = (curMove++)->move;
+          case PH_TT_MOVES:
               if (   move != MOVE_NONE
                   && move_is_legal(pos, move, pinned))
                   return move;
-          }
-          break;
+              break;
 
-      case PH_GOOD_CAPTURES:
-          while (curMove != lastMove)
-          {
-              Move move = (curMove++)->move;
+          case PH_GOOD_CAPTURES:
               if (   move != ttMoves[0].move
                   && move != ttMoves[1].move
                   && pos.pl_move_is_legal(move, pinned))
@@ -280,59 +282,45 @@ Move MovePicker::get_next_move() {
                   badCaptures[numOfBadCaptures].move = move;
                   badCaptures[numOfBadCaptures++].score = seeValue;
               }
-          }
-          break;
+              break;
 
-      case PH_KILLERS:
-          while (curMove != lastMove)
-          {
-              Move move = (curMove++)->move;
+          case PH_KILLERS:
               if (   move != MOVE_NONE
                   && move != ttMoves[0].move
                   && move != ttMoves[1].move
                   && move_is_legal(pos, move, pinned)
                   && !pos.move_is_capture(move))
                   return move;
-          }
-          break;
+              break;
 
-      case PH_NONCAPTURES:
-          while (curMove != lastMove)
-          {
-              Move move = (curMove++)->move;
+          case PH_NONCAPTURES:
               if (   move != ttMoves[0].move
                   && move != ttMoves[1].move
                   && move != killers[0].move
                   && move != killers[1].move
                   && pos.pl_move_is_legal(move, pinned))
                   return move;
-          }
-          break;
-
-      case PH_EVASIONS:
-      case PH_BAD_CAPTURES:
-          if (curMove != lastMove)
-              return (curMove++)->move;
-          break;
-
-      case PH_QCAPTURES:
-      case PH_QCHECKS:
-          while (curMove != lastMove)
-          {
-              Move move = (curMove++)->move;
+              break;
+
+          case PH_EVASIONS:
+          case PH_BAD_CAPTURES:
+              return move;
+
+          case PH_QCAPTURES:
+          case PH_QCHECKS:
               // Maybe postpone the legality check until after futility pruning?
               if (   move != ttMoves[0].move
                   && pos.pl_move_is_legal(move, pinned))
                   return move;
-          }
-          break;
+              break;
 
-      case PH_STOP:
-          return MOVE_NONE;
+          case PH_STOP:
+              return MOVE_NONE;
 
-      default:
-          assert(false);
-          break;
+          default:
+              assert(false);
+              break;
+          }
       }
       go_next_phase();
   }