X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=3d26b63ac663e0f40e874c1cb75313d99ab191a4;hp=3dcb3f6d9eb72c0777bee35146056acd787981a7;hb=a6e0f62a4f83bf4303e920d5f689de7cbc0467e8;hpb=32d3a07c6710e84d78999cb69c6a866b0bfff482

diff --git a/src/main.cpp b/src/main.cpp
index 3dcb3f6d..3d26b63a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, 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
@@ -25,34 +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[]) {
 
-  cout << engine_info() << endl;
+  std::cout << engine_info() << std::endl;
 
-  bitboards_init();
+  UCI::init(Options);
+  Bitboards::init();
   Position::init();
-  kpk_bitbase_init();
+  Bitbases::init_kpk();
   Search::init();
-  Threads.init();
   Eval::init();
+  Threads.init();
   TT.set_size(Options["Hash"]);
 
-  if (argc == 1)
-      uci_loop();
+  std::string args;
+
+  for (int i = 1; i < argc; i++)
+      args += std::string(argv[i]) + " ";
 
-  else if (string(argv[1]) == "bench")
-      benchmark(argc, argv);
+  UCI::loop(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;
+  Threads.exit();
 }