X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=e4ebcc30140d5550c9b216d15da2a1833ecdb661;hp=f9ed8de52c361fd10c3f8e8b280e8f711af30314;hb=55bd27b8f08a151128d7065fa2819aa3e9605299;hpb=efeb37c33f15a903dbe5706529a7a26511e9ca58

diff --git a/src/main.cpp b/src/main.cpp
index f9ed8de5..e4ebcc30 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-2012 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,86 +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 "bitboard.h"
-#include "bitcount.h"
-#include "direction.h"
-#include "endgame.h"
 #include "evaluate.h"
-#include "material.h"
-#include "misc.h"
 #include "position.h"
 #include "search.h"
 #include "thread.h"
+#include "tt.h"
 #include "ucioption.h"
 
-#ifdef USE_CALLGRIND
-#include <valgrind/callgrind.h>
-#endif
-
-using namespace std;
-
-extern void uci_main_loop();
-extern void benchmark(int argc, char* argv[]);
-
-////
-//// Functions
-////
-
 int main(int argc, char* argv[]) {
 
-  // Disable IO buffering
-  cout.rdbuf()->pubsetbuf(NULL, 0);
-  cin.rdbuf()->pubsetbuf(NULL, 0);
-
-  // Startup initializations
-  init_direction_table();
-  init_bitboards();
-  init_uci_options();
-  Position::init_zobrist();
-  Position::init_piece_square_tables();
-  init_eval(1);
-  init_bitbases();
-  init_search();
-  init_threads();
+  std::cout << engine_info() << std::endl;
 
-#ifdef USE_CALLGRIND
-  CALLGRIND_START_INSTRUMENTATION;
-#endif
+  UCI::init(Options);
+  Bitboards::init();
+  Zobrist::init();
+  Bitbases::init_kpk();
+  Search::init();
+  Eval::init();
+  Threads.init();
+  TT.set_size(Options["Hash"]);
 
-  if (argc <= 1)
-  {
-      // Print copyright notice
-      cout << engine_name()
-           << " by Tord Romstad, Marco Costalba, Joona Kiiski" << endl;
+  std::string args;
 
-      if (CpuHasPOPCNT)
-          cout << "Good! CPU has hardware POPCNT." << endl;
+  for (int i = 1; i < argc; i++)
+      args += std::string(argv[i]) + " ";
 
-      // Enter UCI mode
-      uci_main_loop();
-  }
-  else // Process command line arguments
-  {
-      if (string(argv[1]) != "bench" || argc > 7)
-          cout << "Usage: stockfish bench [hash size = 128] [threads = 1] "
-               << "[limit = 12] [fen positions file = default] "
-               << "[depth, time, perft or node limited = depth]" << endl;
-      else
-          benchmark(argc, argv);
-  }
+  UCI::loop(args);
 
-  exit_threads();
-  quit_eval();
-  return 0;
+  Threads.exit();
 }