Split transposition table lookup in a separate function

[stockfish] / src / tt.h

diff --git a/src/tt.h b/src/tt.h
index 4ca344123e5f070ec0a7c687d8cc45fbd05ddd67..ec3d72b4ea188171fba934f1fa08397825c75e66 100644 (file)
--- a/src/tt.h
+++ b/src/tt.h
@@ -40,12 +40,12 @@ class TTEntry {
 public:
   TTEntry();
   TTEntry(Key k, Value v, ValueType t, Depth d, Move m, int generation);
-  Key key() const;
-  Depth depth() const;
-  Move move() const;
-  Value value() const;
-  ValueType type() const;
-  int generation() const;
+  Key key() const { return key_; }
+  Depth depth() const { return Depth(depth_); }
+  Move move() const { return Move(data & 0x7FFFF); }
+  Value value() const { return Value(value_); }
+  ValueType type() const { return ValueType((data >> 20) & 3); }
+  int generation() const { return (data >> 23); }
 
 private:
   Key key_;
@@ -54,7 +54,6 @@ private:
   int16_t depth_;
 };
 
-
 /// The transposition table class.  This is basically just a huge array
 /// containing TTEntry objects, and a few methods for writing new entries
 /// and reading new ones.
@@ -67,8 +66,7 @@ public:
   void set_size(unsigned mbSize);
   void clear();
   void store(const Position &pos, Value v, Depth d, Move m, ValueType type);
-  bool retrieve(const Position &pos, Value *value, Depth *d, Move *move,
-                ValueType *type) const;
+  const TTEntry* retrieve(const Position &pos) const;
   void new_search();
   void insert_pv(const Position &pos, Move pv[]);
   int full();