Use pointers instead of array indices in MovePicker

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index 3d87b9c3b5c7998121366efb615f58525247d5f5..ced0a051654685cbe48fb2c99662d7604de4d38f 100644 (file)
--- 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,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, 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();
+  void go_next_phase();
 
   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;
-  bool checkKillers, checkLegal;
+  const History& H;
+  Move ttMoves[2], killers[2];
+  const MovegenPhaseT* phasePtr;
+  int phase, movesPicked, numOfBadCaptures;
   bool finished;
+  Bitboard dc, pinned;
+  MoveStack *curMove, *lastMove;
+  MoveStack moves[256], badCaptures[64];
 };
 
 
@@ -105,7 +99,7 @@ private:
 /// a single reply to check.
 
 inline int MovePicker::number_of_moves() const {
-  return numOfMoves;
+  return int(lastMove - moves);
 }
 
 /// MovePicker::discovered_check_candidates() returns a bitboard containing