X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.cpp;h=e4ebcc30140d5550c9b216d15da2a1833ecdb661;hb=3b49aeb4f22569c2b5d5ca830858c4dd584fae7f;hp=e83c2cc5f94422dec45f4d77d1c0bf99a55190e0;hpb=660378d10e99f435df347f317878d7d2d9eade16;p=stockfish
diff --git a/src/main.cpp b/src/main.cpp
index e83c2cc5..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,68 +17,36 @@
along with this program. If not, see .
*/
-// To profile with callgrind uncomment following line
-//#define USE_CALLGRIND
-
-
-////
-//// Includes
-////
-
#include
#include
-#include "bitcount.h"
-#include "misc.h"
-
-#ifdef USE_CALLGRIND
-#include
-#endif
-
-using namespace std;
-
-extern void uci_main_loop();
-extern void benchmark(int argc, char* argv[]);
-
-////
-//// Functions
-////
+#include "bitboard.h"
+#include "evaluate.h"
+#include "position.h"
+#include "search.h"
+#include "thread.h"
+#include "tt.h"
+#include "ucioption.h"
int main(int argc, char* argv[]) {
- // Disable IO buffering
- cout.rdbuf()->pubsetbuf(NULL, 0);
- cin.rdbuf()->pubsetbuf(NULL, 0);
-
- // Initialization through global resources manager
- Application::initialize();
+ 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 <= 1)
- {
- // Print copyright notice
- cout << engine_name()
- << " by Tord Romstad, Marco Costalba, Joona Kiiski" << 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]) + " ";
- // Enter UCI mode
- uci_main_loop();
- }
- 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);
- }
+ UCI::loop(args);
- Application::free_resources();
- return 0;
+ Threads.exit();
}