X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=76aca51d2e8f5f13d8178029ab1f4427bbdab0d3;hp=e80d066dfdad353082fea62dc017b3e9f15be7bf;hb=995ccd2f51d32415d5ef6a674554ffb7fc5125d5;hpb=e6438f46fc655dca2413b02921e30546d762c72e

diff --git a/src/main.cpp b/src/main.cpp
index e80d066d..76aca51d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,7 +18,9 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <deque>
 #include <iostream>
+#include <stack>
 #include <thread>
 
 #include "bitboard.h"
@@ -45,13 +47,15 @@ using namespace hashprobe;
 Status HashProbeImpl::Probe(ServerContext* context,
                             const HashProbeRequest* request,
 			    HashProbeResponse *response) {
-	Position pos(request->fen(), /*isChess960=*/false, Threads.main());
+	Position pos;
+	StateInfo st;
+	pos.set(request->fen(), /*isChess960=*/false, &st, Threads.main());
 	if (!pos.pos_is_ok()) {
 		return Status(StatusCode::INVALID_ARGUMENT, "Invalid FEN");
 	}
 
 	bool invert = (pos.side_to_move() == BLACK);
-	Search::StateStackPtr setup_states = Search::StateStackPtr(new std::stack<StateInfo>);
+	StateListPtr setup_states = StateListPtr(new std::deque<StateInfo>(1));
 
 	ProbeMove(&pos, setup_states.get(), invert, response->mutable_root());
 
@@ -59,8 +63,8 @@ Status HashProbeImpl::Probe(ServerContext* context,
 	for (const ExtMove* em = moves.begin(); em != moves.end(); ++em) {
 		HashProbeLine *line = response->add_line();
 		FillMove(em->move, line->mutable_move());
-		setup_states->push(StateInfo());
-		pos.do_move(em->move, setup_states->top(), pos.gives_check(em->move, CheckInfo(pos)));
+		setup_states->push_back(StateInfo());
+		pos.do_move(em->move, setup_states->back(), pos.gives_check(em->move));
 		ProbeMove(&pos, setup_states.get(), !invert, line);
 		pos.undo_move(em->move);
 	}
@@ -86,7 +90,7 @@ void HashProbeImpl::FillMove(Move move, HashProbeMove* decoded) {
 	}
 }
 
-void HashProbeImpl::ProbeMove(Position* pos, std::stack<StateInfo>* setup_states, bool invert, HashProbeLine* response) {
+void HashProbeImpl::ProbeMove(Position* pos, std::deque<StateInfo>* setup_states, bool invert, HashProbeLine* response) {
 	bool found;
 	TTEntry *entry = TT.probe(pos->key(), found);
 	response->set_found(found);
@@ -115,13 +119,15 @@ void HashProbeImpl::ProbeMove(Position* pos, std::stack<StateInfo>* setup_states
 		// Follow the PV until we hit an illegal move.
 		std::stack<Move> pv;
 		std::set<Key> seen;
-		while (found && is_ok(entry->move())) {
+		while (found && is_ok(entry->move()) &&
+		       pos->pseudo_legal(entry->move()) &&
+		       pos->legal(entry->move())) {
 			FillMove(entry->move(), response->add_pv());
 			if (seen.count(pos->key())) break;
 			pv.push(entry->move());
 			seen.insert(pos->key());
-			setup_states->push(StateInfo());
-			pos->do_move(entry->move(), setup_states->top(), pos->gives_check(entry->move(), CheckInfo(*pos)));
+			setup_states->push_back(StateInfo());
+			pos->do_move(entry->move(), setup_states->back(), pos->gives_check(entry->move()));
 			entry = TT.probe(pos->key(), found);
 		}
 
@@ -173,8 +179,6 @@ int main(int argc, char* argv[]) {
   Threads.set(Options["Threads"]);
   Search::clear(); // After threads are up
 
-  HashProbeThread thr("0.0.0.0:50051");
-
   UCI::loop(argc, argv);
 
   Threads.set(0);