X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmain.cpp;h=9b1b5ecfe4f373ce3fc6849cb64a0b5c86e481e0;hb=0a6532a39d2e2cfd92ba0a2c4fa8c6ad6c29b581;hp=0f7d0e783b369c7118e842ce04b5e278cd462ba4;hpb=932ae761c6e3fd3e9b202283379e487a5c187989;p=stockfish
diff --git a/src/main.cpp b/src/main.cpp
index 0f7d0e78..9b1b5ecf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,96 +17,42 @@
along with this program. If not, see .
*/
-// To profile with callgrind uncomment following line
-//#define USE_CALLGRIND
-
-
-////
-//// Includes
-////
-
-#include
#include
#include
#include "bitboard.h"
-#include "bitcount.h"
-#include "endgame.h"
-#include "evaluate.h"
-#include "material.h"
#include "misc.h"
#include "position.h"
#include "search.h"
#include "thread.h"
-#include "ucioption.h"
-
-#ifdef USE_CALLGRIND
-#include
-#endif
using namespace std;
-extern bool execute_uci_command(const string& cmd);
+extern void uci_loop();
extern void benchmark(int argc, char* argv[]);
-
-////
-//// Functions
-////
+extern void kpk_bitbase_init();
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_bitbases();
- init_search();
- init_threads();
-
-#ifdef USE_CALLGRIND
- CALLGRIND_START_INSTRUMENTATION;
-#endif
+ bitboards_init();
+ Position::init();
+ kpk_bitbase_init();
+ Search::init();
+ Threads.init();
- if (argc <= 1)
+ if (argc < 2)
{
- // Print copyright notice
- cout << engine_name() << " by " << engine_author() << endl;
-
- if (CpuHasPOPCNT)
- cout << "Good! CPU has hardware POPCNT." << endl;
-
- // Wait for a command from the user, and passes this command to
- // execute_uci_command() and also intercepts EOF from stdin, by
- // translating EOF to the "quit" command. This ensures that we
- // exit gracefully if the GUI dies unexpectedly.
- string cmd;
-
- do {
- // Wait for a command from stdin
- if (!getline(cin, cmd))
- cmd = "quit";
-
- } while (execute_uci_command(cmd));
- }
- 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);
+ cout << engine_name() << " by " << engine_authors() << endl;
+ uci_loop();
}
+ else if (string(argv[1]) == "bench")
+ benchmark(argc, argv);
+
+ 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;
- exit_threads();
- quit_eval();
+ Threads.exit();
return 0;
}