X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=46cf69ddce30ec4f51f51b83f92b04d740d0e4e5;hp=500ed8b99a3571aecece8502a3fd60dee36010cf;hb=f6d245291664e1a521b3810051365c48c82bac78;hpb=d3c4618b3ac0e444ce3b9dd894b87f86a50863c5

diff --git a/src/movepick.h b/src/movepick.h
index 500ed8b9..46cf69dd 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -26,6 +26,7 @@
 ////
 
 #include "depth.h"
+#include "history.h"
 #include "lock.h"
 #include "position.h"
 
@@ -34,10 +35,22 @@
 //// Types
 ////
 
-struct EvalInfo;
 struct SearchStack;
 
-extern SearchStack EmptySearchStack;
+enum MovegenPhase {
+  PH_NULL_MOVE,      // Null move
+  PH_TT_MOVES,       // Transposition table move and mate killer
+  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
+};
+
+typedef uint8_t MovegenPhaseT;
 
 /// MovePicker is a class which is used to pick one legal move at a time from
 /// the current position. It is initialized with a Position object and a few
@@ -52,46 +65,26 @@ 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_BAD_CAPTURES,   // Queen promotions and captures with SEE values < 0
-    PH_KILLER_1,       // Killer move 1 from the current ply (not used yet).
-    PH_KILLER_2,       // Killer move 2 from the current ply (not used yet).
-    PH_NONCAPTURES,    // Non-captures and underpromotions
-    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, const SearchStack& ss, Depth d);
+  MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss = NULL, bool useNullMove = false);
   Move get_next_move();
   Move get_next_move(Lock& lock);
   int number_of_moves() 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();
 
   const Position& pos;
-  Move ttMove, mateKiller, killer1, killer2;
-  Bitboard pinned, dc;
-  MoveStack moves[256], badCaptures[64];
-  bool pvNode;
-  Depth depth;
-  int phaseIndex;
-  int numOfMoves, numOfBadCaptures;
-  int movesPicked;
+  const History& H;
+  Move ttMoves[2], killers[2];
+  const MovegenPhaseT* phasePtr;
+  int movesPicked, numOfMoves, numOfBadCaptures;
   bool finished;
+  Bitboard dc, pinned;
+  MoveStack moves[256], badCaptures[64];
 };