Retire struct OptionsMap

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 1d5c6ea7d50d24cb75697f955be3edd291316069..e7540f9c68f0169c02a767aacd9a908d46b37ab7 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -25,19 +25,18 @@
 #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();
+void uci_loop(const std::string&);
+void kpk_bitbase_init();
 
 int main(int argc, char* argv[]) {
 
-  cout << engine_info() << endl;
+  std::cout << engine_info() << std::endl;
 
-  bitboards_init();
+  UCIOptions::init(Options);
+  Bitboards::init();
   Position::init();
   kpk_bitbase_init();
   Search::init();
@@ -45,16 +44,10 @@ int main(int argc, char* argv[]) {
   Eval::init();
   TT.set_size(Options["Hash"]);
 
-  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);
 }