X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=9fbe63502ccd47960698d40d5d7e39b21e4e8eac;hp=5a32ae3ded7df7dea6580d9ca810f129314273c2;hb=91de6b0f37516462658f6e38db430813aa9e7ed8;hpb=2a21543c88f82a64ee48d00d706db102c0c4637d

diff --git a/src/main.cpp b/src/main.cpp
index 5a32ae3d..9fbe6350 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-2014 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,39 +18,30 @@
 */
 
 #include <iostream>
-#include <string>
 
 #include "bitboard.h"
+#include "evaluate.h"
 #include "position.h"
 #include "search.h"
 #include "thread.h"
-
-using namespace std;
-
-extern void uci_loop();
-extern void benchmark(int argc, char* argv[]);
-extern void kpk_bitbase_init();
+#include "tt.h"
+#include "ucioption.h"
 
 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();
+  Eval::init();
+  Pawns::init();
   Threads.init();
+  TT.resize(Options["Hash"]);
 
-  cout << engine_info() << endl;
-
-  if (argc == 1)
-      uci_loop();
-
-  else if (string(argv[1]) == "bench")
-      benchmark(argc, argv);
-
-  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(argc, argv);
 
   Threads.exit();
 }