X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=435e436c3fe7a39e7ebd51b411b5676d6245dcfe;hp=359a0d22c2a5016ee135c34d2d24afd510b8cf83;hb=HEAD;hpb=88ef68dde5882648b54cce2d1fb024c926596054

diff --git a/src/main.cpp b/src/main.cpp
index 359a0d22..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);
 				}
 			}
 		}
@@ -209,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);
@@ -230,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;
 }