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

diff --git a/src/main.cpp b/src/main.cpp
index b4870606..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-2010 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
@@ -17,73 +17,36 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// To profile with callgrind uncomment following line
-//#define USE_CALLGRIND
-
-
-////
-//// Includes
-////
-
 #include <iostream>
 #include <string>
 
-#include "benchmark.h"
-#include "bitcount.h"
-#include "misc.h"
-#include "uci.h"
-
-#ifdef USE_CALLGRIND
-#include <valgrind/callgrind.h>
-#endif
-
-using namespace std;
-
-
-////
-//// Functions
-////
-
-int main(int argc, char *argv[]) {
+#include "bitboard.h"
+#include "evaluate.h"
+#include "position.h"
+#include "search.h"
+#include "thread.h"
+#include "tt.h"
+#include "ucioption.h"
 
-  // Disable IO buffering
-  cout.rdbuf()->pubsetbuf(NULL, 0);
-  cin.rdbuf()->pubsetbuf(NULL, 0);
+int main(int argc, char* argv[]) {
 
-  // Initialization through global resources manager
-  Application::initialize();
+  std::cout << engine_info() << std::endl;
 
-#ifdef USE_CALLGRIND
-  CALLGRIND_START_INSTRUMENTATION;
-#endif
+  UCI::init(Options);
+  Bitboards::init();
+  Position::init();
+  Bitbases::init_kpk();
+  Search::init();
+  Eval::init();
+  Threads.init();
+  TT.set_size(Options["Hash"]);
 
-  // Process command line arguments if any
-  if (argc > 1)
-  {
-      if (string(argv[1]) != "bench" || argc < 4 || argc > 8)
-          cout << "Usage: stockfish bench <hash size> <threads> "
-               << "[time = 60s] [fen positions file = default] "
-               << "[time, depth, perft or node limited = time] "
-               << "[timing file name = none]" << endl;
-      else
-      {
-          string time = argc > 4 ? argv[4] : "60";
-          string fen = argc > 5 ? argv[5] : "default";
-          string lim = argc > 6 ? argv[6] : "time";
-          string tim = argc > 7 ? argv[7] : "";
-          benchmark(string(argv[2]) + " " + string(argv[3]) + " " + time + " " + fen + " " + lim + " " + tim);
-      }
-      return 0;
-  }
+  std::string args;
 
-  // Print copyright notice
-  cout << engine_name()
-       << ". By Tord Romstad, Marco Costalba, Joona Kiiski." << endl;
+  for (int i = 1; i < argc; i++)
+      args += std::string(argv[i]) + " ";
 
-  if (CpuHasPOPCNT)
-      cout << "Good! CPU has hardware POPCNT. We will use it." << endl;
+  UCI::loop(args);
 
-  // Enter UCI mode
-  uci_main_loop();
-  return 0;
+  Threads.exit();
 }