X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=063ce76e3503d8b6e27107444c7548fb69e8ce84;hp=765cd2caa52b93d52ff9c7bbe0fb984b43d0676b;hb=7edd1f7ccd500ad3fb6959ca18415ed4b8808313;hpb=ad43ce143664953087b44dd3b4324f77c212bd46

diff --git a/src/main.cpp b/src/main.cpp
index 765cd2ca..063ce76e 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-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2015-2017 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,40 +19,33 @@
 */
 
 #include <iostream>
-#include <string>
 
 #include "bitboard.h"
-#include "misc.h"
 #include "position.h"
 #include "search.h"
 #include "thread.h"
+#include "uci.h"
+#include "syzygy/tbprobe.h"
 
-using namespace std;
-
-extern void uci_loop();
-extern void benchmark(int argc, char* argv[]);
-extern void kpk_bitbase_init();
+namespace PSQT {
+  void init();
+}
 
 int main(int argc, char* argv[]) {
 
-  bitboards_init();
+  std::cout << engine_info() << std::endl;
+
+  UCI::init(Options);
+  PSQT::init();
+  Bitboards::init();
   Position::init();
-  kpk_bitbase_init();
+  Bitbases::init();
   Search::init();
+  Pawns::init();
   Threads.init();
 
-  cout << engine_info() << endl;
-
-  if (argc == 1)
-      uci_loop();
-
-  else if (string(argv[1]) == "bench")
-      benchmark(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;
+  UCI::loop(argc, argv);
 
   Threads.exit();
+  return 0;
 }