Don't overwrite exsisting TT with null search value

[stockfish] / src / misc.cpp

diff --git a/src/misc.cpp b/src/misc.cpp
index e235475a5713603c2cbe4db81a2d54e9e8a19243..2e43a76bb8f4a8fd95d1a7d2d18b478d28bc8e7f 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -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-2009 Marco Costalba
+  Copyright (C) 2008-2010 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
@@ -41,13 +41,13 @@
 
 #include <cassert>
 #include <cstdio>
-#include <cstring>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
 
 #include "bitcount.h"
 #include "misc.h"
+#include "thread.h"
 
 using namespace std;
 
@@ -183,85 +183,39 @@ int get_system_time() {
 }
 
 
-/// builtin_cpu_count() tries to detect the number of CPU cores, if
-/// hyper-threading is enabled this is the number of logical processors.
+/// cpu_count() tries to detect the number of CPU cores.
 
 #if !defined(_MSC_VER)
 
 #  if defined(_SC_NPROCESSORS_ONLN)
-static int builtin_cpu_count() {
-  return Min(sysconf(_SC_NPROCESSORS_ONLN), 8);
+int cpu_count() {
+  return Min(sysconf(_SC_NPROCESSORS_ONLN), MAX_THREADS);
 }
 #  elif defined(__hpux)
-static int builtin_cpu_count() {
+int cpu_count() {
   struct pst_dynamic psd;
   if (pstat_getdynamic(&psd, sizeof(psd), (size_t)1, 0) == -1)
       return 1;
 
-  return Min(psd.psd_proc_cnt, 8);
+  return Min(psd.psd_proc_cnt, MAX_THREADS);
 }
 #  else
-static int builtin_cpu_count() {
+int cpu_count() {
   return 1;
 }
 #  endif
 
 #else
 
-static int builtin_cpu_count() {
+int cpu_count() {
   SYSTEM_INFO s;
   GetSystemInfo(&s);
-  return Min(s.dwNumberOfProcessors, 8);
+  return Min(s.dwNumberOfProcessors, MAX_THREADS);
 }
 
 #endif
 
 
-/// HT_enabled() returns true if hyper-threading is enabled on current machine
-
-static bool HT_enabled() {
-
-  char CPUString[0x20];
-  int CPUInfo[4] = {-1};
-  int nIds, nLogicalCPU, nCores;
-
-  // Detect CPU producer
-  __cpuid(CPUInfo, 0);
-  nIds = CPUInfo[0];
-
-  memset(CPUString, 0, sizeof(CPUString));
-  *((int*)(CPUString+0)) = CPUInfo[1];
-  *((int*)(CPUString+4)) = CPUInfo[3];
-  *((int*)(CPUString+8)) = CPUInfo[2];
-
-  // Not an Intel CPU or CPUID.4 not supported
-  if (strcmp(CPUString, "GenuineIntel") || nIds < 4)
-      return false;
-
-  // Detect if HT Technology is supported
-  __cpuid(CPUInfo, 1);
-  if (!((CPUInfo[3] >> 28) & 1))
-      return false;
-
-  nLogicalCPU = (CPUInfo[1] >> 16) & 0xFF;
-
-  // Detect number of cores
-  __cpuid(CPUInfo, 4);
-  nCores = 1 + ((CPUInfo[0] >> 26) & 0x3F);
-
-  return nLogicalCPU > nCores;
-}
-
-
-/// cpu_count() tries to detect the number of physical CPU cores taking
-/// in account hyper-threading.
-
-int cpu_count() {
-
-  return HT_enabled() ? builtin_cpu_count() / 2 : builtin_cpu_count();
-}
-
-
 /*
   From Beowulf, from Olithink
 */