Change TT interface to ask directly for a position key

[stockfish] / src / tt.h

diff --git a/src/tt.h b/src/tt.h
index a820d94ac5181efa74789258c474a167c507ec9e..e8dc021bafc1d537524ebdfa2b55754d98388f6b 100644 (file)
--- a/src/tt.h
+++ b/src/tt.h
@@ -46,24 +46,24 @@
 /// the 32 bits of the data field are so defined
 ///
 /// bit  0-16: move
-/// bit    17: stored value equals static value
-/// bit 18-19: not used
+/// bit 17-19: not used
 /// bit 20-22: value type
 /// bit 23-31: generation
 
 class TTEntry {
 
 public:
-  TTEntry();
-  TTEntry(Key k, Value v, ValueType t, Depth d, Move m, int generation);
+  TTEntry() {}
+  TTEntry(Key k, Value v, ValueType t, Depth d, Move m, int generation)
+        : key_ (k), data((m & 0x1FFFF) | (t << 20) | (generation << 23)),
+          value_(int16_t(v)), depth_(int16_t(d)) {}
+
   Key key() const { return key_; }
   Depth depth() const { return Depth(depth_); }
   Move move() const { return Move(data & 0x1FFFF); }
   Value value() const { return Value(value_); }
   ValueType type() const { return ValueType((data >> 20) & 7); }
   int generation() const { return (data >> 23); }
-  bool staticValue() const { return ((data >> 17) & 1); }
-  void setStaticValue() { data |= (1 << 17); }
 
 private:
   Key key_;
@@ -79,32 +79,22 @@ private:
 class TranspositionTable {
 
 public:
-  TranspositionTable(unsigned mbSize);
+  TranspositionTable();
   ~TranspositionTable();
   void set_size(unsigned mbSize);
   void clear();
-  TTEntry* store(const Position &pos, Value v, Depth d, Move m, ValueType type);
-  TTEntry* retrieve(const Position &pos) const;
+  void store(const Key posKey, Value v, ValueType type, Depth d, Move m);
+  TTEntry* retrieve(const Key posKey) const;
   void new_search();
-  void insert_pv(const Position &pos, Move pv[]);
-  int full();
+  void insert_pv(const Position& pos, Move pv[]);
+  int full() const;
 
 private:
-  inline TTEntry* first_entry(const Position &pos) const;
+  inline TTEntry* first_entry(const Key posKey) const;
 
-  unsigned size;
-  int writes;
+  unsigned size, writes;
   TTEntry* entries;
   uint8_t generation;
 };
 
-
-////
-//// Constants and variables
-////
-
-// Default transposition table size, in megabytes:
-const int TTDefaultSize = 32;
-
-
 #endif // !defined(TT_H_INCLUDED)