X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.h;h=2fd160b68a6d9ab5a58f45e8321880c9ab3d9b98;hp=ab1076cd61891559d84d198940880e6cbf988f61;hb=bcbab1937670ca39ddb0a216ff9a787e56b79b3a;hpb=a5869d8d2532c6bb8dbcba7d74331c0ac0230482 diff --git a/src/search.h b/src/search.h index ab1076cd..2fd160b6 100644 --- a/src/search.h +++ b/src/search.h @@ -20,7 +20,6 @@ #ifndef SEARCH_H_INCLUDED #define SEARCH_H_INCLUDED -#include #include #include #include @@ -41,11 +40,12 @@ struct Stack { SplitPoint* splitPoint; int ply; Move currentMove; + Move ttMove; Move excludedMove; Move killers[2]; Depth reduction; Value staticEval; - int skipNullMove; + bool skipNullMove; }; @@ -77,10 +77,15 @@ struct RootMove { struct LimitsType { - LimitsType() { std::memset(this, 0, sizeof(LimitsType)); } + LimitsType() { // Using memset on a std::vector is undefined behavior + 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); } - int time[COLOR_NB], inc[COLOR_NB], movestogo, depth, nodes, movetime, mate, infinite, ponder; + std::vector searchmoves; + int time[COLOR_NB], inc[COLOR_NB], movestogo, depth, movetime, mate, infinite, ponder; + int64_t nodes; }; @@ -88,7 +93,7 @@ struct LimitsType { /// typically in an async fashion e.g. to stop the search by the GUI. struct SignalsType { - bool stopOnPonderhit, firstRootMove, stop, failedLowAtRoot; + bool stop, stopOnPonderhit, firstRootMove, failedLowAtRoot; }; typedef std::auto_ptr > StateStackPtr; @@ -97,13 +102,12 @@ extern volatile SignalsType Signals; extern LimitsType Limits; extern std::vector RootMoves; extern Position RootPos; -extern Color RootColor; -extern Time::point SearchTime, IterationTime; +extern Time::point SearchTime; extern StateStackPtr SetupStates; extern void init(); -extern size_t perft(Position& pos, Depth depth); extern void think(); +template uint64_t perft(Position& pos, Depth depth); } // namespace Search