X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftt.cpp;h=d7b3b7d5b099a7dd91b39808c780067c56baf86f;hp=97ca23dc43a6ab3c926520f0194235533815c68f;hb=6a8e46d53efca6dd56a396b32f43bef9f95127d6;hpb=787d3585548ed7dac06597780a7d0adb64482d41

diff --git a/src/tt.cpp b/src/tt.cpp
index 97ca23dc..d7b3b7d5 100644
--- a/src/tt.cpp
+++ b/src/tt.cpp
@@ -103,37 +103,34 @@ 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;
 
   tte = replace = first_entry(pos);
-  for (int i = 0; i < 4; i++)
+  for (int i = 0; i < 4; i++, tte++)
   {
-    if (!(tte+i)->key()) // still empty
-    {
-        *(tte+i) = TTEntry(pos.get_key(), v, type, d, m, generation);
-        writes++;
-        return;
-    }
-    if ((tte+i)->key() == pos.get_key()) // overwrite old
+    if (!tte->key() || tte->key() == pos.get_key()) // empty or overwrite old
     {
         if (m == MOVE_NONE)
-            m = (tte+i)->move();
+            m = tte->move();
 
-        *(tte+i) = TTEntry(pos.get_key(), v, type, d, m, generation);
-        return;
+        *tte = TTEntry(pos.get_key(), v, type, d, m, generation);
+        return tte;
     }
-    if (   i == 0  // already is (replace == tte+i), common case
-        || replace->generation() < (tte+i)->generation())
+    else if (i == 0)  // replace would be a no-op in this common case
         continue;
 
-    if (    replace->generation() > (tte+i)->generation()
-        || (tte+i)->depth() < replace->depth())
-        replace = tte+i;
+    int c1 = (replace->generation() == generation ?  2 : 0);
+    int c2 = (tte->generation() == generation ? -2 : 0);
+    int c3 = (tte->depth() < replace->depth() ?  1 : 0);
+
+    if (c1 + c2 + c3 > 0)
+        replace = tte;
   }
   *replace = TTEntry(pos.get_key(), v, type, d, m, generation);
   writes++;
+  return replace;
 }
 
 
@@ -141,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);
 
@@ -181,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);
   }
 }
 
@@ -210,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)) {}