Retire mateKiller

[stockfish] / src / movepick.cpp

diff --git a/src/movepick.cpp b/src/movepick.cpp
index 4be0f69a6ba5eef513fc02cbfd888c9ffb9e6357..12fffdccd1d5ab0399ccbbc16b3e94fc573041d6 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -46,9 +46,9 @@ namespace {
   const uint8_t QsearchWithoutChecksTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_STOP };
 }
 
+bool MovePicker::isBadCapture() const { return phase == PH_BAD_CAPTURES; }
 
-/// Constructor for the MovePicker class. Apart from the position for which
-/// it is asked to pick legal moves, MovePicker also wants some information
+/// Constructor for the MovePicker class. As arguments we pass information
 /// to help it to return the presumably good moves first, to decide which
 /// moves to return (in the quiescence search, for instance, we only want to
 /// search captures, promotions and some checks) and about how important good
@@ -56,24 +56,18 @@ namespace {
 
 MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h,
                        SearchStack* ss, Value beta) : pos(p), H(h) {
-  int searchTT = ttm;
-  ttMoves[0].move = ttm;
   badCaptureThreshold = 0;
   badCaptures = moves + MAX_MOVES;
 
   assert(d > DEPTH_ZERO);
 
-  pinned = p.pinned_pieces(pos.side_to_move());
-
   if (p.in_check())
   {
-      ttMoves[1].move = killers[0].move = killers[1].move = MOVE_NONE;
+      killers[0].move = killers[1].move = MOVE_NONE;
       phasePtr = EvasionTable;
   }
   else
   {
-      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];
 
@@ -85,20 +79,16 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h,
       phasePtr = MainSearchTable;
   }
 
-  phasePtr += int(!searchTT) - 1;
+  ttMove = (ttm && pos.move_is_pl(ttm) ? ttm : MOVE_NONE);
+  phasePtr += int(ttMove == MOVE_NONE) - 1;
   go_next_phase();
 }
 
 MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h)
                       : pos(p), H(h) {
-  int searchTT = ttm;
-  ttMoves[0].move = ttm;
-  ttMoves[1].move = MOVE_NONE;
 
   assert(d <= DEPTH_ZERO);
 
-  pinned = p.pinned_pieces(pos.side_to_move());
-
   if (p.in_check())
       phasePtr = EvasionTable;
   else if (d >= DEPTH_QS_CHECKS)
@@ -111,10 +101,11 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h)
       // qsearch tree explosion due to a possible perpetual check or
       // similar rare cases when TT table is full.
       if (ttm != MOVE_NONE && !pos.move_is_capture(ttm) && !move_is_promotion(ttm))
-          searchTT = ttMoves[0].move = MOVE_NONE;
+          ttm = MOVE_NONE;
   }
 
-  phasePtr += int(!searchTT) - 1;
+  ttMove = (ttm && pos.move_is_pl(ttm) ? ttm : MOVE_NONE);
+  phasePtr += int(ttMove == MOVE_NONE) - 1;
   go_next_phase();
 }
 
@@ -129,8 +120,7 @@ void MovePicker::go_next_phase() {
   switch (phase) {
 
   case PH_TT_MOVES:
-      curMove = ttMoves;
-      lastMove = curMove + 2;
+      lastMove = curMove + 1;
       return;
 
   case PH_GOOD_CAPTURES:
@@ -254,7 +244,7 @@ void MovePicker::score_evasions() {
 }
 
 /// MovePicker::get_next_move() is the most important method of the MovePicker
-/// class. It returns a new legal move every time it is called, until there
+/// class. It returns a new pseudo legal move every time it is called, until there
 /// are no more moves left. It picks the move with the biggest score from a list
 /// of generated moves taking care not to return the tt move if has already been
 /// searched previously. Note that this function is not thread safe so should be
@@ -272,17 +262,13 @@ Move MovePicker::get_next_move() {
       switch (phase) {
 
       case PH_TT_MOVES:
-          move = (curMove++)->move;
-          if (   move != MOVE_NONE
-              && pos.move_is_legal(move, pinned))
-              return move;
+          curMove++;
+          return ttMove;
           break;
 
       case PH_GOOD_CAPTURES:
           move = pick_best(curMove++, lastMove).move;
-          if (   move != ttMoves[0].move
-              && move != ttMoves[1].move
-              && pos.pl_move_is_legal(move, pinned))
+          if (move != ttMove)
           {
               // Check for a non negative SEE now
               int seeValue = pos.see_sign(move);
@@ -290,7 +276,7 @@ Move MovePicker::get_next_move() {
                   return move;
 
               // Losing capture, move it to the tail of the array, note
-              // that move has now been already checked for legality.
+              // that move has now been already checked for pseudo legality.
               (--badCaptures)->move = move;
               badCaptures->score = seeValue;
           }
@@ -299,9 +285,8 @@ Move MovePicker::get_next_move() {
       case PH_KILLERS:
           move = (curMove++)->move;
           if (   move != MOVE_NONE
-              && pos.move_is_legal(move, pinned)
-              && move != ttMoves[0].move
-              && move != ttMoves[1].move
+              && pos.move_is_pl(move)
+              && move != ttMove
               && !pos.move_is_capture(move))
               return move;
           break;
@@ -312,11 +297,9 @@ Move MovePicker::get_next_move() {
               insertion_sort<MoveStack>(lastGoodNonCapture, lastMove);
 
           move = (curMove++)->move;
-          if (   move != ttMoves[0].move
-              && move != ttMoves[1].move
+          if (   move != ttMove
               && move != killers[0].move
-              && move != killers[1].move
-              && pos.pl_move_is_legal(move, pinned))
+              && move != killers[1].move)
               return move;
           break;
 
@@ -327,15 +310,13 @@ Move MovePicker::get_next_move() {
       case PH_EVASIONS:
       case PH_QCAPTURES:
           move = pick_best(curMove++, lastMove).move;
-          if (   move != ttMoves[0].move
-              && pos.pl_move_is_legal(move, pinned))
+          if (move != ttMove)
               return move;
           break;
 
       case PH_QCHECKS:
           move = (curMove++)->move;
-          if (   move != ttMoves[0].move
-              && pos.pl_move_is_legal(move, pinned))
+          if (move != ttMove)
               return move;
           break;