Correctly check for no-makefile compile

Under Windows with MSVC we use the IDE to compile,
in this case we infer some compiler flags usually
set by Makefile.

The condition to check this was wrong, namely when compiling
with mingw under Windows 64 bit we always set IS_64BIT and
USE_BSFQ even if compiled with ARCH=x86-32 (this is how I
found it).

Small code style touches while there.

No functional change.

diff --git a/src/bitboard.cpp b/src/bitboard.cpp
index 7ab798a39f64c6b74a92aa33e4b2822f7ee3b1cf..e0533bc9cc286280c61432c455adf41ee3695ebe 100644 (file)
--- a/src/bitboard.cpp
+++ b/src/bitboard.cpp
@@ -56,7 +56,7 @@ namespace {
   const uint64_t DeBruijn64 = 0x3F79D71B4CB0A89ULL;
   const uint32_t DeBruijn32 = 0x783A9B23;
 
   const uint64_t DeBruijn64 = 0x3F79D71B4CB0A89ULL;
   const uint32_t DeBruijn32 = 0x783A9B23;
 

-  int MS1BTable[256];           // To implement software msb()
+  int MSBTable[256];            // To implement software msb()

   Square BSFTable[SQUARE_NB];   // To implement software bitscan
   Bitboard RookTable[0x19000];  // To store rook attacks
   Bitboard BishopTable[0x1480]; // To store bishop attacks
   Square BSFTable[SQUARE_NB];   // To implement software bitscan
   Bitboard RookTable[0x19000];  // To store rook attacks
   Bitboard BishopTable[0x1480]; // To store bishop attacks


@@ -109,7 +109,7 @@ Square msb(Bitboard b) {
       result += 8;
   }
 
       result += 8;
   }
 

-  return Square(result + MS1BTable[b32]);
+  return Square(result + MSBTable[b32]);

 }
 
 #endif // ifndef USE_BSFQ
 }
 
 #endif // ifndef USE_BSFQ


@@ -125,9 +125,9 @@ const std::string Bitboards::pretty(Bitboard b) {
   for (Rank r = RANK_8; r >= RANK_1; --r)
   {
       for (File f = FILE_A; f <= FILE_H; ++f)
   for (Rank r = RANK_8; r >= RANK_1; --r)
   {
       for (File f = FILE_A; f <= FILE_H; ++f)

-          s.append(b & make_square(f, r) ? "| X " : "|   ");
+          s += b & make_square(f, r) ? "| X " : "|   ";

 
 

-      s.append("|\n+---+---+---+---+---+---+---+---+\n");
+      s += "|\n+---+---+---+---+---+---+---+---+\n";

   }
 
   return s;
   }
 
   return s;


@@ -145,8 +145,8 @@ void Bitboards::init() {
       BSFTable[bsf_index(SquareBB[s])] = s;
   }
 
       BSFTable[bsf_index(SquareBB[s])] = s;
   }
 

-  for (Bitboard b = 1; b < 256; ++b)
-      MS1BTable[b] = more_than_one(b) ? MS1BTable[b - 1] : lsb(b);
+  for (Bitboard b = 2; b < 256; ++b)
+      MSBTable[b] = MSBTable[b - 1] + !more_than_one(b);

 
   for (File f = FILE_A; f <= FILE_H; ++f)
       FileBB[f] = f > FILE_A ? FileBB[f - 1] << 1 : FileABB;
 
   for (File f = FILE_A; f <= FILE_H; ++f)
       FileBB[f] = f > FILE_A ? FileBB[f - 1] << 1 : FileABB;

diff --git a/src/types.h b/src/types.h
index a0a61600766d4e9873d7a55858d0652c5b787593..772f0ec92fd0a6d3c8cee93ac9b9470468878ec0 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -58,7 +58,7 @@
 /// _WIN32             Building on Windows (any)
 /// _WIN64             Building on Windows 64 bit
 
 /// _WIN32             Building on Windows (any)
 /// _WIN64             Building on Windows 64 bit
 

-#if defined(_WIN64) && !defined(IS_64BIT) // Last condition means Makefile is not used
+#if defined(_WIN64) && defined(_MSC_VER) // No Makefile used

 #  include <intrin.h> // MSVC popcnt and bsfq instrinsics
 #  define IS_64BIT
 #  define USE_BSFQ
 #  include <intrin.h> // MSVC popcnt and bsfq instrinsics
 #  define IS_64BIT
 #  define USE_BSFQ