X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.cpp;h=5a32ae3ded7df7dea6580d9ca810f129314273c2;hb=2608b9249d9c25a699c8db8725e35bd4ec0b65ab;hp=fa821151359ac31cb904ebfd66226ae89d49955a;hpb=caa02b0e43dbce0c723bc6499aab811ca3e5408e;p=stockfish
diff --git a/src/main.cpp b/src/main.cpp
index fa821151..5a32ae3d 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,93 +17,40 @@
along with this program. If not, see .
*/
-// To profile with callgrind uncomment following line
-//#define USE_CALLGRIND
-
-
-////
-//// Includes
-////
-
#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
- 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
-
- if (argc <= 1)
- {
- // Print copyright notice
- cout << engine_name() << " by " << engine_author() << endl;
+ bitboards_init();
+ Position::init();
+ kpk_bitbase_init();
+ Search::init();
+ Threads.init();
- if (CpuHasPOPCNT)
- cout << "Good! CPU has hardware POPCNT." << endl;
+ cout << engine_info() << 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;
+ if (argc == 1)
+ uci_loop();
- do {
- // Wait for a command from stdin
- if (!getline(cin, cmd))
- cmd = "quit";
+ else if (string(argv[1]) == "bench")
+ benchmark(argc, argv);
- } 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);
- }
+ 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;
- exit_threads();
- quit_eval();
- return 0;
+ Threads.exit();
}