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

diff --git a/src/main.cpp b/src/main.cpp
index f9ed8de5..1a830970 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,86 +17,47 @@
   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 "search.h"
 #include "ucioption.h"
 
-#ifdef USE_CALLGRIND
-#include <valgrind/callgrind.h>
-#endif
-
 using namespace std;
 
-extern void uci_main_loop();
+extern void uci_loop();
 extern void benchmark(int argc, char* argv[]);
-
-////
-//// Functions
-////
+extern void kpk_bitbase_init();
 
 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();
-
-#ifdef USE_CALLGRIND
-  CALLGRIND_START_INSTRUMENTATION;
-#endif
+  bitboards_init();
+  Position::init();
+  kpk_bitbase_init();
+  Search::init();
+  Threads.init();
 
-  if (argc <= 1)
+  if (argc < 2)
   {
-      // Print copyright notice
-      cout << engine_name()
-           << " by Tord Romstad, Marco Costalba, Joona Kiiski" << endl;
+      cout << engine_name() << " by " << engine_authors() << endl;
 
       if (CpuHasPOPCNT)
           cout << "Good! CPU has hardware POPCNT." << endl;
 
-      // 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(); // Enter the UCI loop and wait for user input
   }
+  else if (string(argv[1]) == "bench")
+      benchmark(argc, argv);
+
+  else
+      cout << "Usage: stockfish bench [hash size = 128] [threads = 1] "
+           << "[limit = 12] [fen positions file = default] "
+           << "[limited by depth, time, nodes or perft = depth]" << endl;
 
-  exit_threads();
-  quit_eval();
+  Threads.exit();
   return 0;
 }