X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftt.h;h=707bb0f0db19807d2cba0c4ee2d1b66afa8fff5e;hp=daa66c333e3488c8428a406680e9f73438a58f10;hb=24b25b4827df4b3629d46ef019f4fea645d6dc91;hpb=c13b53a5144163a81d214fb72733b3400b2da002

diff --git a/src/tt.h b/src/tt.h
index daa66c33..707bb0f0 100644
--- a/src/tt.h
+++ b/src/tt.h
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 
 #include <iostream>
 
-#include "move.h"
+#include "misc.h"
 #include "types.h"
 
 
@@ -104,7 +104,7 @@ public:
   void set_size(size_t mbSize);
   void clear();
   void store(const Key posKey, Value v, ValueType type, Depth d, Move m, Value statV, Value kingD);
-  TTEntry* retrieve(const Key posKey) const;
+  TTEntry* probe(const Key posKey) const;
   void new_search();
   TTEntry* first_entry(const Key posKey) const;
   void refresh(const TTEntry* tte) const;
@@ -142,19 +142,20 @@ inline void TranspositionTable::refresh(const TTEntry* tte) const {
 /// Without cluster concept or overwrite policy.
 
 template<class Entry, int HashSize>
-class SimpleHash {
+struct SimpleHash {
 
-  SimpleHash(const SimpleHash&);
-  SimpleHash& operator=(const SimpleHash&);
+  typedef SimpleHash<Entry, HashSize> Base;
 
-public:
-  SimpleHash() {
+  void init() {
+
+    if (entries)
+        return;
 
     entries = new (std::nothrow) Entry[HashSize];
     if (!entries)
     {
         std::cerr << "Failed to allocate " << HashSize * sizeof(Entry)
-                  << " bytes for material hash table." << std::endl;
+                  << " bytes for hash table." << std::endl;
         exit(EXIT_FAILURE);
     }
     memset(entries, 0, HashSize * sizeof(Entry));
@@ -162,8 +163,8 @@ public:
 
   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)); }
+  Entry* probe(Key key) const { return entries + ((uint32_t)key & (HashSize - 1)); }
+  void prefetch(Key key) const { ::prefetch((char*)probe(key)); }
 
 protected:
   Entry* entries;