X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=6fee591d8ff18b9826298a815d6dcf2209c13470;hp=505f2ef3831b2632094d65ee86696562dc38e448;hb=dcd8ce70941e9b8d5180eb43865bb9819e424c19;hpb=32c504076f5a1d5c84f88c2d30a11c25ea2e5a6e

diff --git a/src/main.cpp b/src/main.cpp
index 505f2ef3..6fee591d 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-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2015-2016 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
@@ -18,7 +19,6 @@
 */
 
 #include <iostream>
-#include <string>
 
 #include "bitboard.h"
 #include "evaluate.h"
@@ -26,34 +26,27 @@
 #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();
+#include "uci.h"
+#include "syzygy/tbprobe.h"
 
 int main(int argc, char* argv[]) {
 
-  cout << engine_info() << endl;
+  std::cout << engine_info() << std::endl;
 
-  bitboards_init();
+  UCI::init(Options);
+  PSQT::init();
+  Bitboards::init();
   Position::init();
-  kpk_bitbase_init();
+  Bitbases::init();
   Search::init();
-  Threads.init();
   Eval::init();
-  TT.set_size(Options["Hash"]);
-
-  if (argc == 1)
-      uci_loop();
+  Pawns::init();
+  Threads.init();
+  Tablebases::init(Options["SyzygyPath"]);
+  TT.resize(Options["Hash"]);
 
-  else if (string(argv[1]) == "bench")
-      benchmark(argc, argv);
+  UCI::loop(argc, argv);
 
-  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();
+  return 0;
 }