Greatly simplify move_from_uci()

[stockfish] / src / tt.h

diff --git a/src/tt.h b/src/tt.h
index 778e5e81bf86dd37ad5725823967ea9ef87b4f0e..fa77f72829c5e8062cc5a2bd51c6a87f5e1e1aee 100644 (file)
--- a/src/tt.h
+++ b/src/tt.h
@@ -21,9 +21,7 @@
 #if !defined(TT_H_INCLUDED)
 #define TT_H_INCLUDED
 
-////
-//// Includes
-////
+#include <iostream>
 
 #include "depth.h"
 #include "move.h"
@@ -34,6 +32,39 @@
 //// Types
 ////
 
+
+/// A simple fixed size hash table used to store pawns and material
+/// configurations. It is basically just an array of Entry objects.
+/// Without cluster concept or overwrite policy.
+
+template<class Entry, int HashSize>
+class SimpleHash {
+
+  SimpleHash(const SimpleHash&);
+  SimpleHash& operator=(const SimpleHash&);
+
+public:
+  SimpleHash() {
+
+    entries = new Entry[HashSize];
+    if (!entries)
+    {
+        std::cerr << "Failed to allocate " << HashSize * sizeof(Entry)
+                  << " bytes for material hash table." << std::endl;
+        exit(EXIT_FAILURE);
+    }
+    memset(entries, 0, HashSize * sizeof(Entry));
+  }
+
+  ~SimpleHash() { delete [] entries; }
+
+  Entry* find(Key key) const { return entries + ((uint32_t)key & (HashSize - 1)); }
+
+protected:
+  Entry* entries;
+};
+
+
 /// The TTEntry class is the class of transposition table entries
 ///
 /// A TTEntry needs 128 bits to be stored
@@ -47,8 +78,8 @@
 ///
 /// 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
 
@@ -58,7 +89,7 @@ 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);
+      data = (m & 0xFFFF) | (t << 21) | (g << 23);
       value16     = (int16_t)v;
       depth16     = (int16_t)d;
       staticValue = (int16_t)statV;
@@ -68,7 +99,7 @@ public:
 
   uint32_t key() const { return key32; }
   Depth depth() const { return Depth(depth16); }
-  Move move() const { return Move(data & 0x1FFFF); }
+  Move move() const { return Move(data & 0xFFFF); }
   Value value() const { return Value(value16); }
   ValueType type() const { return ValueType((data >> 21) & 3); }
   int generation() const { return data >> 23; }