X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmain.cpp;h=9b1b5ecfe4f373ce3fc6849cb64a0b5c86e481e0;hb=0a6532a39d2e2cfd92ba0a2c4fa8c6ad6c29b581;hp=b2cb0745cd0343cbe2d20e852b8084942973bd0d;hpb=dab1cd8af9c95c119500e97920f927ae4aafc24f;p=stockfish

diff --git a/src/main.cpp b/src/main.cpp
index b2cb0745..9b1b5ecf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,23 +17,14 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// To profile with callgrind uncomment following line
-//#define USE_CALLGRIND
-
-#include <cstdio>
 #include <iostream>
 #include <string>
 
 #include "bitboard.h"
-#include "evaluate.h"
+#include "misc.h"
 #include "position.h"
-#include "thread.h"
 #include "search.h"
-#include "ucioption.h"
-
-#ifdef USE_CALLGRIND
-#include <valgrind/callgrind.h>
-#endif
+#include "thread.h"
 
 using namespace std;
 
@@ -43,36 +34,20 @@ extern void kpk_bitbase_init();
 
 int main(int argc, char* argv[]) {
 
-  // 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);
-
-  // Startup initializations
-  init_bitboards();
+  bitboards_init();
   Position::init();
   kpk_bitbase_init();
-  init_search();
+  Search::init();
   Threads.init();
 
-#ifdef USE_CALLGRIND
-  CALLGRIND_START_INSTRUMENTATION;
-#endif
-
   if (argc < 2)
   {
-      // Print copyright notice
       cout << engine_name() << " by " << engine_authors() << endl;
-
-      if (CpuHasPOPCNT)
-          cout << "Good! CPU has hardware POPCNT." << endl;
-
-      // Enter the UCI loop waiting for input
       uci_loop();
   }
-  else if (string(argv[1]) == "bench" && argc < 8)
+  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] "