X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=1a8309700555bfd61ef916fad97619d48d50386f;hp=7b675d34533d100fa6acfe37686ae87ab86c5cd8;hb=b5f6c2241b3ad688fb85ea8203a9254aff842f07;hpb=d3600c39a745179ed6b094b305d0645e83a1ee86

diff --git a/src/main.cpp b/src/main.cpp
index 7b675d34..1a830970 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,97 +1,63 @@
 /*
   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
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
-  
+
   Stockfish is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
-  
+
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-////
-//// Includes
-////
-
 #include <iostream>
+#include <string>
 
-#include "benchmark.h"
 #include "bitboard.h"
-#include "direction.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 "search.h"
 #include "ucioption.h"
 
-using std::string;
-
-//// 
-//// Functions
-////
+using namespace std;
 
-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
-  std::cout.rdbuf()->pubsetbuf(NULL, 0);
-  std::cin.rdbuf()->pubsetbuf(NULL, 0);
+int main(int argc, char* argv[]) {
 
-  // Initialization
+  bitboards_init();
+  Position::init();
+  kpk_bitbase_init();
+  Search::init();
+  Threads.init();
 
-  init_mersenne();
-  init_direction_table();
-  init_bitboards();
-  init_uci_options();
-  Position::init_zobrist();
-  Position::init_piece_square_tables();
-  MaterialInfo::init();
-  MovePicker::init_phase_table();
-  init_eval(1);
-  init_bitbases();
-  init_threads();
+  if (argc < 2)
+  {
+      cout << engine_name() << " by " << engine_authors() << endl;
 
-  // Make random number generation less deterministic, for book moves
-  for (int i = abs(get_system_time() % 10000); i > 0; i--)
-      genrand_int32();
+      if (CpuHasPOPCNT)
+          cout << "Good! CPU has hardware POPCNT." << endl;
 
-  // Process command line arguments
-  if (argc >= 2 && string(argv[1]) == "bench")
-  {
-      if (argc < 4 || argc > 6)
-      {
-        std::cout << "Usage: glaurung bench <hash size> <threads> "
-                  << "[time = 60s] [fen positions file = default]"
-                  << std::endl;
-        exit(0);
-      }
-      string time = argc > 4 ? argv[4] : "60";
-      string fen = argc > 5 ? argv[5] : "default";
-      benchmark(string(argv[2]) + " " + string(argv[3]) + " " + time + " " + fen);
-      return 0;
+      uci_loop(); // Enter the UCI loop and wait for user input
   }
+  else if (string(argv[1]) == "bench")
+      benchmark(argc, argv);
 
-  // Print copyright notice
-  std::cout << engine_name() << ".  Copyright (C) "
-            << "2004-2008 Tord Romstad, Marco Costalba. "
-            << std::endl;
-
-  // Enter UCI mode
-  uci_main_loop();
+  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;
 }