X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=e6dfe9344d5837a8194839aa7680927d46a75f3e;hp=36534ae3d98b805e2bb3e34c957dfea3e029dbea;hb=09d01ee9dc16f20962d5f5ffcb61ade56d4fa579;hpb=a88e762b4ea4a3696ecc0431237f54090a5aa1e2

diff --git a/src/main.cpp b/src/main.cpp
index 36534ae3..e6dfe934 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 Marco Costalba
+  Copyright (C) 2008-2010 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
@@ -20,17 +20,16 @@
 // To profile with callgrind uncomment following line
 //#define USE_CALLGRIND
 
-
-////
-//// Includes
-////
-
+#include <cstdio>
 #include <iostream>
 #include <string>
 
-#include "benchmark.h"
-#include "misc.h"
-#include "uci.h"
+#include "bitboard.h"
+#include "evaluate.h"
+#include "position.h"
+#include "thread.h"
+#include "search.h"
+#include "ucioption.h"
 
 #ifdef USE_CALLGRIND
 #include <valgrind/callgrind.h>
@@ -38,46 +37,51 @@
 
 using namespace std;
 
+extern bool execute_uci_command(const string& cmd);
+extern void benchmark(int argc, char* argv[]);
+extern void init_kpk_bitbase();
 
-////
-//// Functions
-////
-
-int main(int argc, char *argv[]) {
+int main(int argc, char* argv[]) {
 
-  // Disable IO buffering
+  // 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);
 
-  // Initialization through global resources manager
-  Application::initialize();
+  // Startup initializations
+  init_bitboards();
+  Position::init_zobrist();
+  Position::init_piece_square_tables();
+  init_kpk_bitbase();
+  init_search();
+  Threads.init();
 
 #ifdef USE_CALLGRIND
   CALLGRIND_START_INSTRUMENTATION;
 #endif
 
-  // Process command line arguments if any
-  if (argc > 1)
+  if (argc < 2)
   {
-      if (string(argv[1]) != "bench" || argc < 4 || argc > 7)
-          cout << "Usage: stockfish bench <hash size> <threads> "
-               << "[time = 60s] [fen positions file = default] "
-               << "[time, depth or node limited = time]" << endl;
-      else
-      {
-          string time = argc > 4 ? argv[4] : "60";
-          string fen = argc > 5 ? argv[5] : "default";
-          string lim = argc > 6 ? argv[6] : "time";
-          benchmark(string(argv[2]) + " " + string(argv[3]) + " " + time + " " + fen + " " + lim);
-      }
-      return 0;
-  }
+      // Print copyright notice
+      cout << engine_name() << " by " << engine_authors() << endl;
 
-  // Print copyright notice
-  cout << engine_name() << ".  Copyright (C) "
-       << "2004-2008 Tord Romstad, Marco Costalba. " << endl;
+      if (CpuHasPOPCNT)
+          cout << "Good! CPU has hardware POPCNT." << endl;
 
-  // Enter UCI mode
-  uci_main_loop();
+      // 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] "
+           << "[limited by depth, time, nodes or perft = depth]" << endl;
+
+  Threads.exit();
   return 0;
 }