-////
-//// Includes
-////
-
-#include "depth.h"
-#include "position.h"
-#include "value.h"
-
-
-////
-//// Types
-////
-
-/// The TTEntry class is the class of transposition table entries
-///
-/// A TTEntry needs 96 bits to be stored
-///
-/// bit 0-31: key
-/// bit 32-63: data
-/// bit 64-79: value
-/// bit 80-95: depth
-///
-/// the 32 bits of the data field are so defined
-///
-/// bit 0-16: move
-/// bit 17-19: not used
-/// bit 20-22: value type
-/// bit 23-31: generation
-
-class TTEntry {
-
-public:
- void save(uint32_t k, Value v, ValueType t, Depth d, Move m, int g, Value statV, Value kd) {
-
- key32 = k;
- data = (m & 0x1FFFF) | (t << 20) | (g << 23);
- value16 = int16_t(v);
- depth16 = int16_t(d);
- staticValue = int16_t(statV);
- kingDanger = int16_t(kd);
- }
-
- uint32_t key() const { return key32; }
- Depth depth() const { return Depth(depth16); }
- Move move() const { return Move(data & 0x1FFFF); }
- Value value() const { return Value(value16); }
- ValueType type() const { return ValueType((data >> 20) & 7); }
- int generation() const { return data >> 23; }
- Value static_value() const { return Value(staticValue); }
- Value king_danger() const { return Value(kingDanger); }
-
-private:
- uint32_t key32;
- uint32_t data;
- int16_t value16;
- int16_t depth16;
- int16_t staticValue;
- int16_t kingDanger;
-};
-
-
-/// This is the number of TTEntry slots for each position
-const int ClusterSize = 4;
-
-/// Each group of ClusterSize number of TTEntry form a TTCluster
-/// that is indexed by a single position key. TTCluster size must
-/// be not bigger then a cache line size, in case it is less then
-/// it should be padded to guarantee always aligned accesses.
-
-struct TTCluster {
- TTEntry data[ClusterSize];
+#include <cstddef>
+#include <cstdint>
+
+#include "misc.h"
+#include "types.h"
+
+namespace Stockfish {
+
+// TTEntry struct is the 10 bytes transposition table entry, defined as below:
+//
+// key 16 bit
+// depth 8 bit
+// generation 5 bit
+// pv node 1 bit
+// bound type 2 bit
+// move 16 bit
+// value 16 bit
+// eval value 16 bit
+struct TTEntry {
+
+ Move move() const { return Move(move16); }
+ Value value() const { return Value(value16); }
+ Value eval() const { return Value(eval16); }
+ Depth depth() const { return Depth(depth8 + DEPTH_OFFSET); }
+ bool is_pv() const { return bool(genBound8 & 0x4); }
+ Bound bound() const { return Bound(genBound8 & 0x3); }
+ void save(Key k, Value v, bool pv, Bound b, Depth d, Move m, Value ev);
+
+ private:
+ friend class TranspositionTable;
+
+ uint16_t key16;
+ uint8_t depth8;
+ uint8_t genBound8;
+ uint16_t move16;
+ int16_t value16;
+ int16_t eval16;