X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftt.h;h=5ca5c237d82f7ec38974b56944b267c5c688a76b;hb=c2511243b40964e5ed5f35447baf5663a72da72a;hp=fa77f72829c5e8062cc5a2bd51c6a87f5e1e1aee;hpb=1e7aaed8bc4247a742d515811f0e484ff40309b8;p=stockfish
diff --git a/src/tt.h b/src/tt.h
index fa77f728..5ca5c237 100644
--- a/src/tt.h
+++ b/src/tt.h
@@ -17,21 +17,13 @@
along with this program. If not, see .
*/
-
#if !defined(TT_H_INCLUDED)
#define TT_H_INCLUDED
#include
-#include "depth.h"
#include "move.h"
-#include "value.h"
-
-
-////
-//// Types
-////
-
+#include "types.h"
/// A simple fixed size hash table used to store pawns and material
/// configurations. It is basically just an array of Entry objects.
@@ -46,7 +38,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)
@@ -56,7 +48,7 @@ public:
memset(entries, 0, HashSize * sizeof(Entry));
}
- ~SimpleHash() { delete [] entries; }
+ virtual ~SimpleHash() { delete [] entries; }
Entry* find(Key key) const { return entries + ((uint32_t)key & (HashSize - 1)); }
@@ -86,33 +78,37 @@ protected:
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 & 0xFFFF) | (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 & 0xFFFF); }
+ 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;
};