Fix a possible overflow in TT resize

mcostalba · mcostalba · commit 595fc342cf4a · 2015-01-17T21:42:47.000+01:00
On platforms where size_t is 32 bit, we
can have an overflow in this expression:

(mbSize * 1024 * 1024)

Fix it setting max hash size of 2GB on platforms
where size_t is 32 bit.

A small rename while there: now struct Cluster
is definied inside class TranspositionTable so
we should drop the redundant TT prefix.

No functional change.
diff --git a/src/tt.cpp b/src/tt.cpp
@@ -32,17 +32,17 @@ TranspositionTable TT; // Our global transposition table
 
 void TranspositionTable::resize(size_t mbSize) {
 
-  assert(sizeof(TTCluster) == CacheLineSize / 2);
+  assert(sizeof(Cluster) == CacheLineSize / 2);
 
-  size_t newClusterCount = size_t(1) << msb((mbSize * 1024 * 1024) / sizeof(TTCluster));
+  size_t newClusterCount = size_t(1) << msb((mbSize * 1024 * 1024) / sizeof(Cluster));
 
   if (newClusterCount == clusterCount)
       return;
 
   clusterCount = newClusterCount;
 
   free(mem);
-  mem = calloc(clusterCount * sizeof(TTCluster) + CacheLineSize - 1, 1);
+  mem = calloc(clusterCount * sizeof(Cluster) + CacheLineSize - 1, 1);
 
   if (!mem)
   {
@@ -51,7 +51,7 @@ void TranspositionTable::resize(size_t mbSize) {
       exit(EXIT_FAILURE);
   }
 
-  table = (TTCluster*)((uintptr_t(mem) + CacheLineSize - 1) & ~(CacheLineSize - 1));
+  table = (Cluster*)((uintptr_t(mem) + CacheLineSize - 1) & ~(CacheLineSize - 1));
 }
 
 
@@ -61,7 +61,7 @@ void TranspositionTable::resize(size_t mbSize) {
 
 void TranspositionTable::clear() {
 
-  std::memset(table, 0, clusterCount * sizeof(TTCluster));
+  std::memset(table, 0, clusterCount * sizeof(Cluster));
 }
 
 
diff --git a/src/tt.h b/src/tt.h
@@ -76,7 +76,7 @@ class TranspositionTable {
   static const int CacheLineSize = 64;
   static const int TTClusterSize = 3;
 
-  struct TTCluster {
+  struct Cluster {
     TTEntry entry[TTClusterSize];
     char padding[2]; // Align to the cache line size
   };
@@ -96,7 +96,7 @@ class TranspositionTable {
 
 private:
   size_t clusterCount;
-  TTCluster* table;
+  Cluster* table;
   void* mem;
   uint8_t generation8; // Size must be not bigger than TTEntry::genBound8
 };
diff --git a/src/ucioption.cpp b/src/ucioption.cpp
@@ -54,11 +54,13 @@ bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const
 
 void init(OptionsMap& o) {
 
+  const int MaxHashMB = Is64Bit ? 1024 * 1024 : 2048;
+
   o["Write Debug Log"]       << Option(false, on_logger);
   o["Contempt"]              << Option(0, -100, 100);
   o["Min Split Depth"]       << Option(0, 0, 12, on_threads);
   o["Threads"]               << Option(1, 1, MAX_THREADS, on_threads);
-  o["Hash"]                  << Option(16, 1, 1024 * 1024, on_hash_size);
+  o["Hash"]                  << Option(16, 1, MaxHashMB, on_hash_size);
   o["Clear Hash"]            << Option(on_clear_hash);
   o["Ponder"]                << Option(true);
   o["MultiPV"]               << Option(1, 1, 500);

Original file line number	Diff line number	Diff line change
`@@ -32,17 +32,17 @@ TranspositionTable TT; // Our global transposition table`
`32`	`32`
`33`	`33`	`void TranspositionTable::resize(size_t mbSize) {`
`34`	`34`
`35`		`- assert(sizeof(TTCluster) == CacheLineSize / 2);`
	`35`	`+ assert(sizeof(Cluster) == CacheLineSize / 2);`
`36`	`36`
`37`		`- size_t newClusterCount = size_t(1) << msb((mbSize * 1024 * 1024) / sizeof(TTCluster));`
	`37`	`+ size_t newClusterCount = size_t(1) << msb((mbSize * 1024 * 1024) / sizeof(Cluster));`
`38`	`38`
`39`	`39`	`if (newClusterCount == clusterCount)`
`40`	`40`	`return;`
`41`	`41`
`42`	`42`	`clusterCount = newClusterCount;`
`43`	`43`
`44`	`44`	`free(mem);`
`45`		`- mem = calloc(clusterCount * sizeof(TTCluster) + CacheLineSize - 1, 1);`
	`45`	`+ mem = calloc(clusterCount * sizeof(Cluster) + CacheLineSize - 1, 1);`
`46`	`46`
`47`	`47`	`if (!mem)`
`48`	`48`	`{`
`@@ -51,7 +51,7 @@ void TranspositionTable::resize(size_t mbSize) {`
`51`	`51`	`exit(EXIT_FAILURE);`
`52`	`52`	`}`
`53`	`53`
`54`		`- table = (TTCluster*)((uintptr_t(mem) + CacheLineSize - 1) & ~(CacheLineSize - 1));`
	`54`	`+ table = (Cluster*)((uintptr_t(mem) + CacheLineSize - 1) & ~(CacheLineSize - 1));`
`55`	`55`	`}`
`56`	`56`
`57`	`57`
`@@ -61,7 +61,7 @@ void TranspositionTable::resize(size_t mbSize) {`
`61`	`61`
`62`	`62`	`void TranspositionTable::clear() {`
`63`	`63`
`64`		`- std::memset(table, 0, clusterCount * sizeof(TTCluster));`
	`64`	`+ std::memset(table, 0, clusterCount * sizeof(Cluster));`
`65`	`65`	`}`
`66`	`66`
`67`	`67`