Move move() const { return (Move )move16; }
Value value() const { return (Value)value16; }
Value eval_value() const { return (Value)evalValue; }
- Depth depth() const { return (Depth)(depth8) + DEPTH_NONE; }
+ Depth depth() const { return (Depth)depth8; }
Bound bound() const { return (Bound)(genBound8 & 0x3); }
-private:
- friend class TranspositionTable;
+ void save(Key k, Value v, Bound b, Depth d, Move m, Value ev, uint8_t g) {
- void save(uint16_t k, Value v, Bound b, Depth d, Move m, uint8_t g, Value ev) {
+ if (m || (k >> 48) != key16) // Preserve any existing move for the same position
+ move16 = (uint16_t)m;
- key16 = (uint16_t)k;
- move16 = (uint16_t)m;
- value16 = (int16_t)v;
- evalValue = (int16_t)ev;
- depth8 = (uint8_t)(d - DEPTH_NONE);
- genBound8 = g | (uint8_t)b;
+ key16 = (uint16_t)(k >> 48);
+ value16 = (int16_t)v;
+ evalValue = (int16_t)ev;
+ genBound8 = (uint8_t)(g | b);
+ depth8 = (int8_t)d;
}
+private:
+ friend class TranspositionTable;
+
uint16_t key16;
uint16_t move16;
int16_t value16;
int16_t evalValue;
uint8_t genBound8;
- uint8_t depth8;
+ int8_t depth8;
};
/// TTCluster is a 32 bytes cluster of TT entries consisting of:
/// 3 x TTEntry (3 x 10 bytes)
/// padding (2 bytes)
-const unsigned TTClusterSize = 3;
+static const unsigned TTClusterSize = 3;
struct TTCluster {
-
TTEntry entry[TTClusterSize];
char padding[2];
};
public:
~TranspositionTable() { free(mem); }
- void new_search() { generation += 4; } // Lower 2 bits are used by Bound
-
- const TTEntry* probe(const Key key) const;
+ void new_search() { generation8 += 4; } // Lower 2 bits are used by Bound
+ uint8_t generation() const { return generation8; }
+ TTEntry* probe(const Key key, bool& found) const;
TTEntry* first_entry(const Key key) const;
- void resize(uint64_t mbSize);
+ void resize(size_t mbSize);
void clear();
- void store(const Key key, Value v, Bound type, Depth d, Move m, Value statV);
private:
- uint32_t clusterCount;
+ size_t clusterCount;
TTCluster* table;
void* mem;
- uint8_t generation; // Size must be not bigger than TTEntry::genBound8
+ uint8_t generation8; // Size must be not bigger than TTEntry::genBound8
};
extern TranspositionTable TT;
inline TTEntry* TranspositionTable::first_entry(const Key key) const {
- return &table[(uint32_t)key & (clusterCount - 1)].entry[0];
+ return &table[(size_t)key & (clusterCount - 1)].entry[0];
}
#endif // #ifndef TT_H_INCLUDED