X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=d0e593daf61c6ea4f13ca3b68b0395d7053da4f8;hp=37a031cbbc54b9fb0ba00f661fecba1585dce33d;hb=4b19430103ac75b574a6b269db447d359814b603;hpb=d8e56cbe54378c91fbbd9e6f6cee8ef5a27b02e9

diff --git a/src/main.cpp b/src/main.cpp
index 37a031cb..d0e593da 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -25,36 +25,26 @@
 #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();
+  std::cout << engine_info() << std::endl;
+
+  UCI::init(Options);
+  Bitboards::init();
   Position::init();
-  kpk_bitbase_init();
+  Bitbases::init_kpk();
   Search::init();
   Threads.init();
-  eval_init();
+  Eval::init();
   TT.set_size(Options["Hash"]);
 
-  cout << engine_info() << endl;
-
-  if (argc == 1)
-      uci_loop();
-
-  else if (string(argv[1]) == "bench")
-      benchmark(argc, argv);
+  std::string args;
 
-  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;
+  for (int i = 1; i < argc; i++)
+      args += std::string(argv[i]) + " ";
 
-  Threads.exit();
+  UCI::loop(args);
 }