X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=56af9932a049e30b2977a0f730bcc943c0d14299;hp=4b716dded6ec859ca24e7afa67216dcdd4865e0d;hb=ca3835857435590865fd41aac9bf4c1cda76dfc3;hpb=786564068bb22c750c41649733d4aa6733accaec

diff --git a/src/main.cpp b/src/main.cpp
index 4b716dde..56af9932 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-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2015 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
@@ -17,71 +17,35 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// To profile with callgrind uncomment following line
-//#define USE_CALLGRIND
-
-#include <cstdio>
 #include <iostream>
-#include <string>
 
 #include "bitboard.h"
 #include "evaluate.h"
 #include "position.h"
+#include "search.h"
 #include "thread.h"
-#include "ucioption.h"
-
-#ifdef USE_CALLGRIND
-#include <valgrind/callgrind.h>
-#endif
-
-using namespace std;
-
-extern bool execute_uci_command(const string& cmd);
-extern void benchmark(int argc, char* argv[]);
-extern void init_kpk_bitbase();
+#include "tt.h"
+#include "uci.h"
+#include "syzygy/tbprobe.h"
 
 int main(int argc, char* argv[]) {
 
-  // Disable IO buffering for C and C++ standard libraries
-  setvbuf(stdin, NULL, _IONBF, 0);
-  setvbuf(stdout, NULL, _IONBF, 0);
-  cout.rdbuf()->pubsetbuf(NULL, 0);
-  cin.rdbuf()->pubsetbuf(NULL, 0);
-
-  // Startup initializations
-  init_bitboards();
-  Position::init_zobrist();
-  Position::init_piece_square_tables();
-  init_eval(1);
-  init_kpk_bitbase();
-  init_threads();
-
-#ifdef USE_CALLGRIND
-  CALLGRIND_START_INSTRUMENTATION;
-#endif
-
-  if (argc < 2)
-  {
-      // Print copyright notice
-      cout << engine_name() << " by " << engine_authors() << endl;
+  std::cout << engine_info() << std::endl;
 
-      if (CpuHasPOPCNT)
-          cout << "Good! CPU has hardware POPCNT." << endl;
+  UCI::init(Options);
+  PSQT::init();
+  Bitboards::init();
+  Position::init();
+  Bitbases::init();
+  Search::init();
+  Eval::init();
+  Pawns::init();
+  Threads.init();
+  Tablebases::init(Options["SyzygyPath"]);
+  TT.resize(Options["Hash"]);
 
-      // Wait for a command from the user, and passes this command to
-      // execute_uci_command() and also intercepts EOF from stdin to
-      // ensure that we exit gracefully if the GUI dies unexpectedly.
-      string cmd;
-      while (getline(cin, cmd) && execute_uci_command(cmd)) {}
-  }
-  else if (string(argv[1]) == "bench" && argc < 8)
-      benchmark(argc, argv);
-  else
-      cout << "Usage: stockfish bench [hash size = 128] [threads = 1] "
-           << "[limit = 12] [fen positions file = default] "
-           << "[depth, time, perft or node limited = depth]" << endl;
+  UCI::loop(argc, argv);
 
-  exit_threads();
-  quit_eval();
+  Threads.exit();
   return 0;
 }