X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftypes.h;h=3934c2912d032ee51bff7920aef66e939c3e76b0;hb=0a6532a39d2e2cfd92ba0a2c4fa8c6ad6c29b581;hp=f1627a961168403c568872e64abff409e9307065;hpb=a695ed65a8b98c94a928862be76500485b38c414;p=stockfish

diff --git a/src/types.h b/src/types.h
index f1627a96..3934c291 100644
--- a/src/types.h
+++ b/src/types.h
@@ -124,30 +124,22 @@ inline void __cpuid(int CPUInfo[4], int)
 #define FORCE_INLINE  inline
 #endif
 
-/// cpu_has_popcnt() detects support for popcnt instruction at runtime
-inline bool cpu_has_popcnt() {
 
-  int CPUInfo[4] = {-1};
-  __cpuid(CPUInfo, 0x00000001);
-  return (CPUInfo[2] >> 23) & 1;
-}
-
-/// CpuHasPOPCNT is a global constant initialized at startup that
-/// is set to true if CPU on which application runs supports popcnt
-/// hardware instruction. Unless USE_POPCNT is not defined.
+/// HasPopCnt is a global constant initialized at compile time that is set to
+/// true if CPU on which application runs supports popcnt hardware instruction.
 #if defined(USE_POPCNT)
-const bool CpuHasPOPCNT = cpu_has_popcnt();
+const bool HasPopCnt = true;
 #else
-const bool CpuHasPOPCNT = false;
+const bool HasPopCnt = false;
 #endif
 
 
-/// CpuIs64Bit is a global constant initialized at compile time that
-/// is set to true if CPU on which application runs is a 64 bits.
+/// Is64Bit is a global constant initialized at compile time that is set to
+/// true if CPU on which application runs is a 64 bits.
 #if defined(IS_64BIT)
-const bool CpuIs64Bit = true;
+const bool Is64Bit = true;
 #else
-const bool CpuIs64Bit = false;
+const bool Is64Bit = false;
 #endif
 
 #include <string>
@@ -283,10 +275,6 @@ enum Rank {
   RANK_1, RANK_2, RANK_3, RANK_4, RANK_5, RANK_6, RANK_7, RANK_8
 };
 
-enum SquareColor {
-  DARK, LIGHT
-};
-
 enum ScaleFactor {
   SCALE_FACTOR_DRAW   = 0,
   SCALE_FACTOR_NORMAL = 64,
@@ -452,10 +440,6 @@ inline Rank relative_rank(Color c, Square s) {
   return relative_rank(c, rank_of(s));
 }
 
-inline SquareColor color_of(Square s) {
-  return SquareColor(int(rank_of(s) + s) & 1);
-}
-
 inline bool opposite_colors(Square s1, Square s2) {
   int s = s1 ^ s2;
   return ((s >> 3) ^ s) & 1;