X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=765cd2caa52b93d52ff9c7bbe0fb984b43d0676b;hp=372e8abc58e990442d62a32c218c5f9a03a1b577;hb=ad43ce143664953087b44dd3b4324f77c212bd46;hpb=b06f0460a207c287528d5b74ee0e644a3485b84c

diff --git a/src/main.cpp b/src/main.cpp
index 372e8abc..765cd2ca 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,75 +17,41 @@
   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 "bitcount.h"
+#include "bitboard.h"
 #include "misc.h"
-
-#ifdef USE_CALLGRIND
-#include <valgrind/callgrind.h>
-#endif
+#include "position.h"
+#include "search.h"
+#include "thread.h"
 
 using namespace std;
 
-extern void uci_main_loop();
-extern void benchmark(const std::string& commandLine);
-
-////
-//// Functions
-////
-
-int main(int argc, char *argv[]) {
+extern void uci_loop();
+extern void benchmark(int argc, char* argv[]);
+extern void kpk_bitbase_init();
 
-  // 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();
+  bitboards_init();
+  Position::init();
+  kpk_bitbase_init();
+  Search::init();
+  Threads.init();
 
-#ifdef USE_CALLGRIND
-  CALLGRIND_START_INSTRUMENTATION;
-#endif
+  cout << engine_info() << endl;
 
-  if (argc <= 1)
-  {
-      // Print copyright notice
-      cout << engine_name()
-           << " by Tord Romstad, Marco Costalba, Joona Kiiski" << endl;
+  if (argc == 1)
+      uci_loop();
 
-      if (CpuHasPOPCNT)
-          cout << "Good! CPU has hardware POPCNT." << endl;
+  else if (string(argv[1]) == "bench")
+      benchmark(argc, argv);
 
-      // Enter UCI mode
-      uci_main_loop();
-  }
-  else // Process command line arguments
-  {
-      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);
-      }
-  }
+  else
+      cerr << "\nUsage: stockfish bench [hash size = 128] [threads = 1] "
+           << "[limit = 12] [fen positions file = default] "
+           << "[limited by depth, time, nodes or perft = depth]" << endl;
 
-  Application::free_resources();
-  return 0;
+  Threads.exit();
 }