X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=c0a9a348b3d0a16cb5cb0f69e44e8cc1405c8799;hp=0c94ed892bfc669b6bcf1727c78910b3698a9bd7;hb=c7e7d9217b232eb7d75b083a45f001ef998c9deb;hpb=4220f191d8c1d597ff66e41f90af11367b0ebd7f

diff --git a/src/main.cpp b/src/main.cpp
index 0c94ed89..c0a9a348 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-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2013 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
@@ -25,36 +25,29 @@
 #include "position.h"
 #include "search.h"
 #include "thread.h"
+#include "tt.h"
 #include "ucioption.h"
 
-using namespace std;
-
-extern void uci_loop();
-extern void benchmark(int argc, char* argv[]);
-extern void kpk_bitbase_init();
-
 int main(int argc, char* argv[]) {
 
-  bitboards_init();
+  std::cout << engine_info() << std::endl;
+
+  UCI::init(Options);
+  Bitboards::init();
   Position::init();
-  kpk_bitbase_init();
+  Bitbases::init_kpk();
   Search::init();
-  Threads.init();
+  Pawns::init();
   Eval::init();
+  Threads.init();
   TT.set_size(Options["Hash"]);
 
-  cout << engine_info() << endl;
-
-  if (argc == 1)
-      uci_loop();
+  std::string args;
 
-  else if (string(argv[1]) == "bench")
-      benchmark(argc, argv);
+  for (int i = 1; i < argc; ++i)
+      args += std::string(argv[i]) + " ";
 
-  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;
+  UCI::loop(args);
 
   Threads.exit();
 }