X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=40081e8d0c24f7db6a31133f0713717c38f92066;hp=2b039161aa18cda7f12ec3aa490499c52da7a104;hb=3804effb341b3008326a1613923177eb83d02826;hpb=348f8241041a26cd9458beb8098306099f44a46a

diff --git a/src/main.cpp b/src/main.cpp
index 2b039161..40081e8d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,8 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2015-2019 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
 
   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,55 +18,36 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <cstdio>
 #include <iostream>
-#include <string>
 
 #include "bitboard.h"
-#include "evaluate.h"
 #include "position.h"
-#include "thread.h"
 #include "search.h"
-#include "ucioption.h"
-
-using namespace std;
+#include "thread.h"
+#include "tt.h"
+#include "uci.h"
+#include "endgame.h"
+#include "syzygy/tbprobe.h"
 
-extern void uci_loop();
-extern void benchmark(int argc, char* argv[]);
-extern void kpk_bitbase_init();
+namespace PSQT {
+  void init();
+}
 
 int main(int argc, char* argv[]) {
 
-  // Disable IO buffering for C and C++ standard libraries
-  setvbuf(stdin, NULL, _IONBF, 0);
-  setvbuf(stdout, NULL, _IONBF, 0);
-  cout.rdbuf()->pubsetbuf(NULL, 0);
-  cin.rdbuf()->pubsetbuf(NULL, 0);
+  std::cout << engine_info() << std::endl;
 
-  // Startup initializations
-  init_bitboards();
+  UCI::init(Options);
+  PSQT::init();
+  Bitboards::init();
   Position::init();
-  kpk_bitbase_init();
-  Search::init();
-  Threads.init();
-
-  if (argc < 2)
-  {
-      cout << engine_name() << " by " << engine_authors() << endl;
-
-      if (CpuHasPOPCNT)
-          cout << "Good! CPU has hardware POPCNT." << endl;
-
-      uci_loop(); // Enter the UCI loop and wait for user input
-  }
-  else if (string(argv[1]) == "bench" && argc < 8)
-      benchmark(argc, argv);
+  Bitbases::init();
+  Endgames::init();
+  Threads.set(Options["Threads"]);
+  Search::clear(); // After threads are up
 
-  else
-      cout << "Usage: stockfish bench [hash size = 128] [threads = 1] "
-           << "[limit = 12] [fen positions file = default] "
-           << "[limited by depth, time, nodes or perft = depth]" << endl;
+  UCI::loop(argc, argv);
 
-  Threads.exit();
+  Threads.set(0);
   return 0;
 }