X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftt.cpp;h=d7b3b7d5b099a7dd91b39808c780067c56baf86f;hp=426546ba1b878ca2a2e9e0aeb25c4d1d2d869c38;hb=6a8e46d53efca6dd56a396b32f43bef9f95127d6;hpb=4df8651c82cf1a2e18aaf4ddc5e488560a8880a0 diff --git a/src/tt.cpp b/src/tt.cpp index 426546ba..d7b3b7d5 100644 --- a/src/tt.cpp +++ b/src/tt.cpp @@ -103,7 +103,7 @@ void TranspositionTable::clear() { /// current search and t2 is from a previous search, or if the depth of t1 /// is bigger than the depth of t2. -void TranspositionTable::store(const Position &pos, Value v, Depth d, +TTEntry* TranspositionTable::store(const Position &pos, Value v, Depth d, Move m, ValueType type) { TTEntry *tte, *replace; @@ -116,7 +116,7 @@ void TranspositionTable::store(const Position &pos, Value v, Depth d, m = tte->move(); *tte = TTEntry(pos.get_key(), v, type, d, m, generation); - return; + return tte; } else if (i == 0) // replace would be a no-op in this common case continue; @@ -130,6 +130,7 @@ void TranspositionTable::store(const Position &pos, Value v, Depth d, } *replace = TTEntry(pos.get_key(), v, type, d, m, generation); writes++; + return replace; } @@ -137,7 +138,7 @@ void TranspositionTable::store(const Position &pos, Value v, Depth d, /// transposition table. Returns a pointer to the TTEntry or NULL /// if position is not found. -const TTEntry* TranspositionTable::retrieve(const Position &pos) const { +TTEntry* TranspositionTable::retrieve(const Position &pos) const { TTEntry *tte = first_entry(pos); @@ -177,13 +178,13 @@ void TranspositionTable::new_search() { void TranspositionTable::insert_pv(const Position &pos, Move pv[]) { - UndoInfo u; + StateInfo st; Position p(pos); for (int i = 0; pv[i] != MOVE_NONE; i++) { - store(p, VALUE_NONE, Depth(0), pv[i], VALUE_TYPE_NONE); - p.do_move(pv[i], u); + store(p, VALUE_NONE, Depth(-127*OnePly), pv[i], VALUE_TYPE_NONE); + p.do_move(pv[i], st); } } @@ -206,8 +207,5 @@ TTEntry::TTEntry() { TTEntry::TTEntry(Key k, Value v, ValueType t, Depth d, Move m, int generation) : - key_ (k), data((m & 0x7FFFF) | (t << 20) | (generation << 23)), - value_(v), depth_(int16_t(d)) {} - - - + key_ (k), data((m & 0x1FFFF) | (t << 20) | (generation << 23)), + value_(int16_t(v)), depth_(int16_t(d)) {}