Retire 'os' flag from Makefile

[stockfish] / src / tt.h

diff --git a/src/tt.h b/src/tt.h
index e9c25ad2d7da732b7ad7c071878887bb197c9824..534409f32800bfc34110d931cac3bd29e0827cfe 100644 (file)
--- a/src/tt.h
+++ b/src/tt.h
@@ -38,7 +38,7 @@ struct TTEntry {
   Move  move()  const      { return (Move )move16; }
   Value value() const      { return (Value)value16; }
   Value eval_value() const { return (Value)evalValue; }
-  Depth depth() const      { return (Depth)(depth8) + DEPTH_NONE; }
+  Depth depth() const      { return (Depth)depth8; }
   Bound bound() const      { return (Bound)(genBound8 & 0x3); }
 
 private:
@@ -50,8 +50,8 @@ private:
     move16    = (uint16_t)m;
     value16   = (int16_t)v;
     evalValue = (int16_t)ev;
-    depth8    = (uint8_t)(d - DEPTH_NONE);
-    genBound8 = g | (uint8_t)b;
+    genBound8 = (uint8_t)(g | b);
+    depth8    = (int8_t)d;
   }
 
   uint16_t key16;
@@ -59,7 +59,7 @@ private:
   int16_t  value16;
   int16_t  evalValue;
   uint8_t  genBound8;
-  uint8_t  depth8;
+  int8_t   depth8;
 };
 
 /// TTCluster is a 32 bytes cluster of TT entries consisting of:
@@ -70,7 +70,6 @@ private:
 const unsigned TTClusterSize = 3;
 
 struct TTCluster {
-
   TTEntry entry[TTClusterSize];
   char padding[2];
 };
@@ -89,12 +88,12 @@ public:
 
   const TTEntry* probe(const Key key) const;
   TTEntry* first_entry(const Key key) const;
-  void resize(uint64_t mbSize);
+  void resize(size_t mbSize);
   void clear();
   void store(const Key key, Value v, Bound type, Depth d, Move m, Value statV);
 
 private:
-  uint32_t clusterCount;
+  size_t clusterCount;
   TTCluster* table;
   void* mem;
   uint8_t generation; // Size must be not bigger than TTEntry::genBound8
@@ -109,7 +108,7 @@ extern TranspositionTable TT;
 
 inline TTEntry* TranspositionTable::first_entry(const Key key) const {
 
-  return &table[(uint32_t)key & (clusterCount - 1)].entry[0];
+  return &table[(size_t)key & (clusterCount - 1)].entry[0];
 }
 
 #endif // #ifndef TT_H_INCLUDED