X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmain.cpp;h=557c8c2789b77fb8b830801ae030ffe0582f2bf1;hb=HEAD;hp=d24891d9e659f7aab9cdd7ecf16390597b54abc9;hpb=07c71689957c7a025a9b91d3cd2534ffff9dc5e0;p=stockfish

diff --git a/src/main.cpp b/src/main.cpp
index d24891d9..fbd6a7c9 100644
--- 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-2021 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,19 @@
 */
 
 #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 "psqt.h"
 #include "search.h"
-#include "syzygy/tbprobe.h"
 #include "thread.h"
-#include "tt.h"
+#include "tune.h"
+#include "types.h"
 #include "uci.h"
 
 #include <grpc/grpc.h>
@@ -113,7 +114,7 @@ void HashProbeImpl::FillMove(Position *pos, Move move, HashProbeMove* decoded) {
 				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);
 				}
 			}
 		}
@@ -157,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;
@@ -171,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));
@@ -181,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.
@@ -204,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);
@@ -225,22 +231,19 @@ void HashProbeThread::Shutdown() {
 
 int main(int argc, char* argv[]) {
 
-  std::cout << engine_info() << std::endl;
+    std::cout << engine_info() << std::endl;
 
-  CommandLine::init(argc, argv);
-  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::NNUE::init();
+    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;
 }