X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=01b032c2ddca230595225da082b6f0af88dca00b;hp=01fb47860b092d43d837099234d56786f3c2164f;hb=4dded4e72f9b9582db8adc9a478e9eda5841d8c5;hpb=fdb2242d3481116ebb5a235e5fd57b01e9f919ea

diff --git a/src/main.cpp b/src/main.cpp
index 01fb4786..01b032c2 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,88 +20,91 @@
 // To profile with callgrind uncomment following line
 //#define USE_CALLGRIND
 
+
 ////
 //// Includes
 ////
 
 #include <iostream>
+#include <string>
 
-#include "benchmark.h"
 #include "bitboard.h"
-#include "direction.h"
+#include "bitcount.h"
 #include "endgame.h"
 #include "evaluate.h"
 #include "material.h"
-#include "mersenne.h"
 #include "misc.h"
-#include "movepick.h"
 #include "position.h"
 #include "search.h"
 #include "thread.h"
-#include "uci.h"
 #include "ucioption.h"
 
 #ifdef USE_CALLGRIND
 #include <valgrind/callgrind.h>
 #endif
 
-using std::string;
+using namespace std;
+
+extern bool execute_uci_command(const string& cmd);
+extern void benchmark(int argc, char* argv[]);
 
 ////
 //// Functions
 ////
 
-int main(int argc, char *argv[]) {
+int main(int argc, char* argv[]) {
 
   // Disable IO buffering
-  std::cout.rdbuf()->pubsetbuf(NULL, 0);
-  std::cin.rdbuf()->pubsetbuf(NULL, 0);
+  cout.rdbuf()->pubsetbuf(NULL, 0);
+  cin.rdbuf()->pubsetbuf(NULL, 0);
 
-  // Initialization
-  init_mersenne();
-  init_direction_table();
+  // Startup initializations
   init_bitboards();
   init_uci_options();
   Position::init_zobrist();
   Position::init_piece_square_tables();
-  MovePicker::init_phase_table();
   init_eval(1);
   init_bitbases();
+  init_search();
   init_threads();
 
 #ifdef USE_CALLGRIND
   CALLGRIND_START_INSTRUMENTATION;
 #endif
 
-  // Make random number generation less deterministic, for book moves
-  for (int i = abs(get_system_time() % 10000); i > 0; i--)
-      genrand_int32();
-
-  // Process command line arguments
-  if (argc >= 2 && string(argv[1]) == "bench")
+  if (argc <= 1)
   {
-      if (argc < 4 || argc > 7)
-      {
-        std::cout << "Usage: stockfish bench <hash size> <threads> "
-                  << "[time = 60s] [fen positions file = default] "
-                  << "[time, depth or node limited = time]"
-                  << std::endl;
-        exit(0);
-      }
-      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 Tord Romstad, Marco Costalba, Joona Kiiski" << endl;
+
+      if (CpuHasPOPCNT)
+          cout << "Good! CPU has hardware POPCNT." << endl;
 
-  // Print copyright notice
-  std::cout << engine_name() << ".  Copyright (C) "
-            << "2004-2008 Tord Romstad, Marco Costalba. "
-            << std::endl;
+      // Wait for a command from the user, and passes this command to
+      // execute_uci_command() and also intercepts EOF from stdin, by
+      // translating EOF to the "quit" command. This ensures that we
+      // exit gracefully if the GUI dies unexpectedly.
+      string cmd;
 
-  // Enter UCI mode
-  uci_main_loop();
+      do {
+          // Wait for a command from stdin
+          if (!getline(cin, cmd))
+              cmd = "quit";
+
+      } while (execute_uci_command(cmd));
+  }
+  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);
+  }
 
+  exit_threads();
+  quit_eval();
   return 0;
 }