X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmain.cpp;h=76aca51d2e8f5f13d8178029ab1f4427bbdab0d3;hb=26bd29e45bea7c756550c3c8130ac64ba71375de;hp=d0817a3d07b8b3c7c6ab126645af04e71afb2a77;hpb=45e6f04bd15212c306046d917f982f76295d7386;p=stockfish
diff --git a/src/main.cpp b/src/main.cpp
index d0817a3d..76aca51d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,7 +18,9 @@
along with this program. If not, see .
*/
+#include
#include
+#include
#include
#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);
+ StateListPtr setup_states = StateListPtr(new std::deque(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* setup_states, bool invert, HashProbeLine* response) {
+void HashProbeImpl::ProbeMove(Position* pos, std::deque* 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* setup_states
// Follow the PV until we hit an illegal move.
std::stack pv;
std::set 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);
}