X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=6c73629916a01afdbb24a29f25f1f352f80ca9e3;hp=94a0e5f9548afb864361ae826f2cef914703a302;hb=e33c94883fb1767a8aae29e8004d0621d296e33b;hpb=c1b60269a26b2ba1c8882b8f382f0e3e435c1962

diff --git a/src/movepick.h b/src/movepick.h
index 94a0e5f9..6c736299 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -35,7 +35,6 @@
 //// Types
 ////
 
-struct EvalInfo;
 struct SearchStack;
 
 /// MovePicker is a class which is used to pick one legal move at a time from
@@ -51,47 +50,27 @@ class MovePicker {
   MovePicker& operator=(const MovePicker&); // silence a warning under MSVC
 
 public:
-
-  enum MovegenPhase {
-    PH_TT_MOVE,        // Transposition table move
-    PH_MATE_KILLER,    // Mate killer from the current ply
-    PH_GOOD_CAPTURES,  // Queen promotions and captures with SEE values >= 0
-    PH_KILLERS,        // Killer moves from the current ply
-    PH_NONCAPTURES,    // Non-captures and underpromotions
-    PH_BAD_CAPTURES,   // Queen promotions and captures with SEE values < 0
-    PH_EVASIONS,       // Check evasions
-    PH_QCAPTURES,      // Captures in quiescence search
-    PH_QCHECKS,        // Non-capture checks in quiescence search
-    PH_STOP
-  };
-
-  MovePicker(const Position& p, bool pvnode, Move ttm, Depth d, const History& h, SearchStack* ss = NULL);
+  MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss = NULL);
   Move get_next_move();
   Move get_next_move(Lock& lock);
-  int number_of_moves() const;
+  int number_of_evasions() const;
   Bitboard discovered_check_candidates() const;
 
-  static void init_phase_table();
-
 private:
   void score_captures();
   void score_noncaptures();
   void score_evasions();
-  void score_qcaptures();
-  Move pick_move_from_list();
+  void go_next_phase();
 
   const Position& pos;
   const History& H;
-  Move ttMove, mateKiller, killer1, killer2;
-  Bitboard pinned, dc;
-  MoveStack moves[256], badCaptures[64];
-  bool pvNode;
-  Depth depth;
-  int phaseIndex;
-  int numOfMoves, numOfBadCaptures;
-  int movesPicked;
-  bool checkKillers, checkLegal;
+  MoveStack ttMoves[2], killers[2];
   bool finished;
+  int phase;
+  const uint8_t* phasePtr;
+  MoveStack *curMove, *lastMove, *lastBadCapture;
+  Bitboard dc, pinned;
+  MoveStack moves[256], badCaptures[64];
 };
 
 
@@ -99,13 +78,14 @@ private:
 //// Inline functions
 ////
 
-/// MovePicker::number_of_moves() simply returns the numOfMoves member
-/// variable. It is intended to be used in positions where the side to move
-/// is in check, for detecting checkmates or situations where there is only
-/// a single reply to check.
+/// MovePicker::number_of_evasions() simply returns the number of moves in
+/// evasions phase. It is intended to be used in positions where the side to
+/// move is in check, for detecting checkmates or situations where there is
+/// only a single reply to check.
+/// WARNING: It works as long as PH_EVASIONS is the _only_ phase for evasions.
 
-inline int MovePicker::number_of_moves() const {
-  return numOfMoves;
+inline int MovePicker::number_of_evasions() const {
+  return int(lastMove - moves);
 }
 
 /// MovePicker::discovered_check_candidates() returns a bitboard containing