Fix compilation after recent merge.

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 25d8f4158fdee3addb951b705ce805a6c418f17f..fbd6a7c9cbbb98181415e5c697281558d454c142 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,6 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
-  Copyright (C) 2004-2020 The Stockfish developers (see AUTHORS file)
+  Copyright (C) 2004-2023 The Stockfish developers (see AUTHORS file)
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -17,18 +17,20 @@
 */
 
 #include <deque>
+#include <cstddef>
 #include <iostream>
 #include <stack>
 #include <thread>
 
 #include "bitboard.h"
-#include "endgame.h"
+#include "evaluate.h"
+#include "misc.h"
 #include "position.h"
 #include "search.h"
 #include "thread.h"
-#include "tt.h"
+#include "tune.h"
+#include "types.h"
 #include "uci.h"
-#include "syzygy/tbprobe.h"
 
 #include <grpc/grpc.h>
 #include <grpc++/server.h>
@@ -43,6 +45,7 @@ using grpc::ServerContext;
 using grpc::Status;
 using grpc::StatusCode;
 using namespace hashprobe;
+using namespace Stockfish;
 
 Status HashProbeImpl::Probe(ServerContext* context,
                             const HashProbeRequest* request,
@@ -91,7 +94,7 @@ void HashProbeImpl::FillMove(Position *pos, Move move, HashProbeMove* decoded) {
                        pretty = "O-O-O";
                }
        } else if (type_of(moved_piece) == PAWN) {
-               if (type_of(move) == ENPASSANT || pos->piece_on(to) != NO_PIECE) {
+               if (type_of(move) == EN_PASSANT || pos->piece_on(to) != NO_PIECE) {
                        // Capture.
                        pretty = char('a' + file_of(from));
                        pretty += "x";
@@ -108,10 +111,10 @@ void HashProbeImpl::FillMove(Position *pos, Move move, HashProbeMove* decoded) {
                        // Remove all illegal moves to disambiguate.
                        Bitboard att_copy = attackers;
                        while (att_copy) {
-                               Square s = pop_lsb(&att_copy);
+                               Square s = pop_lsb(att_copy);
                                Move m = make_move(s, to);
                                if (!pos->pseudo_legal(m) || !pos->legal(m)) {
-                                       attackers &= ~SquareBB[s];
+                                       attackers &= ~square_bb(s);
                                }
                        }
                }
@@ -128,7 +131,7 @@ void HashProbeImpl::FillMove(Position *pos, Move move, HashProbeMove* decoded) {
                        }
                }
 
-               if (type_of(move) == ENPASSANT || pos->piece_on(to) != NO_PIECE) {
+               if (type_of(move) == EN_PASSANT || pos->piece_on(to) != NO_PIECE) {
                        pretty += "x";
                }
 
@@ -155,9 +158,10 @@ void HashProbeImpl::ProbeMove(Position* pos, std::deque<StateInfo>* setup_states
        TTEntry *entry = TT.probe(pos->key(), found);
        response->set_found(found);
        if (found) {
-               Value value = entry->value();
-               Value eval = entry->eval();
-               Bound bound = entry->bound();
+               TTEntry entry_copy = *entry;
+               Value value = entry_copy.value();
+               Value eval = entry_copy.eval();
+               Bound bound = entry_copy.bound();
 
                if (invert) {
                        value = -value;
@@ -169,9 +173,9 @@ void HashProbeImpl::ProbeMove(Position* pos, std::deque<StateInfo>* setup_states
                        }
                }
 
-               response->set_depth(entry->depth());
+               response->set_depth(entry_copy.depth());
                FillValue(eval, response->mutable_eval());
-               if (entry->depth() > DEPTH_NONE) {
+               if (entry_copy.depth() > DEPTH_NONE) {
                        FillValue(value, response->mutable_value());
                }
                response->set_bound(HashProbeLine::ValueBound(bound));
@@ -179,16 +183,20 @@ void HashProbeImpl::ProbeMove(Position* pos, std::deque<StateInfo>* setup_states
                // Follow the PV until we hit an illegal move.
                std::stack<Move> pv;
                std::set<Key> seen;
-               while (found && is_ok(entry->move()) &&
-                      pos->pseudo_legal(entry->move()) &&
-                      pos->legal(entry->move())) {
-                       FillMove(pos, entry->move(), response->add_pv());
+               while (is_ok(entry_copy.move()) &&
+                      pos->pseudo_legal(entry_copy.move()) &&
+                      pos->legal(entry_copy.move())) {
+                       FillMove(pos, entry_copy.move(), response->add_pv());
                        if (seen.count(pos->key())) break;
-                       pv.push(entry->move());
+                       pv.push(entry_copy.move());
                        seen.insert(pos->key());
                        setup_states->push_back(StateInfo());
-                       pos->do_move(entry->move(), setup_states->back());
+                       pos->do_move(entry_copy.move(), setup_states->back());
                        entry = TT.probe(pos->key(), found);
+                       if (!found) {
+                               break;
+                       }
+                       entry_copy = *entry;
                }
 
                // Unroll the PV back again, so the Position object remains unchanged.
@@ -202,7 +210,7 @@ void HashProbeImpl::ProbeMove(Position* pos, std::deque<StateInfo>* setup_states
 void HashProbeImpl::FillValue(Value value, HashProbeScore* score) {
        if (abs(value) < VALUE_MATE - MAX_PLY) {
                score->set_score_type(HashProbeScore::SCORE_CP);
-               score->set_score_cp(value * 100 / PawnValueEg);
+               score->set_score_cp(value * 100 / UCI::NormalizeToPawnValue);
        } else {
                score->set_score_type(HashProbeScore::SCORE_MATE);
                score->set_score_mate((value > 0 ? VALUE_MATE - value + 1 : -VALUE_MATE - value) / 2);
@@ -221,27 +229,21 @@ void HashProbeThread::Shutdown() {
        server->Shutdown();
 }
 
-namespace PSQT {
-  void init();
-}
-
 int main(int argc, char* argv[]) {
 
-  std::cout << engine_info() << std::endl;
+    std::cout << engine_info() << std::endl;
 
-  UCI::init(Options);
-  Tune::init();
-  PSQT::init();
-  Bitboards::init();
-  Position::init();
-  Bitbases::init();
-  Endgames::init();
-  Threads.set(size_t(Options["Threads"]));
-  Search::clear(); // After threads are up
-  Eval::init_NNUE();
+    CommandLine::init(argc, argv);
+    UCI::init(Options);
+    Tune::init();
+    Bitboards::init();
+    Position::init();
+    Threads.set(size_t(Options["Threads"]));
+    Search::clear();  // After threads are up
+    Eval::NNUE::init();
 
-  UCI::loop(argc, argv);
+    UCI::loop(argc, argv);
 
-  Threads.set(0);
-  return 0;
+    Threads.set(0);
+    return 0;
 }