X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftt.h;h=c37b9d3ff6f74c96bbfe3853d8747f0f72804933;hp=f2928fb9e84b4b754ae9c1ecfb9a1c01b7778a56;hb=3bb1ab34e4f007549fe9836aa167654f8fef39e6;hpb=0ddf84870ad9f7fb4309e992e1e5eae968577958 diff --git a/src/tt.h b/src/tt.h index f2928fb9..c37b9d3f 100644 --- a/src/tt.h +++ b/src/tt.h @@ -21,9 +21,7 @@ #if !defined(TT_H_INCLUDED) #define TT_H_INCLUDED -//// -//// Includes -//// +#include #include "depth.h" #include "move.h" @@ -48,7 +46,7 @@ class SimpleHash { public: SimpleHash() { - entries = new Entry[HashSize]; + entries = new (std::nothrow) Entry[HashSize]; if (!entries) { std::cerr << "Failed to allocate " << HashSize * sizeof(Entry) @@ -60,7 +58,7 @@ public: ~SimpleHash() { delete [] entries; } - Entry* find(Key key) const { return entries + unsigned(key & (HashSize - 1)); } + Entry* find(Key key) const { return entries + ((uint32_t)key & (HashSize - 1)); } protected: Entry* entries; @@ -80,41 +78,45 @@ protected: /// /// the 32 bits of the data field are so defined /// -/// bit 0-16: move -/// bit 17-20: not used +/// bit 0-15: move +/// bit 16-20: not used /// bit 21-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 << 21) | (g << 23); - value16 = (int16_t)v; - depth16 = (int16_t)d; - staticValue = (int16_t)statV; - staticValueMargin = (int16_t)kd; + void save(uint32_t k, Value v, ValueType t, Depth d, Move m, int g, Value statV, Value statM) { + + key32 = (uint32_t)k; + move16 = (uint16_t)m; + valueType = (uint8_t)t; + generation8 = (uint8_t)g; + value16 = (int16_t)v; + depth16 = (int16_t)d; + staticValue = (int16_t)statV; + staticMargin = (int16_t)statM; } - void set_generation(int g) { data = move() | (type() << 21) | (g << 23); } + void set_generation(int g) { generation8 = (uint8_t)g; } uint32_t key() const { return key32; } Depth depth() const { return Depth(depth16); } - Move move() const { return Move(data & 0x1FFFF); } + Move move() const { return Move(move16); } Value value() const { return Value(value16); } - ValueType type() const { return ValueType((data >> 21) & 3); } - int generation() const { return data >> 23; } + ValueType type() const { return ValueType(valueType); } + int generation() const { return generation8; } Value static_value() const { return Value(staticValue); } - Value static_value_margin() const { return Value(staticValueMargin); } + Value static_value_margin() const { return Value(staticMargin); } private: uint32_t key32; - uint32_t data; + uint16_t move16; + uint8_t valueType; + uint8_t generation8; int16_t value16; int16_t depth16; int16_t staticValue; - int16_t staticValueMargin; + int16_t staticMargin; };