X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=6b7483eb99c0a782f529b71cbb950e8aaa7a791a;hp=a9cc245dcb570702d316f4736152d550457fbef2;hb=e9de96f0e417dc706882b645d14dbf41e7ccc467;hpb=9ab84a816539ade23868f0383e39634e6ab88df5

diff --git a/src/movepick.cpp b/src/movepick.cpp
index a9cc245d..6b7483eb 100644
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -40,9 +40,7 @@
 namespace {
 
   CACHE_LINE_ALIGNMENT
-  const MovegenPhaseT MainSearchPhaseTable[] = { PH_NULL_MOVE, PH_TT_MOVES, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP};
-  const MovegenPhaseT MainSearchNoNullPhaseTable[] = { PH_TT_MOVES, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP};
-  const MovegenPhaseT LowSearchPhaseTable[]  = { PH_TT_MOVES, PH_NULL_MOVE, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP};
+  const MovegenPhaseT MainSearchPhaseTable[] = { PH_TT_MOVES, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP};
   const MovegenPhaseT EvasionsPhaseTable[] = { PH_EVASIONS, PH_STOP};
   const MovegenPhaseT QsearchWithChecksPhaseTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_QCHECKS, PH_STOP};
   const MovegenPhaseT QsearchWithoutChecksPhaseTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_STOP};
@@ -62,7 +60,7 @@ namespace {
 /// move ordering is at the current node.
 
 MovePicker::MovePicker(const Position& p, Move ttm, Depth d,
-                       const History& h, SearchStack* ss, bool useNullMove) : pos(p), H(h) {
+                       const History& h, SearchStack* ss) : pos(p), H(h) {
   ttMoves[0].move = ttm;
   if (ss)
   {
@@ -82,10 +80,8 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d,
 
   if (p.is_check())
       phasePtr = EvasionsPhaseTable;
-  else if (d >= Depth(3 * OnePly))
-      phasePtr = useNullMove ? MainSearchPhaseTable : MainSearchNoNullPhaseTable;
   else if (d > Depth(0))
-      phasePtr = useNullMove ? LowSearchPhaseTable : MainSearchNoNullPhaseTable;
+      phasePtr = MainSearchPhaseTable;
   else if (d == Depth(0))
       phasePtr = QsearchWithChecksPhaseTable;
   else
@@ -105,9 +101,6 @@ void MovePicker::go_next_phase() {
   phase = *(++phasePtr);
   switch (phase) {
 
-  case PH_NULL_MOVE:
-      return;
-
   case PH_TT_MOVES:
       curMove = ttMoves;
       lastMove = curMove + 2;
@@ -258,10 +251,6 @@ Move MovePicker::get_next_move() {
   {
       switch (phase) {
 
-      case PH_NULL_MOVE:
-          go_next_phase();
-          return MOVE_NULL;
-
       case PH_TT_MOVES:
           while (curMove != lastMove)
           {