X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=2b039161aa18cda7f12ec3aa490499c52da7a104;hp=02f2b87d92f00a7046c335b7d42cfbb41bd5de57;hb=348f8241041a26cd9458beb8098306099f44a46a;hpb=7f367e6019289e65b902a5ebf7e3686db5cefdef

diff --git a/src/main.cpp b/src/main.cpp
index 02f2b87d..2b039161 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,9 +17,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// To profile with callgrind uncomment following line
-//#define USE_CALLGRIND
-
 #include <cstdio>
 #include <iostream>
 #include <string>
@@ -28,17 +25,14 @@
 #include "evaluate.h"
 #include "position.h"
 #include "thread.h"
+#include "search.h"
 #include "ucioption.h"
 
-#ifdef USE_CALLGRIND
-#include <valgrind/callgrind.h>
-#endif
-
 using namespace std;
 
-extern bool execute_uci_command(const string& cmd);
+extern void uci_loop();
 extern void benchmark(int argc, char* argv[]);
-extern void init_kpk_bitbase();
+extern void kpk_bitbase_init();
 
 int main(int argc, char* argv[]) {
 
@@ -50,39 +44,28 @@ int main(int argc, char* argv[]) {
 
   // Startup initializations
   init_bitboards();
-  init_uci_options();
-  Position::init_zobrist();
-  Position::init_piece_square_tables();
-  init_eval(1);
-  init_kpk_bitbase();
-  init_threads();
-
-#ifdef USE_CALLGRIND
-  CALLGRIND_START_INSTRUMENTATION;
-#endif
+  Position::init();
+  kpk_bitbase_init();
+  Search::init();
+  Threads.init();
 
   if (argc < 2)
   {
-      // Print copyright notice
       cout << engine_name() << " by " << engine_authors() << endl;
 
       if (CpuHasPOPCNT)
           cout << "Good! CPU has hardware POPCNT." << endl;
 
-      // Wait for a command from the user, and passes this command to
-      // execute_uci_command() and also intercepts EOF from stdin to
-      // ensure that we exit gracefully if the GUI dies unexpectedly.
-      string cmd;
-      while (getline(cin, cmd) && execute_uci_command(cmd)) {}
+      uci_loop(); // Enter the UCI loop and wait for user input
   }
   else if (string(argv[1]) == "bench" && argc < 8)
       benchmark(argc, argv);
+
   else
       cout << "Usage: stockfish bench [hash size = 128] [threads = 1] "
            << "[limit = 12] [fen positions file = default] "
-           << "[depth, time, perft or node limited = depth]" << endl;
+           << "[limited by depth, time, nodes or perft = depth]" << endl;
 
-  exit_threads();
-  quit_eval();
+  Threads.exit();
   return 0;
 }