X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.h;h=afa12b3a4ee6b56104918178aeee4bdd50e6845a;hp=7d7cce0e027ad95e67a55303f9a698870ebafc7e;hb=4739037f967ac3c818907e89cc88c7b97021d027;hpb=40f5abba104b411ec5234e2c93b05bba8e6bd3c8

diff --git a/src/search.h b/src/search.h
index 7d7cce0e..afa12b3a 100644
--- a/src/search.h
+++ b/src/search.h
@@ -32,12 +32,26 @@ struct SplitPoint;
 
 namespace Search {
 
+struct PVEntry {
+  Move pv[MAX_PLY+1];
+
+  void update(Move move, PVEntry* child) {
+      pv[0] = move;
+
+      int i = 1;
+      for (; child && i < MAX_PLY && child->pv[i - 1] != MOVE_NONE; ++i)
+          pv[i] = child->pv[i - 1];
+      pv[i] = MOVE_NONE;
+  } 
+};
+
 /// The Stack struct keeps track of the information we need to remember from
 /// nodes shallower and deeper in the tree during the search. Each search thread
 /// has its own array of Stack objects, indexed by the current ply.
 
 struct Stack {
   SplitPoint* splitPoint;
+  PVEntry* pv;
   int ply;
   Move currentMove;
   Move ttMove;
@@ -45,7 +59,7 @@ struct Stack {
   Move killers[2];
   Depth reduction;
   Value staticEval;
-  int skipNullMove;
+  bool skipNullMove;
 };
 
 
@@ -62,7 +76,6 @@ struct RootMove {
   bool operator<(const RootMove& m) const { return score > m.score; } // Ascending sort
   bool operator==(const Move& m) const { return pv[0] == m; }
 
-  void extract_pv_from_tt(Position& pos);
   void insert_pv_in_tt(Position& pos);
 
   Value score;
@@ -78,13 +91,14 @@ struct RootMove {
 struct LimitsType {
 
   LimitsType() { // Using memset on a std::vector is undefined behavior
-    time[WHITE] = time[BLACK] = inc[WHITE] = inc[BLACK] = movestogo =
-    depth = nodes = movetime = mate = infinite = ponder = 0;
+    nodes = time[WHITE] = time[BLACK] = inc[WHITE] = inc[BLACK] = movestogo =
+    depth = movetime = mate = infinite = ponder = 0;
   }
   bool use_time_management() const { return !(mate | movetime | depth | nodes | infinite); }
 
   std::vector<Move> searchmoves;
-  int time[COLOR_NB], inc[COLOR_NB], movestogo, depth, nodes, movetime, mate, infinite, ponder;
+  int time[COLOR_NB], inc[COLOR_NB], movestogo, depth, movetime, mate, infinite, ponder;
+  int64_t nodes;
 };
 
 
@@ -104,9 +118,9 @@ extern Position RootPos;
 extern Time::point SearchTime;
 extern StateStackPtr SetupStates;
 
-extern void init();
-extern uint64_t perft(Position& pos, Depth depth);
-extern void think();
+void init();
+void think();
+template<bool Root> uint64_t perft(Position& pos, Depth depth);
 
 } // namespace Search