X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmain.cpp;h=435e436c3fe7a39e7ebd51b411b5676d6245dcfe;hb=c357c4ad6f7318234c4d745eaa6b0c4774e28741;hp=ab86ca39ef6bf73c07bf0f5d0ae28eaa264d0de2;hpb=7dcfc50bde9ed7499d43b469e12ba7f456bf0d25;p=stockfish diff --git a/src/main.cpp b/src/main.cpp index ab86ca39..435e436c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,6 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 - Copyright (C) 2004-2021 The Stockfish developers (see AUTHORS file) + Copyright (C) 2004-2022 The Stockfish developers (see AUTHORS file) Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -110,7 +110,7 @@ void HashProbeImpl::FillMove(Position *pos, Move move, HashProbeMove* decoded) { // Remove all illegal moves to disambiguate. Bitboard att_copy = attackers; while (att_copy) { - Square s = pop_lsb(&att_copy); + Square s = pop_lsb(att_copy); Move m = make_move(s, to); if (!pos->pseudo_legal(m) || !pos->legal(m)) { attackers &= ~SquareBB[s]; @@ -157,9 +157,10 @@ void HashProbeImpl::ProbeMove(Position* pos, std::deque* setup_states TTEntry *entry = TT.probe(pos->key(), found); response->set_found(found); if (found) { - Value value = entry->value(); - Value eval = entry->eval(); - Bound bound = entry->bound(); + TTEntry entry_copy = *entry; + Value value = entry_copy.value(); + Value eval = entry_copy.eval(); + Bound bound = entry_copy.bound(); if (invert) { value = -value; @@ -171,9 +172,9 @@ void HashProbeImpl::ProbeMove(Position* pos, std::deque* setup_states } } - response->set_depth(entry->depth()); + response->set_depth(entry_copy.depth()); FillValue(eval, response->mutable_eval()); - if (entry->depth() > DEPTH_NONE) { + if (entry_copy.depth() > DEPTH_NONE) { FillValue(value, response->mutable_value()); } response->set_bound(HashProbeLine::ValueBound(bound)); @@ -181,16 +182,20 @@ void HashProbeImpl::ProbeMove(Position* pos, std::deque* setup_states // Follow the PV until we hit an illegal move. std::stack pv; std::set seen; - while (found && is_ok(entry->move()) && - pos->pseudo_legal(entry->move()) && - pos->legal(entry->move())) { - FillMove(pos, entry->move(), response->add_pv()); + while (is_ok(entry_copy.move()) && + pos->pseudo_legal(entry_copy.move()) && + pos->legal(entry_copy.move())) { + FillMove(pos, entry_copy.move(), response->add_pv()); if (seen.count(pos->key())) break; - pv.push(entry->move()); + pv.push(entry_copy.move()); seen.insert(pos->key()); setup_states->push_back(StateInfo()); - pos->do_move(entry->move(), setup_states->back()); + pos->do_move(entry_copy.move(), setup_states->back()); entry = TT.probe(pos->key(), found); + if (!found) { + break; + } + entry_copy = *entry; } // Unroll the PV back again, so the Position object remains unchanged.