X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.cpp;h=e4ebcc30140d5550c9b216d15da2a1833ecdb661;hb=e40b06a0503b44bae5508a371d961914828214b6;hp=e67adc69bb647a190b74bd4e788bab66f364c568;hpb=c1c09844525c764f869b29360519808aab5a7069;p=stockfish
diff --git a/src/main.cpp b/src/main.cpp
index e67adc69..e4ebcc30 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-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2012 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
@@ -17,73 +17,36 @@
along with this program. If not, see .
*/
-// To profile with callgrind uncomment following line
-//#define USE_CALLGRIND
-
-#include
#include
#include
#include "bitboard.h"
#include "evaluate.h"
#include "position.h"
+#include "search.h"
#include "thread.h"
+#include "tt.h"
#include "ucioption.h"
-#ifdef USE_CALLGRIND
-#include
-#endif
-
-using namespace std;
-
-extern bool execute_uci_command(const string& cmd);
-extern void benchmark(int argc, char* argv[]);
-extern void init_kpk_bitbase();
-
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();
- init_uci_options();
- Position::init_zobrist();
- Position::init_piece_square_tables();
- init_eval(1);
- init_kpk_bitbase();
- init_search();
- init_threads();
+ std::cout << engine_info() << std::endl;
-#ifdef USE_CALLGRIND
- CALLGRIND_START_INSTRUMENTATION;
-#endif
+ UCI::init(Options);
+ Bitboards::init();
+ Zobrist::init();
+ Bitbases::init_kpk();
+ Search::init();
+ Eval::init();
+ Threads.init();
+ TT.set_size(Options["Hash"]);
- if (argc < 2)
- {
- // Print copyright notice
- cout << engine_name() << " by " << engine_author() << endl;
+ std::string args;
- if (CpuHasPOPCNT)
- cout << "Good! CPU has hardware POPCNT." << endl;
+ for (int i = 1; i < argc; i++)
+ args += std::string(argv[i]) + " ";
- // Wait for a command from the user, and passes this command to
- // execute_uci_command() and also intercepts EOF from stdin to
- // ensure that we exit gracefully if the GUI dies unexpectedly.
- string cmd;
- while (getline(cin, cmd) && execute_uci_command(cmd)) {}
- }
- else if (string(argv[1]) == "bench" && argc < 8)
- benchmark(argc, argv);
- else
- cout << "Usage: stockfish bench [hash size = 128] [threads = 1] "
- << "[limit = 12] [fen positions file = default] "
- << "[depth, time, perft or node limited = depth]" << endl;
+ UCI::loop(args);
- exit_threads();
- quit_eval();
- return 0;
+ Threads.exit();
}