X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmain.cpp;h=e83c2cc5f94422dec45f4d77d1c0bf99a55190e0;hb=b36900ef44044e9ab96637c9da7a4d7ea5b055d9;hp=9198620660a6e2b731988abe4f9f19f773edaba7;hpb=3376c68f4bb83dc9fd874eb9d710dab09609ae54;p=stockfish

diff --git a/src/main.cpp b/src/main.cpp
index 91986206..e83c2cc5 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-2009 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
@@ -18,7 +18,7 @@
 */
 
 // To profile with callgrind uncomment following line
-#define USE_CALLGRIND
+//#define USE_CALLGRIND
 
 
 ////
@@ -28,9 +28,8 @@
 #include <iostream>
 #include <string>
 
-#include "benchmark.h"
+#include "bitcount.h"
 #include "misc.h"
-#include "uci.h"
 
 #ifdef USE_CALLGRIND
 #include <valgrind/callgrind.h>
@@ -38,12 +37,14 @@
 
 using namespace std;
 
+extern void uci_main_loop();
+extern void benchmark(int argc, char* argv[]);
 
 ////
 //// Functions
 ////
 
-int main(int argc, char *argv[]) {
+int main(int argc, char* argv[]) {
 
   // Disable IO buffering
   cout.rdbuf()->pubsetbuf(NULL, 0);
@@ -56,28 +57,28 @@ int main(int argc, char *argv[]) {
   CALLGRIND_START_INSTRUMENTATION;
 #endif
 
-  // Process command line arguments if any
-  if (argc > 1)
+  if (argc <= 1)
   {
-      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;
+      // Print copyright notice
+      cout << engine_name()
+           << " by Tord Romstad, Marco Costalba, Joona Kiiski" << 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
-      {
-          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;
+          benchmark(argc, argv);
   }
 
-  // Print copyright notice
-  cout << engine_name() << ".  Copyright (C) "
-       << "2004-2009 Tord Romstad, Marco Costalba. " << endl;
-
-  // Enter UCI mode
-  uci_main_loop();
+  Application::free_resources();
   return 0;
 }