X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=e4ebcc30140d5550c9b216d15da2a1833ecdb661;hp=1b2fdf9dec5efff93d657b46ff042b31ef516254;hb=8dcb4bc3cce1f487cfac65ed20d21378d0f39b2e;hpb=9934b8ec31483ceb98c19dfe4fface14fe384b32

diff --git a/src/main.cpp b/src/main.cpp
index 1b2fdf9d..e4ebcc30 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -25,41 +25,28 @@
 #include "position.h"
 #include "search.h"
 #include "thread.h"
+#include "tt.h"
 #include "ucioption.h"
 
-using namespace std;
-
-extern void uci_loop();
-extern void benchmark(int argc, char* argv[]);
-extern void kpk_bitbase_init();
-
 int main(int argc, char* argv[]) {
 
-  bitboards_init();
-  Position::init();
-  kpk_bitbase_init();
+  std::cout << engine_info() << std::endl;
+
+  UCI::init(Options);
+  Bitboards::init();
+  Zobrist::init();
+  Bitbases::init_kpk();
   Search::init();
-  Threads.init();
   Eval::init();
+  Threads.init();
   TT.set_size(Options["Hash"]);
 
-  // Don't sync with C library I/O buffers, faster but now using printf()
-  // or scanf() could yield to issues because buffers are independent.
-  cout.sync_with_stdio(false);
-  cin.sync_with_stdio(false);
-
-  cout << engine_info() << endl;
-
-  if (argc == 1)
-      uci_loop();
+  std::string args;
 
-  else if (string(argv[1]) == "bench")
-      benchmark(argc, argv);
+  for (int i = 1; i < argc; i++)
+      args += std::string(argv[i]) + " ";
 
-  else
-      cerr << "\nUsage: stockfish bench [hash size = 128] [threads = 1] "
-           << "[limit = 12] [fen positions file = default] "
-           << "[limited by depth, time, nodes or perft = depth]" << endl;
+  UCI::loop(args);
 
   Threads.exit();
 }