X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftt.h;h=fe4cee62ae39a83ec94ad3d232289daa94a7d395;hp=bc981c9450991ebf20f2a7c484af00478fed4c0d;hb=2f1935078da225c90f7887ed8c345cc7baebcfcc;hpb=a46b53e1c21ba56b09d7d9e47335d383b5240ce0

diff --git a/src/tt.h b/src/tt.h
index bc981c94..fe4cee62 100644
--- a/src/tt.h
+++ b/src/tt.h
@@ -17,23 +17,13 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(TT_H_INCLUDED)
 #define TT_H_INCLUDED
 
-////
-//// Includes
-////
+#include <iostream>
 
-#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.
@@ -48,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)
@@ -58,9 +48,10 @@ 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)); }
+  void prefetch(Key key) const { ::prefetch((char*)find(key)); }
 
 protected:
   Entry* entries;
@@ -88,33 +79,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;
 };